harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

redirect loop with rmagic and owa

Browse Source
This commit is contained in:
zotlabs 2017-10-04 18:51:37 -07:00
parent 80ca99fe5b
commit 15b9a67c01
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Zotlabs/Module/Magic.php
View File

@ -149,6 +149,7 @@ class Magic extends \Zotlabs\Web\Controller {
if($j['success'] && $j['token']) { if($j['success'] && $j['token']) {
$x = strpbrk($dest,'?&'); $x = strpbrk($dest,'?&');
$args = (($x) ? '&owt=' . $j['token'] : '?f=&owt=' . $j['token']) . (($delegate) ? '&delegate=1' : ''); $args = (($x) ? '&owt=' . $j['token'] : '?f=&owt=' . $j['token']) . (($delegate) ? '&delegate=1' : '');
goaway($dest . $args); goaway($dest . $args);
} }
} }

4
Zotlabs/Module/Rmagic.php
View File

@ -17,7 +17,7 @@ class Rmagic extends \Zotlabs\Web\Controller {
if($r) { if($r) {
if($r[0]['hubloc_url'] === z_root()) if($r[0]['hubloc_url'] === z_root())
goaway(z_root() . '/login'); 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); 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']) if($_SESSION['return_url'])
$dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url'])); $dest = urlencode(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url']));
else 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); goaway($url . '/magic' . '?f=&owa=1&dest=' . $dest);
} }