[php-blog-cvs] jBlog jBlog_functions.inc.php,1.64,1.65

[<ste...@us...>]

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fix up the rss a lickle bit.,


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- jBlog_functions.inc.php	13 Mar 2003 18:37:07 -0000	1.64
+++ jBlog_functions.inc.php	13 Mar 2003 20:08:28 -0000	1.65
@@ -451,32 +451,21 @@
 function jBlog_printEntries_rss($entries, $version) {
     global $jBlog;
 
-    if (!is_array($entries)) {
-        die("jBlog error: no valid entries found");
-    }
-
-    if ($version == '0.91' || $version == '2.0') {
+    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
             echo "<link>{$jBlog['baseURL']}e_{$entry['id']}.html</link>\n";
             if ($version == '2.0') {
+                // extract author information
+                $query = "select email from {$jBlog['dbPrefix']}authors where username='{$entry['username']}'";
+                $results = jBlog_db_query($query);
+                echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n"; 
                 echo "<content:encoded>\n";
                 echo utf8_encode(htmlspecialchars(jBlog_emoticate(jBlog_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
                 echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
                 echo "<guid>{$jBlog['baseURL']}e_{$entry['id']}.html</guid>\n";
-                $references = jBlog_fetchReferences($entry['id']);
-                if (!empty($references)) {
-                    echo "<robot:references>\n";
-                    foreach ($references as $reference) {
-                        echo "<reference>\n";
-                        echo "<name>{$reference['name']}</name>\n";
-                        echo "<link>{$reference['link']}</link>\n";
-                        echo "</reference>\n";
-                    }
-                    echo "</robot:references>\n";
-                }
             } else {
                 echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
             }
@@ -766,6 +755,7 @@
 jBlog_handle_references($id, $author, $title, $text)
 {
     global $jBlog;
+    
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
@@ -791,7 +781,9 @@
         if ($row[0] > 0) {
             continue;
         }
-        jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        if (!$jBlog['noautodiscovery']) {
+            jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        }
     }
     jBlog_db_query("DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");