Global is an integer, do not set it to an empty string

[friendica.git] / include / diaspora.php

diff --git a/include/diaspora.php b/include/diaspora.php
index 2b9e61331f0b21e0c2269b7f87a7a14d23ab90af..fdbc0479f906a3439d37c9119aad05dfabed8412 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -45,13 +45,13 @@ class Diaspora {
 
                foreach($servers AS $server) {
                        $server = trim($server);
+                       $addr = "relay@".str_replace("http://", "", normalise_link($server));
                        $batch = $server."/receive/public";
 
-                       $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
+                       $relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
+                                       dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
 
                        if (!$relais) {
-                               $addr = "relay@".str_replace("http://", "", normalise_link($server));
-
                                $r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
                                        VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
                                        datetime_convert(),
@@ -325,8 +325,9 @@ class Diaspora {
                                logger("delivering to: ".$rr["username"]);
                                self::dispatch($rr,$msg);
                        }
-               } else
-                       logger("No subscribers for ".$msg["author"]." ".print_r($msg, true));
+               } else {
+                       logger("No subscribers for ".$msg["author"]." ".print_r($msg, true), LOGGER_DEBUG);
+               }
 
                return $message_id;
        }
@@ -766,7 +767,7 @@ class Diaspora {
                        intval($uid),
                        dbesc($nurl_sql)
                );
-               if(dbm::is_result($r)) {
+               if (dbm::is_result($r)) {
                        return $r[0];
                }
 
@@ -2300,8 +2301,9 @@ class Diaspora {
                        dbesc($target_guid),
                        intval($importer["uid"])
                );
-               if (!$r)
+               if (!$r) {
                        return false;
+               }
 
                // Check if the sender is the thread owner
                $p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
@@ -2324,7 +2326,7 @@ class Diaspora {
                logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
 
                // Now check if the retraction needs to be relayed by us
-               if($p[0]["origin"]) {
+               if ($p[0]["origin"]) {
                        // notify others
                        proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
                }
@@ -2495,15 +2497,17 @@ class Diaspora {
         * @return string the handle in the format user@domain.tld
         */
        private static function my_handle($contact) {
-               if ($contact["addr"] != "")
+               if ($contact["addr"] != "") {
                        return $contact["addr"];
+               }
 
                // Normally we should have a filled "addr" field - but in the past this wasn't the case
                // So - just in case - we build the the address here.
-               if ($contact["nickname"] != "")
+               if ($contact["nickname"] != "") {
                        $nick = $contact["nickname"];
-               else
+               } else {
                        $nick = $contact["nick"];
+               }
 
                return $nick."@".substr(App::get_baseurl(), strpos(App::get_baseurl(),"://") + 3);
        }