From cb5df4d715a9710c2957ad4928762e90d5548298 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 6 Jan 2017 13:30:12 +0000
Subject: [PATCH] Some corrections

---
 include/diaspora.php | 9 +++------
 include/redir.php    | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/diaspora.php b/include/diaspora.php
index 1cb4f0e922..2b9e61331f 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -743,8 +743,7 @@ class Diaspora {
 			dbesc($handle)
 		);
 
-		if ($r) {
-			//logger("Found contact ".$r[0]['id']." for user ".$uid." and handle ".$handle." - first try", LOGGER_DEBUG);
+		if (dbm::is_result($r)) {
 			return $r[0];
 		} else {
 			// We haven't found it?
@@ -755,7 +754,6 @@ class Diaspora {
 				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
 
 				if (dbm::is_result($r)) {
-					logger("Found contact ".$r[0]['id']." for user ".$uid." and handle ".$handle." - second try", LOGGER_DEBUG);
 					return $r[0];
 				}
 			}
@@ -769,7 +767,6 @@ class Diaspora {
 			dbesc($nurl_sql)
 		);
 		if(dbm::is_result($r)) {
-			logger("Found contact ".$r[0]['id']." for user ".$uid." and handle ".$handle." - third try", LOGGER_DEBUG);
 			return $r[0];
 		}
 
@@ -848,12 +845,12 @@ class Diaspora {
 	 * @return int|bool message id if the message already was stored into the system - or false.
 	 */
 	private static function message_exists($uid, $guid) {
-		$r = q("SELECT `guid` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($guid)
 		);
 
-		if ($r) {
+		if (dbm::is_result($r)) {
 			logger("message ".$guid." already exists for user ".$uid);
 			return $r[0]["id"];
 		}
diff --git a/include/redir.php b/include/redir.php
index bbe8a11ec4..d29159ed03 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -27,7 +27,7 @@ function auto_redir(&$a, $contact_nick) {
 		$baseurl = substr($baseurl, $domain_st + 3);
 		$nurl = normalise_link($baseurl);
 
-		/// @todo Why is there a query for "nurl" *and* "nurl"? Especially this normalising is strange.
+		/// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
 		$r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
 		        AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
 				dbesc($contact_nick),