X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fping.php;h=4d370593cc246e0bb0f92f1b1478350a9001990a;hb=46e03373480bf051df10fb8c047a3fc4ca4abdee;hp=175bf8440b61b3f76608b398a2015112b667e424;hpb=9d87313eaebe8240393ac300a435f3b1332c8849;p=quix0rs-gnu-social.git

diff --git a/lib/ping.php b/lib/ping.php
index 175bf8440b..4d370593cc 100644
--- a/lib/ping.php
+++ b/lib/ping.php
@@ -20,44 +20,54 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 function ping_broadcast_notice($notice) {
+    if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
+        return true;
+    }
 
-	if (!$notice->is_local) {
-		return true;
-	}
+    // Array of servers, URL => type
+    $notify = common_config('ping', 'notify');
+    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);
 
-	# Array of servers, URL => type
-	$notify = common_config('ping', 'notify');
-	$profile = $notice->getProfile();
-	$tags = ping_notice_tags($notice);
+    foreach ($notify as $notify_url => $type) {
+        switch ($type) {
+         case 'xmlrpc':
+         case 'extended':
+            $req = xmlrpc_encode_request('weblogUpdates.ping',
+                                         array($profile->nickname, # site name
+                                               common_local_url('showstream',
+                                                                array('nickname' => $profile->nickname)),
+                                               common_local_url('shownotice',
+                                                                array('notice' => $notice->id)),
+                                               common_local_url('userrss',
+                                                                array('nickname' => $profile->nickname)),
+                                               $tags));
 
-	foreach ($notify as $notify_url => $type) {
-		switch ($type) {
-		 case 'xmlrpc':
-		 case 'extended':
-			$req = xmlrpc_encode_request('weblogUpdates.ping',
-										 array($profile->nickname, # site name
-											   common_local_url('showstream',
-																array('nickname' => $profile->nickname)),
-											   common_local_url('shownotice',
-																array('notice' => $notice->id)),
-											   common_local_url('userrss',
-																array('nickname' => $profile->nickname)),
-											   $tags));
-
-            $context = stream_context_create(array('http' => array('method' => "POST",
-                                                                   'header' =>
-                                                                   "Content-Type: text/xml\r\n".
-                                                                   "User-Agent: StatusNet/".STATUSNET_VERSION."\r\n",
-                                                                   'content' => $req)));
-            $file = file_get_contents($notify_url, false, $context);
+            $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 ($file === false || mb_strlen($file) == 0) {
+            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($file);
+            $response = xmlrpc_decode($httpResponse->getBody());
 
             if (is_array($response) && xmlrpc_is_fault($response)) {
                 common_log(LOG_WARNING,
@@ -68,9 +78,8 @@ function ping_broadcast_notice($notice) {
                            "Ping success for $notify_url $notice->id");
             }
             break;
-
-		 case 'get':
-		 case 'post':
+         case 'get':
+         case 'post':
             $args = array('name' => $profile->nickname,
                           'url' => common_local_url('showstream',
                                                     array('nickname' => $profile->nickname)),
@@ -97,26 +106,25 @@ function ping_broadcast_notice($notice) {
                            "'$result->body'");
             }
             break;
-
-		 default:
-			common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
+         default:
+            common_log(LOG_WARNING, 'Unknown notify type for ' . $notify_url . ': ' . $type);
         }
-	}
+    }
 
     return true;
 }
 
 function ping_notice_tags($notice) {
-	$tag = new Notice_tag();
-	$tag->notice_id = $notice->id;
-	$tags = array();
-	if ($tag->find()) {
-		while ($tag->fetch()) {
-			$tags[] = $tag->tag;
-		}
-		$tag->free();
-		unset($tag);
-		return implode('|', $tags);
-	}
-	return NULL;
-}
\ No newline at end of file
+    $tag = new Notice_tag();
+    $tag->notice_id = $notice->id;
+    $tags = array();
+    if ($tag->find()) {
+        while ($tag->fetch()) {
+            $tags[] = $tag->tag;
+        }
+        $tag->free();
+        unset($tag);
+        return implode('|', $tags);
+    }
+    return NULL;
+}