[php-blog-cvs] jBlog jBlog_functions.inc.php,1.34,1.35

[<gsc...@us...>]

Update of /cvsroot/php-blog/jBlog
In directory sc8-pr-cvs1:/tmp/cvs-serv15475

Modified Files:
	jBlog_functions.inc.php 
Log Message:
logix fix for tb/pb auto-discovery


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- jBlog_functions.inc.php	7 Mar 2003 19:36:34 -0000	1.34
+++ jBlog_functions.inc.php	7 Mar 2003 19:48:35 -0000	1.35
@@ -561,7 +561,7 @@
  * validate trackback response
  */
 function
-jBlog_trackback_is_success($resp, $data, $final=0)
+jBlog_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
         if ((int) $matches[1]) {
@@ -575,11 +575,6 @@
             }
         }
     }
-    else if($final == 0) {
-        if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
-            return jBlog_trackback_is_success(_jBlog_send($matches[2], $data), 1);
-        }
-    }
     return 1;
 }
 
@@ -644,16 +639,27 @@
 }
 
 function
-jBlog_trackback_send($loc, $url, $author, $title, $text)
+jBlog_trackback_autodiscover($res, $url, $author, $title, $text)
 {
+    if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $res, $matches)) {
+        return;
+    }
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
-    $res = _jBlog_send($loc, $data);
-    $response = jBlog_trackback_is_success($res, $data);
-    jBlog_pingback_autodiscover($loc, $res);
+    $response = jBlog_trackback_is_success(_jBlog_send($matches[2], $data));
     return $response;
 }
 
+function jBlog_reference_autodiscover($loc, $url, $author, $title, $text) {
+    $fp = fopen($loc, "r");
+    while(!feof($fp)) {
+        $res .= fgets($fp, 1024);
+    }
+    fclose($fp);
+    jBlog_trackback_autodiscover($res, $url, $author, $title, $text);
+    jBlog_pingback_autodiscover($loc, $res);
+}
+
 /**
  *
  */
@@ -733,8 +739,7 @@
         if ($row[0] > 0) {
             continue;
         }
-
-        jBlog_trackback_send($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
     }
     mysql_db_query($jBlog['dbName'], "DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");