[php-blog-cvs] jBlog jBlog_admin.php,1.12,1.13 jBlog_functions.inc.php,1.39,1.40 rss.php,1.2,1.3

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

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

Modified Files:
	jBlog_admin.php jBlog_functions.inc.php rss.php 
Log Message:
rename adminsuite
rss feed improvements.  COmment feeds don't work yet, but they will soon.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jBlog_admin.php	10 Mar 2003 02:13:37 -0000	1.12
+++ jBlog_admin.php	10 Mar 2003 03:47:26 -0000	1.13
@@ -92,7 +92,7 @@
 					</div>
                 </td>
                 <td class="jBlog_admin">
-                    <div class='jBlog_admin_title'>jBlog adminSuite</div>
+                    <div class="jBlog_admin_title">jBlog Administration Suite</div>
                     <?php
                     	if (!$jBlog["GET"]["adminModule"]) $jBlog["GET"]["adminModule"] = $jBlog["POST"]["adminModule"];
                         switch($jBlog["GET"]["adminModule"]) {

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- jBlog_functions.inc.php	10 Mar 2003 02:13:38 -0000	1.39
+++ jBlog_functions.inc.php	10 Mar 2003 03:47:27 -0000	1.40
@@ -260,12 +260,12 @@
 			echo "</div>";
 			
 			echo "<div class='jBlog_entry'>";
+            echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
 			if ($extended && strlen($entry['extended'])) {
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'] . $entry["extended"])));
-			} else {
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry["body"])));
-			}
-
+                echo '<a name="#extended">';
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
+                echo '</a>';
+			} 
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='jBlog_time'><a href=\""
 					. $jBlog['jBlogHTTPPath']
@@ -361,7 +361,7 @@
 ?>
     <tr>
     <td class="jBlog_comment">
-    <a name="comment<?=$comment['id']?>"></a>
+    <a name="c<?=$comment['id']?>"></a>
     <?=nl2br($comment['body'])?><br />
 	<div class="jBlog_comment_source">
     <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
@@ -455,22 +455,23 @@
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
-            echo "<link>{$jBlog['baseURL']}e_" . $entry['id'] . ".html</link>\n";
+            echo "<link>{$jBlog['baseURL']}e_{$entry['id']}.html</link>\n";
             if ($version == '2.0') {
                 echo "<content:encoded>\n";
                 echo utf8_encode(htmlspecialchars(jBlog_emoticate(jBlog_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
-                echo '<dc:date>' . date("Y-m-d\Th:i:s", $entry['timestamp']) . "</dc:date>\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 "<exo:references>\n";
+                    echo "<robot:references>\n";
                     foreach ($references as $reference) {
                         echo "<reference>\n";
-                        echo "<link>{$reference['link']}</link>\n";
                         echo "<name>{$reference['name']}</name>\n";
+                        echo "<link>{$reference['link']}</link>\n";
                         echo "</reference>\n";
                     }
-                    echo "</exo:references>\n";
+                    echo "</robot:references>\n";
                 }
             } else {
                 echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
@@ -527,7 +528,6 @@
 */
 function jBlog_emoticate($str) {
 	global $jBlog;
-
 
 	foreach ($jBlog["smiles"] as $key => $value) {
 		$str = str_replace($key, "<img src=\"$value\" />", $str);

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rss.php	6 Mar 2003 15:31:01 -0000	1.2
+++ rss.php	10 Mar 2003 03:47:27 -0000	1.3
@@ -7,17 +7,32 @@
 if (empty($version)) {
     $version = '0.91';
 }
+
+$description = $jBlog['blogDescription'];
+$title = $jBlog['blogTitle'];
+switch ($type) {
+case 'comments':
+    $entries = jBlog_fetchComments(null, true, 15);
+    $title = $title . ' Comments';
+    $description = 'Comments from ' . $description;
+    break;
+case 'content':
+default:
+    $entries = jBlog_fetchEntries(null, true, 15);
+    break;
+}
+
 echo '<?xml version="1.0" encoding="iso-8859-1" ?>';
 echo "\n";
 switch ($version) {
 case '0.91':
     print <<<HEAD
 <rss version="0.91"
-  xmlns:exo="http://www.edwardbear.org/def/xml/exo">
+  xmlns:robot="http://www.edwardbear.org/def/xml/robot">
 <channel>
-<title>{$jBlog['blogTitle']}</title>
+<title>$title</title>
 <link>{$jBlog['baseURL']}</link>
-<description>{$jBlog['blogDescription']}</description>
+<description>$description</description>
 
 HEAD;
 break;
@@ -29,7 +44,7 @@
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
-   xmlns:exo="http://www.edwardbear.org/def/xml/exo">
+   xmlns:robot="http://www.edwardbear.org/def/xml/robot">
 <channel>
 <title>{$jBlog['blogTitle']}</title>
 <link>{$jBlog['baseURL']}</link>
@@ -42,7 +57,6 @@
     die("Invalid RSS version specified\n");
 }
 
-$entries = jBlog_fetchEntries(null, true, 15);
 jBlog_printEntries_rss($entries, $version);
 
 switch ($version) {