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

baby steps tring to get magix auth working for redmtx

Browse Source
This commit is contained in:
friendica 2013-11-14 19:23:56 -08:00
parent bf709d49ba
commit 09d357ed47
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mod/magic.php
View File

@ -33,12 +33,20 @@ function magic_init(&$a) {
if(count($b) >= 2) { if(count($b) >= 2) {
$u = $b[0] . '//' . $b[2]; $u = $b[0] . '//' . $b[2];
dbg(1);
$x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash $x = q("select xchan.xchan_url, hubloc.* from xchan left join hubloc on xchan_hash = hubloc_hash
where hubloc_url = '%s' order by hubloc_id desc limit 1", where hubloc_url = '%s' order by hubloc_id desc limit 5",
dbesc($u) dbesc($u)
); );
dbg(0);
if($x) {
// They must have a valid hubloc_addr
while(! strpos($x[0]['hubloc_addr'],'@')) {
array_shift($x);
}
}
} }
} }
@ -129,7 +137,10 @@ dbg(0);
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
goaway($x[0]['hubloc_callback'] . '/' . substr($x[0]['hubloc_addr'],0,strpos($x[0]['hubloc_addr'],'@')) $target_url = $x[0]['hubloc_callback'] . '/' . substr($x[0]['hubloc_addr'],0,strpos($x[0]['hubloc_addr'],'@')) ;
logger('mod_magic: redirecting to: ' . $target_url, LOGGER_DEBUG);
goaway($target_url
. '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname() . '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname()
. '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION); . '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION);
} }