[php-blog-cvs] jBlog jBlog_admin_entries.inc.php,1.5,1.6 jBlog_functions.inc.php,1.45,1.46 jBlog_layout.php,1.13,1.14 jBlog_plugin_api.php,1.4,1.5

[<we...@us...>]

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

Modified Files:
	jBlog_admin_entries.inc.php jBlog_functions.inc.php 
	jBlog_layout.php jBlog_plugin_api.php 
Log Message:
Some layout tweaks.
Fix logic in updertentry so we don't get bogus error messages.



Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_admin_entries.inc.php	9 Mar 2003 02:27:55 -0000	1.5
+++ jBlog_admin_entries.inc.php	10 Mar 2003 22:11:17 -0000	1.6
@@ -74,7 +74,7 @@
         		  		              "body" =>$jBlog["POST"]["body"],
                                       "extended" => $jBlog["POST"]["extended"]);
 		$res = jBlog_updertEntry($entry);
-        if ($res != "")
+        if ($res !== true)
 			jBlog_printEntryForm("?", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "entries",
                              	 "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
         else

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- jBlog_functions.inc.php	10 Mar 2003 21:05:30 -0000	1.45
+++ jBlog_functions.inc.php	10 Mar 2003 22:11:17 -0000	1.46
@@ -857,8 +857,8 @@
     }
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
-    
-    return $entry['id'];
+   
+    return !$query  ? mysql_error() : true;
 }
 
 /**

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jBlog_layout.php	10 Mar 2003 20:50:16 -0000	1.13
+++ jBlog_layout.php	10 Mar 2003 22:11:18 -0000	1.14
@@ -31,9 +31,14 @@
     }
 ?>
 </div>
+<div id="mainpane">
 <?php
+	/* Find any plugins for the RHS */
 	jblog_plugin_api::generate_plugins('left');
+	jblog_plugin_api::generate_plugins('right');
+
 ?>
+
 <div id="content">
 			<?php
                	if (!is_numeric($jBlog["GET"]["range"]))
@@ -65,8 +70,4 @@
                 }
             ?>
 </div>
-<?php
-	/* Find any plugins for the RHS */
-	jblog_plugin_api::generate_plugins('right');
-
-?>
+</div>

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_plugin_api.php	10 Mar 2003 20:50:17 -0000	1.4
+++ jBlog_plugin_api.php	10 Mar 2003 22:11:19 -0000	1.5
@@ -1,8 +1,6 @@
 <?php
 if (IN_JBLOG !== true) die ("Don't hack!");
 
-include_once "jBlog_sidebar_items.php";
-
 /* This file defines the plugin API for jBlog.
  * By extending these classes, you can add your own code
  * to appear in the sidebar(s) of jBlog.
@@ -253,5 +251,7 @@
 	}
 
 }
+
+include_once "jBlog_sidebar_items.php";
 
 ?>