aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-17 18:23:01 -0800
committerfriendica <info@friendica.com>2014-02-17 18:23:01 -0800
commitd3120264cb99b8c87ecce01795bbc96265028b47 (patch)
tree6b7554b3e65f2eaf64d16058bcbbc848dddb959a /mod
parent9b0ae023ffc63c4159724f2e17ed6f23762de333 (diff)
downloadvolse-hubzilla-d3120264cb99b8c87ecce01795bbc96265028b47.tar.gz
volse-hubzilla-d3120264cb99b8c87ecce01795bbc96265028b47.tar.bz2
volse-hubzilla-d3120264cb99b8c87ecce01795bbc96265028b47.zip
more snakebite stuff
Diffstat (limited to 'mod')
-rw-r--r--mod/rmagic.php52
1 files changed, 33 insertions, 19 deletions
diff --git a/mod/rmagic.php b/mod/rmagic.php
index b8c1c6553..093ccd328 100644
--- a/mod/rmagic.php
+++ b/mod/rmagic.php
@@ -22,31 +22,45 @@ function rmagic_init(&$a) {
function rmagic_post(&$a) {
- $address = $_REQUEST['address'];
- if(strpos($address,'@') === false) {
- notice('Invalid address.');
- return;
- }
+ $address = trim($_REQUEST['address']);
+ $other = intval($_REQUEST['other']);
- $r = null;
- if($address) {
- $r = q("select hubloc_url from hubloc where hubloc_addr = '%s' limit 1",
- dbesc($address)
- );
- }
- if($r) {
- $url = $r[0]['hubloc_url'];
+ if($other) {
+ $arr = array('address' => $address);
+ call_hooks('reverse_magic_auth', $arr);
+
+
+ // if they're still here...
+ notice( t('Authentication failed.') . EOL);
+ return;
}
else {
- $url = 'https://' . substr($address,strpos($address,'@')+1);
- }
- if($url) {
- $dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
- goaway($url . '/magic' . '?f=&dest=' . $dest);
- }
+ // 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' limit 1",
+ dbesc($address)
+ );
+ }
+ if($r) {
+ $url = $r[0]['hubloc_url'];
+ }
+ else {
+ $url = 'https://' . substr($address,strpos($address,'@')+1);
+ }
+
+ if($url) {
+ $dest = z_root() . '/' . str_replace('zid=','zid_=',$a->query_string);
+ goaway($url . '/magic' . '?f=&dest=' . $dest);
+ }
+ }
}