[php-blog-cvs] serendipity db.sql,1.16,1.17 serendipity_admin_entries.inc.php,1.2,1.3 serendipity_functions.inc.php,1.89,1.90

[<jt...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29558

Modified Files:
	db.sql serendipity_admin_entries.inc.php 
	serendipity_functions.inc.php 
Log Message:
db.sql: reverted the patch which removed the _css table from the schema.

_admin_entries.inc.php: Fixed the "categories listing" so that if there were no categories, it didn't display garbage.
_config.inc.php: No change as far as I can remember.
_functions.inc.php: Fixed a sql query that bombed on PostgreSQL.  LIMIT X,Y is not valid with PostgreSQL, use LIMIT X OFFSET Y instead.  Please test this on Mysql Systems to make sure it still works.



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- db.sql	22 Jun 2003 19:54:23 -0000	1.16
+++ db.sql	4 Jul 2003 05:29:10 -0000	1.17
@@ -62,7 +62,7 @@
 );
 
 #
-# Table structure for table '{PREFIX}/suppxits'
+# Table structure for table '{PREFIX}exits'
 # 
 
 CREATE TABLE {PREFIX}exits (
@@ -92,6 +92,20 @@
   entry_id int(11) not null,
   PRIMARY KEY  (host,day,entry_id)
 );
+
+#
+# Table structure for table 'serendipity_css'
+#
+
+CREATE TABLE {PREFIX}css (
+  cssid {AUTOINCREMENT},
+  name varchar(40) default NULL,
+  data text
+);
+
+#
+# Table structure for table 'serendipity_config'
+#
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_entries.inc.php	25 Jun 2003 22:04:30 -0000	1.2
+++ serendipity_admin_entries.inc.php	4 Jul 2003 05:29:10 -0000	1.3
@@ -13,55 +13,66 @@
 
 // A little helper we don't want in _functions.inc.php
 function serendipity_drawList($action) {
-	global $serendipity;
-
-    // Prepare variables
-    if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
-	$perPage = 30;
-
-    // Fetch the entries
-    $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
-
-    // Prepare table
-	echo "<div class='serendipity_admin_list'>";
-	echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
-	echo "<table width='100%' class='serendipity_admin_list'>";
-	
+  global $serendipity;
+  
+  // Prepare variables
+  if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
+  $perPage = 30;
+  
+  // Fetch the entries
+  $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
+  
+  // Prepare table
+  echo "<div class='serendipity_admin_list'>";
+  echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
+  echo "<table width='100%' class='serendipity_admin_list'>";
+  
+  if ( is_array($entries) ) {
     $half = (int) ((count($entries) + 1)/2);
-
-	// Print the browse buttons
+    
+    // Print the browse buttons
     echo "<tr><td align='left'>";
     if ($serendipity["GET"]["offset"] > 0) {
-		echo '<input type="button" value="&lt;&lt;&lt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
+      echo '<input type="button" value="&lt;&lt;&lt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
     }
-	echo "</td><td align='right'>";
+    echo "</td><td align='right'>";
     if (count($entries) == $perPage) {
-    	echo '<input type="button" value="&gt;&gt;&gt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
+      echo '<input type="button" value="&gt;&gt;&gt;" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
     }
-	echo "</td></tr>";
+    echo "</td></tr>";
     // Print the entries
     $count = count($entries);
-	for ($x=0; $x<$half; $x++) {
-        ?>
-		<tr>
-		<td class="serendipity_admin_list_item">
-        <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
-		<br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
-        <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
-        </a>
-		</td>
-		<td class="serendipity_admin_list_item">
-        <?php if ($x + $half < $count) {  ?>
-        <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
-		<br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
-        <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
-        </a>
-        <?php } ?>
+    for ($x=0; $x<$half; $x++) {
+  ?>
+ <tr>
+    <td class="serendipity_admin_list_item">
+    <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
+    <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
+       <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
+       </a>
+       </td>
+       <td class="serendipity_admin_list_item">
+       <?php if ($x + $half < $count) {  ?>
+         <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
+         <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
+         <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
+         </a>
+         <?php 
+         }
+    }
+  }
+  else {
+    //We've got nothing
+    ?>
+    <tr><td class="serendipity_admin_list_item" colspan="2">
+    <?php echo NO_ENTRIES_TO_PRINT ?></td></tr>
+    <?php
+  } 
+?>
 		</td>
         </tr>
 <?php         
-    }
-    echo "</table></div>";
+  echo "</table></div>";
 }
 
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- serendipity_functions.inc.php	3 Jul 2003 22:05:52 -0000	1.89
+++ serendipity_functions.inc.php	4 Jul 2003 05:29:10 -0000	1.90
@@ -289,7 +289,7 @@
 	}
 
     if (!empty($limit)) {
-        $limit = "LIMIT $limit";
+        $limit = "LIMIT " . join (" OFFSET ", split(',', $limit));
     }
 
     $query = "SELECT e.*, a.username, c.category_name FROM