From 15b9a67c01964b83ac724945fe416dd35f66e914 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 4 Oct 2017 18:51:37 -0700 Subject: redirect loop with rmagic and owa --- Zotlabs/Module/Magic.php | 1 + Zotlabs/Module/Rmagic.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Module/Magic.php b/Zotlabs/Module/Magic.php index d1550ec89..879085f96 100644 --- a/Zotlabs/Module/Magic.php +++ b/Zotlabs/Module/Magic.php @@ -149,6 +149,7 @@ class Magic extends \Zotlabs\Web\Controller { if($j['success'] && $j['token']) { $x = strpbrk($dest,'?&'); $args = (($x) ? '&owt=' . $j['token'] : '?f=&owt=' . $j['token']) . (($delegate) ? '&delegate=1' : ''); + goaway($dest . $args); } } diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php index 0c4eb9ae4..bfc03f6ec 100644 --- a/Zotlabs/Module/Rmagic.php +++ b/Zotlabs/Module/Rmagic.php @@ -17,7 +17,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($r) { if($r[0]['hubloc_url'] === z_root()) goaway(z_root() . '/login'); - $dest = z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string); + $dest = z_root() . '/' . str_replace(['rmagic','zid='],['','zid_='],\App::$query_string); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&owa=1&dest=' . $dest); } } @@ -61,7 +61,7 @@ class Rmagic extends \Zotlabs\Web\Controller { if($_SESSION['return_url']) $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); else - $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',\App::$query_string)); + $dest = urlencode(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string)); goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest); } -- cgit v1.2.3