[php-blog-cvs] jBlog jBlog_layout_table.php,NONE,1.1 jBlog_functions.inc.php,1.48,1.49 jBlog_genpage.php,1.5,1.6 jBlog_plugin_api.php,1.7,1.8

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

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

Modified Files:
	jBlog_functions.inc.php jBlog_genpage.php jBlog_plugin_api.php 
Added Files:
	jBlog_layout_table.php 
Log Message:
If you want an alternate layout from the default,
$jBlog['layout_mode'] = 'nameoflayout';
in your config file will cause jBlog to look for jBlog_layout_nameoflayout.php
and use that for layout.
Added a table layout alternative.


--- NEW FILE: jBlog_layout_table.php ---
<?php

##########################################################################
# jBlog - another blogger...                                             #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/jBlog.html                            #
#                                                                        #
##########################################################################
include_once("jBlog_config.inc.php");
include_once("jBlog_plugin_api.php");
include_once("jBlog_sidebar_items.php");

?>
<div id="jBlog_banner">
	<h1><?= $jBlog['blogTitle'] ?></h1>
<?php
	$sub = isset($jBlog['blogSubTitle']) ? $jBlog['blogSubTitle'] : $jBlog['blogDescription'];
	if (strlen($sub)) {
?>
	<h2><?= $sub ?></h2>
<?php
	}
?>
</div>
<table id="mainpane">
	<tr>
<?php
	jblog_plugin_api::generate_plugins('left', 'td');
?>
<td id="content" valign="top">
			<?php
               	if (!is_numeric($jBlog["GET"]["range"]))
	               	$jBlog["GET"]["range"] = date("Ymd");

                // The main area
				switch ($jBlog["GET"]["action"]) {

                	// User wants to read the diary
                	case "read":
                        if (isset($jBlog['GET']['id'])) {
                            jBlog_printEntries(array(jBlog_fetchEntry("id", $jBlog['GET']['id'])), 1);
                        } else {
                        	jBlog_printEntries(jBlog_fetchEntries($jBlog["GET"]["range"]));
                        }
                    break;

                    // User searches
                    case "search":
						$r = jBlog_searchEntries($jBlog["GET"]["searchTerm"]);
                        echo "Your search for ".$jBlog["GET"]["searchTerm"]." returned ".
							 count($r)." results: ";
                        jBlog_printEntries($r);
                    break;

                    // Welcome screen or whatever
                    default:
                    	jBlog_printEntries(jBlog_fetchEntries(null, true, 15));
                }
            ?>
</td>
<?php
	/* Find any plugins for the RHS */
	jblog_plugin_api::generate_plugins('right', 'td');

?>
</tr>
</table>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- jBlog_functions.inc.php	11 Mar 2003 01:35:23 -0000	1.48
+++ jBlog_functions.inc.php	11 Mar 2003 01:41:06 -0000	1.49
@@ -191,13 +191,9 @@
 
     $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
-    $cursor = mysql_db_query($jBlog["dbName"], $query);
-    if (!$cursor) {
+    $ret = jBlog_db_query($query);
+    if (!$ret) {
         die("Query failed: " . mysql_error() . "\n");
-    }
-
-    while($row = mysql_fetch_assoc($cursor)) {
-		$ret[] = $row;
     }
 
     return $ret;

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_genpage.php	10 Mar 2003 04:33:34 -0000	1.5
+++ jBlog_genpage.php	11 Mar 2003 01:41:07 -0000	1.6
@@ -7,7 +7,12 @@
 </head>
 <body>
 <?php
-include ("jBlog_layout.php");
+
+if (isset($jBlog['layout_mode']) && file_exists($jBlog['jBlogPath'] . "jBlog_layout_" . $jBlog['layout_mode'] . '.php')) {
+	include "jBlog_layout_" . $jBlog['layout_mode'] . '.php';
+} else {
+	include ("jBlog_layout.php");
+}
 ?>
 </body>
 </html>

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_plugin_api.php	10 Mar 2003 22:33:14 -0000	1.7
+++ jBlog_plugin_api.php	11 Mar 2003 01:41:07 -0000	1.8
@@ -135,12 +135,12 @@
 		return jBlog_db_query($sql);
 	}
 
-	function generate_plugins($side)
+	function generate_plugins($side, $tagname='div')
 	{
 		$plugins = jblog_plugin_api::enum_plugins($side);
 		if (!is_array($plugins))
 			return;
-		echo "<div id=\"jBlog" . ucfirst($side) . "SideBar\">\n";
+		echo "<$tagname id=\"jBlog" . ucfirst($side) . "SideBar\">\n";
 		foreach ($plugins as $plugin_data) {
 			$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
 			$title = get_class($plugin);
@@ -150,7 +150,7 @@
 			ob_end_clean();
 			echo "<div class=\"$plugin->wrap_class\"><div class=\"$plugin->title_class\">$title</div><div class=\"$plugin->content_class\">$content</div></div>\n";
 		}
-		echo "</div>\n";
+		echo "</$tagname>\n";
 	}
 
 }