aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Rmagic.php
diff options
context:
space:
mode:
Diffstat (limited to 'Zotlabs/Module/Rmagic.php')
-rw-r--r--Zotlabs/Module/Rmagic.php54
1 files changed, 27 insertions, 27 deletions
diff --git a/Zotlabs/Module/Rmagic.php b/Zotlabs/Module/Rmagic.php
index ab9ad059e..2950dca5e 100644
--- a/Zotlabs/Module/Rmagic.php
+++ b/Zotlabs/Module/Rmagic.php
@@ -6,21 +6,21 @@ use Zotlabs\Lib\Libzot;
class Rmagic extends \Zotlabs\Web\Controller {
function init() {
-
+
if(local_channel())
goaway(z_root());
-
+
$me = get_my_address();
if($me) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'",
+ $r = q("select hubloc_url, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_deleted = 0",
dbesc($me)
- );
+ );
if(! $r) {
$w = discover_by_webbie($me);
if($w) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'",
+ $r = q("select hubloc_url, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_deleted = 0",
dbesc($me)
- );
+ );
}
}
@@ -33,39 +33,39 @@ class Rmagic extends \Zotlabs\Web\Controller {
}
}
}
-
+
function post() {
-
+
$address = trim($_REQUEST['address']);
-
+
if(strpos($address,'@') === false) {
$arr = array('address' => $address);
- call_hooks('reverse_magic_auth', $arr);
-
+ call_hooks('reverse_magic_auth', $arr);
+
// if they're still here...
- notice( t('Authentication failed.') . EOL);
+ notice( t('Authentication failed.') . EOL);
return;
}
else {
-
+
// Presumed Red identity. Perform reverse magic auth
-
+
if(strpos($address,'@') === false) {
notice('Invalid address.');
return;
}
-
+
$r = null;
if($address) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'",
+ $r = q("select hubloc_url, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_deleted = 0",
dbesc($address)
- );
+ );
if(! $r) {
$w = discover_by_webbie($address);
if($w) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s'",
+ $r = q("select hubloc_url, hubloc_network from hubloc where hubloc_addr = '%s' and hubloc_deleted = 0",
dbesc($address)
- );
+ );
}
}
}
@@ -76,20 +76,20 @@ class Rmagic extends \Zotlabs\Web\Controller {
}
else {
$url = 'https://' . substr($address,strpos($address,'@')+1);
- }
-
- if($url) {
- if($_SESSION['return_url'])
+ }
+
+ if($url) {
+ if($_SESSION['return_url'])
$dest = bin2hex(z_root() . '/' . str_replace('zid=','zid_=',$_SESSION['return_url']));
else
$dest = bin2hex(z_root() . '/' . str_replace([ 'rmagic', 'zid=' ] ,[ '', 'zid_='],\App::$query_string));
-
+
goaway($url . '/magic' . '?f=&owa=1&bdest=' . $dest);
}
}
}
-
-
+
+
function get() {
return replace_macros(get_markup_template('rmagic.tpl'),
[
@@ -97,6 +97,6 @@ class Rmagic extends \Zotlabs\Web\Controller {
'$address' => [ 'address', t('Enter your channel address (e.g. channel@example.com)'), '', '' ],
'$submit' => t('Authenticate')
]
- );
+ );
}
}