diff options
| author | Mario <mario@mariovavti.com> | 2018-07-19 09:20:45 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-07-19 09:20:45 +0200 |
| commit | 685d05f98be3cbe991a9427a9fe522c383ad56cd (patch) | |
| tree | 9de86698483283b8d4d36bebc6162949172d9f07 /Zotlabs/Module/Rmagic.php | |
| parent | 4a6f775334fbf3af2e8e6c781a9a44192a6526d0 (diff) | |
| parent | 931afe98b13399342d5abb4cb13cb09efc09ecad (diff) | |
| download | volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.tar.gz volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.tar.bz2 volse-hubzilla-685d05f98be3cbe991a9427a9fe522c383ad56cd.zip | |
Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'
mangled urls on redirects
See merge request hubzilla/core!1228
Diffstat (limited to 'Zotlabs/Module/Rmagic.php')
| -rw-r--r-- | Zotlabs/Module/Rmagic.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index bfc03f6ec..33a6689ca 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,8 +17,8 @@ class Rmagic extends \Zotlabs\Web\Controller { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); - goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); + $dest = bin2hex(z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string)); + goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&bdest=' . $dest); } } } @@ -59,11 +59,11 @@ class Rmagic extends \Zotlabs\Web\Controller { if($url) { if($_SESSION['return_url']) - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); + $dest = bin2hex(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); + $dest = bin2hex(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); - goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); + goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest); } } } |