From e5e6f4fd1967507410355305d36192efd0293ff7 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 11 Feb 2017 23:37:15 +0000 Subject: [PATCH] Better logging to analyze unwanted messages from Diaspora --- include/diaspora.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/diaspora.php b/include/diaspora.php index 53f2e7ea7d..eca22092d8 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -318,21 +318,22 @@ class Diaspora { dbesc(NETWORK_DIASPORA), dbesc($msg["author"]) ); + if (dbm::is_result($r)) { foreach ($r as $rr) { logger("delivering to: ".$rr["username"]); self::dispatch($rr,$msg); } } else { - logger("No subscribers for ".$msg["author"]." ".print_r($msg, true), LOGGER_DEBUG); - } + $social_relay = (bool)Config::get('system', 'relay_subscribe', false); - $social_relay = (bool)Config::get('system', 'relay_subscribe', false); - - // Use a dummy importer to import the data for the public copy - if (dbm::is_result($r) OR $social_relay) { - $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE); - $message_id = self::dispatch($importer,$msg); + // Use a dummy importer to import the data for the public copy + if ($social_relay) { + $importer = array("uid" => 0, "page-flags" => PAGE_FREELOVE); + $message_id = self::dispatch($importer,$msg); + } else { + logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG); + } } return $message_id;