diff options
| author | git-marijus <mario@mariovavti.com> | 2017-11-04 10:22:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-04 10:22:58 +0100 |
| commit | cfbeb1655daba511f4843b8ba070a247e233fb29 (patch) | |
| tree | 8ef7bf1e06a5d223228b370121bda97695af7d0e /Zotlabs/Module/Cloud.php | |
| parent | 1a737be2b408135177a9e94dcffd0f68c0aca90b (diff) | |
| parent | 39c194c5c32e49f461b8b42a3f4e411a3a5cde3c (diff) | |
| download | volse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.tar.gz volse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.tar.bz2 volse-hubzilla-cfbeb1655daba511f4843b8ba070a247e233fb29.zip | |
Merge branch 'dev' into docu
Diffstat (limited to 'Zotlabs/Module/Cloud.php')
| -rw-r--r-- | Zotlabs/Module/Cloud.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 75191a279..d2264092b 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -57,12 +57,21 @@ class Cloud extends \Zotlabs\Web\Controller { $auth->observer = $ob_hash; } + // if we arrived at this path with any query parameters in the url, build a clean url without + // them and redirect. + // @fixme if the filename has an ampersand in it AND there are query parameters, + // this may not do the right thing. + + if((strpos($_SERVER['QUERY_STRING'],'?') !== false) || (strpos($_SERVER['QUERY_STRING'],'&') !== false && strpos($_SERVER['QUERY_STRING'],'&') === false)) { + $path = z_root(); + if(argc()) { + foreach(\App::$argv as $a) { + $path .= '/' . $a; + } + } + goaway($path); + } - $_SERVER['QUERY_STRING'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['QUERY_STRING']); - $_SERVER['QUERY_STRING'] = strip_zids($_SERVER['QUERY_STRING']); - - $_SERVER['REQUEST_URI'] = str_replace(array('?f=', '&f='), array('', ''), $_SERVER['REQUEST_URI']); - $_SERVER['REQUEST_URI'] = strip_zids($_SERVER['REQUEST_URI']); $rootDirectory = new \Zotlabs\Storage\Directory('/', $auth); |