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

some more rmagic fixes discovered during testing

Browse Source
This commit is contained in:
friendica 2013-02-13 02:40:06 -08:00
parent 942adadec6
commit c769c2e79f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
boot.php
View File

@ -1974,7 +1974,7 @@ function get_my_address() {
function zid_init(&$a) { function zid_init(&$a) {
$tmp_str = get_my_address(); $tmp_str = get_my_address();
if($tmp_str && strpos($tmp_str,'@')) { if(validate_email($tmp_str)) {
proc_run('php','include/gprobe.php',$tmp_str); proc_run('php','include/gprobe.php',$tmp_str);
$arr = array('zid' => $tmp_str, 'url' => $a->cmd); $arr = array('zid' => $tmp_str, 'url' => $a->cmd);
call_hooks('zid_init',$arr); call_hooks('zid_init',$arr);
@ -1983,9 +1983,9 @@ function zid_init(&$a) {
dbesc($tmp_str) dbesc($tmp_str)
); );
// try to avoid recursion - but send them home to do a proper magic auth // try to avoid recursion - but send them home to do a proper magic auth
$dest = $a->query_string; $dest = '/' . $a->query_string;
$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest); $dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic'))) { if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . z_root() . $dest); goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . z_root() . $dest);
} }
} }