diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:35 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-03 19:18:35 -0700 |
| commit | 1d903655afdd8e49942c6d6c9ca1a7feadeaaa82 (patch) | |
| tree | 892c93a0a3e434b6e8ff8c04d3d7107cf1e12750 /include/zid.php | |
| parent | 0403738981487b7edec20b11a85849254366a202 (diff) | |
| parent | a899ce1c22386b9ff882048cba35d46f560ee654 (diff) | |
| download | volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.gz volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.tar.bz2 volse-hubzilla-1d903655afdd8e49942c6d6c9ca1a7feadeaaa82.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include/zid.php')
| -rw-r--r-- | include/zid.php | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/include/zid.php b/include/zid.php index ce9f70385..5ade6b0f8 100644 --- a/include/zid.php +++ b/include/zid.php @@ -89,10 +89,35 @@ function strip_zids($s) { return preg_replace('/[\?&]zid=(.*?)(&|$)/ism','$2',$s); } +function strip_owt($s) { + return preg_replace('/[\?&]owt=(.*?)(&|$)/ism','$2',$s); +} + function strip_zats($s) { return preg_replace('/[\?&]zat=(.*?)(&|$)/ism','$2',$s); } +function strip_auth_query_params() { + + $_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']); + $_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']); + $_SERVER['QUERY_STRING'] = strip_owt($_SERVER['QUERY_STRING']); + + $_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']); + $_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']); + $_SERVER['REQUEST_URI'] = strip_owt($_SERVER['REQUEST_URI']); + + + $_ENV['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_ENV['QUERY_STRING']); + $_ENV['QUERY_STRING'] = strip_zids($_ENV['QUERY_STRING']); + $_ENV['QUERY_STRING'] = strip_owt($_ENV['QUERY_STRING']); + + $_ENV['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_ENV['REQUEST_URI']); + $_ENV['REQUEST_URI'] = strip_zids($_ENV['REQUEST_URI']); + $_ENV['REQUEST_URI'] = strip_owt($_ENV['REQUEST_URI']); + +} + /** * zidify_callback() and zidify_links() work together to turn any HTML a tags with class="zrl" into zid links |