debug rmagic
This commit is contained in:
parent
f6af431612
commit
28b11f3567
@ -27,10 +27,12 @@ function magic_init(&$a) {
|
||||
$b = explode('/',$dest);
|
||||
if(count($b) >= 2)
|
||||
$u = $b[0] . '//' . $b[2];
|
||||
|
||||
$x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash
|
||||
where hubloc_url = '%s' limit 1",
|
||||
dbesc($u)
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -3,17 +3,21 @@
|
||||
|
||||
function rmagic_init(&$a) {
|
||||
|
||||
if(local_user())
|
||||
goaway(z_root());
|
||||
|
||||
$me = get_my_address();
|
||||
if($me) {
|
||||
$r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
|
||||
dbesc($me)
|
||||
);
|
||||
if($r) {
|
||||
$dest = z_root() . str_replace('zid=','zid_=',$get_app()->query_string);
|
||||
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . z_root() . $dest);
|
||||
if($r[0]['hubloc_url'] === z_root())
|
||||
goaway(z_root() . '/login');
|
||||
$dest = z_root() . '/' . str_replace('zid=','zid_=',$get_app()->query_string);
|
||||
goaway($r[0]['hubloc_url'] . '/magic' . '?f=&dest=' . $dest);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function rmagic_post(&$a) {
|
||||
@ -38,8 +42,8 @@ function rmagic_post(&$a) {
|
||||
}
|
||||
|
||||
if($url) {
|
||||
$dest = z_root() . str_replace('zid=','zid_=',$a->query_string);
|
||||
goaway($url . '/magic' . '?f=&dest=' . z_root() . $dest);
|
||||
$dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
|
||||
goaway($url . '/magic' . '?f=&dest=' . $dest);
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user