X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fping.php;h=abf1c4048edddb5a6c3f1bcbd783d75d9b4c9abe;hb=54de6d3260e7fde77eb86079bd67a815930b8b43;hp=2cbec2f212484b1f49f1b3991997c95bf61c99fa;hpb=5dc913f58951815fcaa246e675ff7d30ad93f633;p=quix0rs-gnu-social.git

diff --git a/lib/ping.php b/lib/ping.php
index 2cbec2f212..abf1c4048e 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2009, Control Yourself, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,17 +17,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
 
-	if (!$notice->is_local) {
+	if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
 		return true;
 	}
 
 	# Array of servers, URL => type
 	$notify = common_config('ping', 'notify');
-	$profile = $notice->getProfile();
+    try {
+        $profile = $notice->getProfile();
+    } catch (Exception $e) {
+        // @todo: distinguish the 'broken notice/profile' case from more general
+        //        transitory errors.
+        common_log(LOG_ERR, "Exception getting notice profile: " . $e->getMessage());
+        return true;
+    }
 	$tags = ping_notice_tags($notice);
 
 	foreach ($notify as $notify_url => $type) {
@@ -44,14 +51,26 @@ function ping_broadcast_notice($notice) {
 																array('nickname' => $profile->nickname)),
 											   $tags));
 
-            $context = stream_context_create(array('http' => array('method' => "POST",
-                                                                   'header' =>
-                                                                   "Content-Type: text/xml\r\n".
-                                                                   "User-Agent: Laconica/".LACONICA_VERSION."\r\n",
-                                                                   'content' => $request)));
-            $file = file_get_contents($notify_url, false, $context);
-            $response = xmlrpc_decode($file);
-            if (xmlrpc_is_fault($response)) {
+            $request = HTTPClient::start();
+            $request->setConfig('connect_timeout', common_config('ping', 'timeout'));
+            $request->setConfig('timeout', common_config('ping', 'timeout'));
+            try {
+                $httpResponse = $request->post($notify_url, array('Content-Type: text/xml'), $req);
+            } catch (Exception $e) {
+                common_log(LOG_ERR,
+                           "Exception pinging $notify_url: " . $e->getMessage());
+                continue;
+            }
+
+            if (!$httpResponse || mb_strlen($httpResponse->getBody()) == 0) {
+                common_log(LOG_WARNING,
+                           "XML-RPC empty results for ping ($notify_url, $notice->id) ");
+                continue;
+            }
+
+            $response = xmlrpc_decode($httpResponse->getBody());
+
+            if (is_array($response) && xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
                            "XML-RPC error for ping ($notify_url, $notice->id) ".
                            "$response[faultString] ($response[faultCode])");
@@ -73,11 +92,11 @@ function ping_broadcast_notice($notice) {
 
             if ($type === 'get') {
                 $result = $fetcher->get($notify_url . '?' . http_build_query($args),
-                                        array('User-Agent: Laconica/'.LACONICA_VERSION));
+                                        array('User-Agent: StatusNet/'.STATUSNET_VERSION));
             } else {
                 $result = $fetcher->post($notify_url,
                                          http_build_query($args),
-                                         array('User-Agent: Laconica/'.LACONICA_VERSION));
+                                         array('User-Agent: StatusNet/'.STATUSNET_VERSION));
             }
             if ($result->status != '200') {
                 common_log(LOG_WARNING,
@@ -111,4 +130,4 @@ function ping_notice_tags($notice) {
 		return implode('|', $tags);
 	}
 	return NULL;
-}
\ No newline at end of file
+}