aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-17 23:12:34 -0800
committerfriendica <info@friendica.com>2013-11-17 23:12:34 -0800
commitdd6c64f95adc89895d4adf9ede8fbc8fdae41750 (patch)
tree72375b0869c4387518cd9b75949b81a29cd3f668 /mod
parentf8b07e1935dd6d035b7458141eca099a2445b077 (diff)
downloadvolse-hubzilla-dd6c64f95adc89895d4adf9ede8fbc8fdae41750.tar.gz
volse-hubzilla-dd6c64f95adc89895d4adf9ede8fbc8fdae41750.tar.bz2
volse-hubzilla-dd6c64f95adc89895d4adf9ede8fbc8fdae41750.zip
magic auth issues
Diffstat (limited to 'mod')
-rw-r--r--mod/magic.php2
-rw-r--r--mod/post.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/mod/magic.php b/mod/magic.php
index 21f703192..6c8ad24ed 100644
--- a/mod/magic.php
+++ b/mod/magic.php
@@ -159,7 +159,7 @@ function magic_init(&$a) {
logger('mod_magic: redirecting to: ' . $target_url, LOGGER_DEBUG);
goaway($target_url
- . '/?f=&auth=' . $channel['channel_address'] . '@' . $a->get_hostname()
+ . '/?f=&auth=' . urlencode($channel['channel_address'] . '@' . $a->get_hostname())
. '&sec=' . $token . '&dest=' . urlencode($dest) . '&version=' . ZOT_REVISION);
}
diff --git a/mod/post.php b/mod/post.php
index 3b98fce81..6eab0988e 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -55,7 +55,7 @@ function post_init(&$a) {
if(! $x) {
// finger them if they can't be found.
- $ret = zot_finger($addr,null);
+ $ret = zot_finger($address,null);
if($ret['success']) {
$j = json_decode($ret['body'],true);
if($j)
@@ -66,7 +66,7 @@ function post_init(&$a) {
}
}
if(! $x) {
- logger('mod_zot: auth: unable to finger ' . $addr);
+ logger('mod_zot: auth: unable to finger ' . $address);
goaway($desturl);
}
@@ -131,7 +131,7 @@ function post_init(&$a) {
logger('mod_zot: still not authenticated: ' . $x[0]['xchan_addr']);
q("update hubloc set hubloc_status = (hubloc_status | %d ) where hubloc_addr = '%s'",
intval(HUBLOC_RECEIVE_ERROR),
- $x[0][xchan_addr]
+ dbesc($x[0]['xchan_addr'])
);
}