magic auth issues

3 files changed, 5 insertions, 5 deletions

diff --git a/include/items.php b/include/items.php
index 7db22d0da..7e21b9c4d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1783,7 +1783,7 @@ function item_store($arr,$allow_exec = false) {
 
 	// update the commented timestamp on the parent
 
-	$z = q("select max(commented) as commented from item where parent_mid = '%s' and uid = %d ",
+	$z = q("select max(created) as commented from item where parent_mid = '%s' and uid = %d ",
 		dbesc($arr['parent_mid']),
 		intval($arr['uid'])
 	);
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'])
 				);
 			}