[php-blog-cvs] serendipity serendipity_functions.inc.php,1.382,1.383

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2841

Modified Files:
	serendipity_functions.inc.php 
Log Message:
* Silence possible fsockopen() warnings
* Display a message if we cannot connect to a given link when attemping to trackback


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -d -r1.382 -r1.383
--- serendipity_functions.inc.php	3 Aug 2004 08:08:07 -0000	1.382
+++ serendipity_functions.inc.php	5 Aug 2004 16:34:17 -0000	1.383
@@ -2220,7 +2220,7 @@
        $target['port'] = 80;
     }
 
-    $sock = fsockopen($target['host'], $target['port']);
+    $sock = @fsockopen($target['host'], $target['port']);
     if (!is_resource($sock)) {
         return "Couldn't connect to $loc";
     }
@@ -2302,8 +2302,12 @@
 
     $parsed_loc = $u['scheme'] . '://' . $u['host'] . $port . $u['path'];
     $res = '';
-    $fp  = fsockopen($u['host'], $u['port'], $err, $timeout);
-    if ($fp) {
+
+    $fp  = @fsockopen($u['host'], $u['port'], $err, $timeout);
+    if (!$fp) {
+        echo sprintf(TRACKBACK_COULD_NOT_CONNECT, $u['host'], $u['port']);;
+        return;
+    } else {
         fputs($fp, "GET {$u['path']} HTTP/1.0\r\n");
         fputs($fp, "Host: {$u['host']}\r\n");
         fputs($fp, "User-Agent: Serendipity/{$GLOBALS['serendipity']['version']}\r\n");