php-blog-cvs — Serendipity commit list

[php-blog-cvs] jBlog index.php,1.8,1.9

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

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

Modified Files:
	index.php 
Log Message:
fix to allow session ids to be appended to the url


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.php	13 Mar 2003 12:44:39 -0000	1.8
+++ index.php	25 Mar 2003 18:51:54 -0000	1.9
@@ -5,7 +5,7 @@
 
 $uri = $_SERVER['REQUEST_URI'];
 if (preg_match('@/archives/@', $uri)) {
-    if (preg_match('@/(d_(\d+)\.html)$@', $uri, $matches)) {
+    if (preg_match('@/(d_(\d+)\.html)@', $uri, $matches)) {
         $range = $matches[2];
         $_GET['jBlog']['action'] = "read";
         $_GET['jBlog']['range'] = $range;
@@ -29,7 +29,7 @@
         }
         
         print $data;
-    } else if (preg_match('@/(e_(\d+)\.html)$@', $uri, $matches)) {
+    } else if (preg_match('@/(e_(\d+)\.html)@', $uri, $matches)) {
         $id = $matches[2];
     
         $_GET['jBlog']['action'] = 'read';

[php-blog-cvs] jBlog INSTALL,1.3,1.4

[<jhe...@us...>]

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

Modified Files:
	INSTALL 
Log Message:
Updated installation steps


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/jBlog/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL	19 Mar 2003 13:48:27 -0000	1.3
+++ INSTALL	24 Mar 2003 12:33:00 -0000	1.4
@@ -3,9 +3,8 @@
 ###############################################################################
 
 1. Decompress and put this folder somewhere inside your document root
-2. Adjust .htaccess
-3. Open jBlog in your browser
-5. Done!
+2. Open jBlog in your browser (installer will say hi to you)
+3. Done!
 
 ###############################################################################
 # REQUIREMENTS                                                                #

[php-blog-cvs] jBlog .cvsignore,1.1,1.2

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

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

Modified Files:
	.cvsignore 
Log Message:
Ignore plugins folder


Index: .cvsignore
===================================================================
RCS file: /cvsroot/php-blog/jBlog/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	5 Mar 2003 21:09:38 -0000	1.1
+++ .cvsignore	19 Mar 2003 13:54:10 -0000	1.2
@@ -3,3 +3,4 @@
 .htaccess
 uploads
 archives
+plugins

[php-blog-cvs] jBlog INSTALL,1.2,1.3 jBlog_db_postgres.inc.php,1.1,1.2

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

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

Modified Files:
	INSTALL jBlog_db_postgres.inc.php 
Log Message:
Typo-fix in INSTALL.
Make postgres support work correctly with unix sockets.


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/jBlog/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- INSTALL	14 Mar 2003 21:15:02 -0000	1.2
+++ INSTALL	19 Mar 2003 13:48:27 -0000	1.3
@@ -14,7 +14,7 @@
 1. .htaccess support
 2. PHP Version 4 or greater (PHP 4.3.1 or greater recommended)
 3. php.ini options:
-   - short_open_tags on
+   - short_open_tag on
    - error_reporting E_ALL & ~E_NOTICE (or lower)
    - file_uploads on (For import/image upload features)
 4. php extensions:
@@ -22,7 +22,7 @@
 5. Supported database engine:
    - MySQL
    - PostGreSQL
-   - SQLite
+   - SQLite (not quite!)
 
 ###############################################################################
 # USAGE                                                                       #

Index: jBlog_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_postgres.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_db_postgres.inc.php	14 Mar 2003 02:38:05 -0000	1.1
+++ jBlog_db_postgres.inc.php	19 Mar 2003 13:48:27 -0000	1.2
@@ -4,7 +4,9 @@
 {
 	global $jBlog;
 
-	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $jBlog['dbHost'], $jBlog['dbName'], $jBlog['dbUser'], $jBlog['dbPass']));
+	$jBlog['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
+		strlen($jBlog['dbHost']) ? ('host=' . $jBlog['dbHost'] . ' ') : '',
+		$jBlog['dbName'], $jBlog['dbUser'], $jBlog['dbPass']));
 
 	return $jBlog['dbConn'];
 }
@@ -89,7 +91,9 @@
 {
 	global $jBlog;
 
-	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $hash['dbHost'], $hash['dbName'], $hash['dbUser'], $hash['dbPass']));
+	$jBlog['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
+		strlen($hash['dbHost']) ? ('host=' . $hash['dbHost'] . ' ') : '',
+		$hash['dbName'], $hash['dbUser'], $hash['dbPass']));
 	if (!$jBlog['dbConn']) {
 		$errs[] = "Could not connect to database; check your settings.";
 		return false;

[php-blog-cvs] jBlog jBlog-xmlrpc.php,1.8,1.9

[<gsc...@us...>]

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
fix to be compatible with new updert_entry



Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog-xmlrpc.php	13 Mar 2003 06:03:50 -0000	1.8
+++ jBlog-xmlrpc.php	19 Mar 2003 05:39:11 -0000	1.9
@@ -145,7 +145,6 @@
     }
     $val = $message->params[4];
     $entry['body']  = $val->getval();
-    $entry['user'] = $username;
     $id = jBlog_updertEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
@@ -182,7 +181,6 @@
     $entry['title'] = $post_array['title'];
     $entry['body'] = $post_array['description'];
     $entry['extended'] = $post_array['mt_text_more'];
-    $entry['user'] = $username;
     $id = jBlog_updertEntry($entry);
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
@@ -296,14 +294,10 @@
     $path = $jBlog["baseURL"].$jBlog['uploadPath'].$struct['name'];
     return  new XML_RPC_Response( new XML_RPC_Value(array('url' => new XML_RPC_Value($path, 'string')), 'struct'));
 }
-/*
 $fp = fopen("/tmp/kung-log", "a");
 fwrite($fp, $HTTP_RAW_POST_DATA);
 ob_start();
-*/
 $server = new XML_RPC_Server($dispatches,1);
-/*
 fwrite($fp, ob_get_contents());
 fclose($fp);
-*/
 ?>

[php-blog-cvs] jBlog jBlog_lang_es.inc.php,NONE,1.1 jBlog_lang_en.inc.php,1.1.1.1,1.2

[<sa...@us...>]

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

Modified Files:
	jBlog_lang_en.inc.php 
Added Files:
	jBlog_lang_es.inc.php 
Log Message:

en languge file contained some german abbreviations for weekdays
Added spanish file (es)


--- NEW FILE: jBlog_lang_es.inc.php ---
<?php

##########################################################################
# jBlog - un otro blogger...                                             #
##########################################################################

// Spanish language file
$jBlog["months"]  = array("", "Enero", "Febrero", "Marzo",
                    "Abril", "Mayo", "Junio", "Julio", "Augusto", "Septiembre",
                    "Octobre", "Noviembre", "Deciembre");

$jBlog["weekDayAbb"] = array("L", "Ma", "Mi", "J", "V", "S", "D");

define("JBLOG_LANG_LOADED", true);

?>

Index: jBlog_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_lang_en.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_lang_en.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_lang_en.inc.php	18 Mar 2003 19:59:22 -0000	1.2
@@ -14,10 +14,10 @@
                     "April", "Mai", "June", "July", "August", "September",
                     "October", "November", "December");
 
-$jBlog["weekDayAbb"] = array("M", "D", "M", "D", "F", "S", "S");
+$jBlog["weekDayAbb"] = array("M", "Tu", "W", "Th", "F", "Sa", "Su");
 
 
 
 define("JBLOG_LANG_LOADED", true);
 
-?>
\ No newline at end of file
+?>

[php-blog-cvs] jBlog jBlog_plugin_api.php,1.11,1.12 jBlog_admin_plugins.inc.php,1.6,1.7

[<sa...@us...>]

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

Modified Files:
	jBlog_plugin_api.php jBlog_admin_plugins.inc.php 
Log Message:
Block group placements for changing sort_order on admin_plugin.  Make instatntiate_plugin add new plugin to bottom of list.

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jBlog_plugin_api.php	11 Mar 2003 03:08:20 -0000	1.11
+++ jBlog_plugin_api.php	15 Mar 2003 22:03:28 -0000	1.12
@@ -55,7 +55,14 @@
 		
 		$key = $plugin_class_id . ":" . $id;
 
-		jBlog_db_query("INSERT INTO $jBlog[dbPrefix]plugins (name) values ('$key')");
+		$rs = jBlog_db_query("SELECT MAX(sort_order) as sort_order_max FROM $jBlog[dbPrefix]plugins",true,'num');
+
+		if (is_array($rs))
+			$nextidx = intval($rs[0]+1);
+		else
+			$nextidx = 0;
+
+		jBlog_db_query("INSERT INTO $jBlog[dbPrefix]plugins (name, sort_order) values ('$key', $nextidx)");
 
 		return $key;
 	}

Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_admin_plugins.inc.php	15 Mar 2003 08:39:29 -0000	1.6
+++ jBlog_admin_plugins.inc.php	15 Mar 2003 22:03:28 -0000	1.7
@@ -126,8 +126,6 @@
 	}
 }
 
-/* very simple configuration for the moment; just change the placement */
-$plugins = jblog_plugin_api::enum_plugins();
 /* list of classes for creating instances */
 $classes = jblog_plugin_api::enum_plugin_classes();
 
@@ -189,50 +187,56 @@
 }
 
 $sort_order = 0;
-$sort_idx = 0;
 
-foreach ($plugins as $plugin_data) {
-	$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
+/* Block display the plugins per placement location. */
+$plugin_placements = array('left','right','hide');
+foreach ($plugin_placements as $plugin_placement) {
+	$plugins = jblog_plugin_api::enum_plugins($plugin_placement);
+	$sort_idx = 0;
+	foreach ($plugins as $plugin_data) {
+		$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
 
-	$key = urlencode($plugin_data['name']);
+		$key = urlencode($plugin_data['name']);
 
-	/* query for its name, description and configuration data */
-	$bag = new jBlog_property_bag;
-	$plugin->introspect($bag);
+		/* query for its name, description and configuration data */
+		$bag = new jBlog_property_bag;
+		$plugin->introspect($bag);
 
-	$name = htmlentities($bag->get('name'));
-	$desc = htmlentities($bag->get('description'));
-	$place = placement_box("jBlog[placement][" . $plugin_data['name'] . "]", $plugin_data['placement']);
+		$name = htmlentities($bag->get('name'));
+		$desc = htmlentities($bag->get('description'));
+		$place = placement_box("jBlog[placement][" . $plugin_data['name'] . "]", $plugin_data['placement']);
 
-	$title = "";
-	ob_start();
-	$plugin->generate_content($title);
-	ob_end_clean();
-	if (strlen(trim($title)) == 0) {
-		$title = " ";
-	}
+		$title = "";
+		ob_start();
+		$plugin->generate_content($title);
+		ob_end_clean();
+		if (strlen(trim($title)) == 0) {
+			$title = " ";
+		}
 
-	if ($bag->is_set('configuration')) {
-		$url = "?jBlog[adminModule]=plugins&jBlog[plugin_to_conf]=$key";
-		$desc = "<a href=\"$url\">$desc</a>";
-		$name = "<a href=\"$url\">$name</a>";
-		$title = "<a href=\"$url\">$title</a>";
-	}
+		if ($bag->is_set('configuration')) {
+			$url = "?jBlog[adminModule]=plugins&jBlog[plugin_to_conf]=$key";
+			$desc = "<a href=\"$url\">$desc</a>";
+			$name = "<a href=\"$url\">$name</a>";
+			$title = "<a href=\"$url\">$title</a>";
+		}
 
-	if ($sort_idx == 0)
-		$moveup = "&nbsp; &nbsp;";
-	else
-		$moveup = "<a href=\"?jBlog[adminModule]=plugins&submit=move+up&jBlog[plugin_to_move]=$key\">UP</a>";
+		/* Only display UP/DOWN links if there's somewhere for the plugin to go */
+		if ($sort_idx == 0)
+			$moveup = "&nbsp; &nbsp;";
+		else
+			$moveup = "<a href=\"?jBlog[adminModule]=plugins&submit=move+up&jBlog[plugin_to_move]=$key\">UP</a>";
 
-	if ($sort_idx == (count($plugins)-1))
-		$movedown = "";
-	else
-		$movedown = "<a href=\"?jBlog[adminModule]=plugins&submit=move+down&jBlog[plugin_to_move]=$key\">DOWN</a>";
+		if ($sort_idx == (count($plugins)-1))
+			$movedown = "";
+		else
+			$movedown = "<a href=\"?jBlog[adminModule]=plugins&submit=move+down&jBlog[plugin_to_move]=$key\">DOWN</a>";
 
 
-	echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place $moveup $movedown</td></tr>\n";
+		echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place $moveup $movedown</td></tr>\n";
 
-	$sort_idx++;
+		$sort_idx++;
+	}
 }
 ?>
 </table>

[php-blog-cvs] jBlog jBlog_admin_plugins.inc.php,1.5,1.6

[<sa...@us...>]

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

Modified Files:
	jBlog_admin_plugins.inc.php 
Log Message:
Provide ability to change the sort_order of plugins

Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_admin_plugins.inc.php	13 Mar 2003 12:44:39 -0000	1.5
+++ jBlog_admin_plugins.inc.php	15 Mar 2003 08:39:29 -0000	1.6
@@ -5,6 +5,37 @@
 include_once "jBlog_plugin_api.php";
 include_once "jBlog_sidebar_items.php";
 
+if (isset($_GET['jBlog']['plugin_to_move']) && isset($_GET['submit'])) {
+	$plugins = jblog_plugin_api::enum_plugins();
+	/* Renumber the sort order to be certain that one actually exists 
+	   Also look for the one we're going to move */
+	$idx_to_move = -1;
+	for($idx=0; $idx<count($plugins); $idx++) {
+		$plugins[$idx]['sort_order'] = $idx;
+		if ($plugins[$idx]['name'] == $_GET['jBlog']['plugin_to_move'])
+			$idx_to_move = $idx;
+	}
+	/* If idx_to_move is still -1 then we never found it (shouldn't happen under normal conditions) 
+	   Also make sure the swaping idx is around */
+	if ($idx_to_move >= 0 && (($_GET['submit'] == 'move down' && $idx_to_move < (count($plugins)-1)) || ($_GET['submit'] == 'move up' && $idx_to_move > 0))) {
+		/* Swap the one were moving with the one that's in the spot we're moving to */
+		$tmp = $plugins[$idx_to_move]['sort_order'];
+		$plugins[$idx_to_move]['sort_order'] = (int)$plugins[$idx_to_move+($_GET['submit'] == 'move down' ? 1 : -1)]['sort_order'];
+		$plugins[$idx_to_move+($_GET['submit'] == 'move down' ? 1 : -1)]['sort_order'] = (int)$tmp;
+
+		/* Update table */
+		foreach($plugins as $plugin) {
+			$key = jBlog_db_escape_string($plugin['name']);
+			jBlog_db_query("UPDATE $jBlog[dbPrefix]plugins SET sort_order=$plugin[sort_order] WHERE name='$key'");
+		}			
+	}
+
+	/* TODO: Moving The first Right oriented plugin up, 
+		 or the last left oriented plugin down 
+		 should not be displayed to the user as an option.
+		 It's a behavior which really has no meaning. */
+}
+
 if (isset($_GET['jBlog']['plugin_to_conf'])) {
 	/* configure a specific instance */
 
@@ -28,6 +59,7 @@
 		}
 	}
 
+	
 ?>
 <form method="POST" name="jBlogPluginConfigure">
 
@@ -157,6 +189,7 @@
 }
 
 $sort_order = 0;
+$sort_idx = 0;
 
 foreach ($plugins as $plugin_data) {
 	$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
@@ -186,7 +219,20 @@
 		$title = "<a href=\"$url\">$title</a>";
 	}
 
-	echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place</td></tr>\n";
+	if ($sort_idx == 0)
+		$moveup = "&nbsp; &nbsp;";
+	else
+		$moveup = "<a href=\"?jBlog[adminModule]=plugins&submit=move+up&jBlog[plugin_to_move]=$key\">UP</a>";
+
+	if ($sort_idx == (count($plugins)-1))
+		$movedown = "";
+	else
+		$movedown = "<a href=\"?jBlog[adminModule]=plugins&submit=move+down&jBlog[plugin_to_move]=$key\">DOWN</a>";
+
+
+	echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place $moveup $movedown</td></tr>\n";
+
+	$sort_idx++;
 }
 ?>
 </table>

[php-blog-cvs] jBlog jBlog.css,1.4,1.5

[<sa...@us...>]

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

Modified Files:
	jBlog.css 
Log Message:
Add width:100% to .jBlog_entry to fix formatting of wide entries.  Also clean up WS issues.

Index: jBlog.css
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog.css	14 Mar 2003 04:51:35 -0000	1.4
+++ jBlog.css	15 Mar 2003 07:52:45 -0000	1.5
@@ -1,219 +1,220 @@
-#mainpane {
-    width: 100%;
-}
-
-#content {
-    width: auto;
-
-}
-
-#jBlogRightSideBar {
-    width: 250px;
-    background-color: white;
-    border-left: 1px dashed #4068ab;
-    border-bottom: 1px dashed #4068ab;
-    padding: 20px;
-vertical-align: top;
-}
-
-#jBlogLeftSideBar {
-    width: 250px;
-    background-color: white;
-    border-right: 1px dashed #4068ab;
-    border-bottom: 1px dashed #4068ab;
-    padding: 20px;
-vertical-align: top;
-}
-
-BODY {
-    margin: 0px;
-    background-color: white;
-    font-size: 10px;
-    font-family: verdana, arial, helvetica, sans-serif;
-    height: 8.5in;
-}
-
-P, TD, TH, DIV, SPAN {
-    font-family: verdana, arial, helvetica, sans-serif;
-}
-
-#jBlog_banner {
-    height: 72px;
-    background-color: #6666CC;
-    width: 100%;
-    border-top: solid 4px #8080ff;
-    border-bottom: dashed 1px #000080;
-}
-
-#jBlog_banner h1 {
-    color: white;
-    font-size: 28px;
-    padding-left: 5px;
-margin: 0px;
-}
-
-#jBlog_banner h2 {
-    font-size: 18px;
-    color: #e0e0e0;
-    padding-left: 5px;
-    padding-bottom: 10px;
-margin: 0px;
-}
-
-
-.jBlog_title {
-   font-size: 20px;
-   color: #1a3c5a;
-   font-weight: bold;
-   border: 1px;
-   padding-left: 20px;
-   margin-bottom: 8px;
-   margin-top: 8px;
-}
-
-.jBlog_entry {
-    color: #404040;
-    font-size: 13px;
-    padding-left: 20px;
-    padding-right: 20px;
-    padding-bottom: 10px;
-    display: block;
-}
-
-div.jBlog_Entry_Date {
-    border: 1px dashed #d0d0d0;
-    padding: 10px;
-    margin: 10px;
-    width: auto;
-}
-
-.jBlog_date {
-    text-align: right;
-    display: block;
-    width: 100%;
-    color: #000080;
-    font-size: 18px;
-    font-weight: bold;
-}
-
-.jBlog_commentsTitle {
-    display: block;
-    background-color: #f2f4f6;
-    width: 100%;
-    border: 0px;
-    color: #404040;
-    font-size: 16px;
-    padding-left:8px;
-}
-
-.jBlog_time {
-    display: block;
-    margin-top: 8px;
-    font-size: 12px;
-    font-weight: bold;
-}
-
-TD.jBlog_commentsLabel {
-    font-size: 12px;
-    font-weight: bold;
-    width: 10%;
-    vertical-align: top;
-}
-
-TD.jBlog_comment {
-    padding-left:8px;
-    font-size: 13px;
-    margin-bottom: 12px;
-    color: #404040;
-}
-
-.jBlog_comment_source {
-    margin-top: 5px;
-}
-
-TD.jBlogEntriesBox {
-    background-color: #ffffff;
-    padding: 10px;
-    margin: 10px;
-}
-
-TD.jBlog_admin {
-    padding: 10px;
-}
-
-A {
-    font-size: 13px;
-    color: #8080FF;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-A:hover {
-    text-decoration: underline;
-}
-
-TABLE.jBlog_calendar TD {
-    font-size:11px;
-    padding: 3px;
-}
-TABLE.jBlog_calendar A {
-    font-weight: bold;
-    text-decoration:none;
-}
-
-TABLE.jBlog_calendar A:hover {
-    text-decoration:underline;
-}
-
-TD.jBlog_weekDayName {
-    background-color: #FFFFFF;
-    font-size:11px;
-    font-weight:bold;
-}
-
-div.jBlogPlug, div.jBlogPlug A {
-    font-size: 11px;
-}
-
-/* Container for each item on the side bar */
-div.jBlogSideBarItem {
-    padding-bottom: 12px;
-    margin-bottom: 12px;
-    border-bottom: solid 1px #d0d0d0;
-}
-
-/* title of an individual item */
-div.jBlogSideBarTitle {
-    font-size: 12px;
-    font-weight: bold;
-    margin-bottom: 8px;
-}
-
-img.jBlogImageButton {
-    cursor: hand;
-}
-
-td.jBlogSideBar {
-    width: 180px;
-    background-color: #ffffff;
-    padding: 10px;
-    border-right: 1px dashed #4068ab;
-    border-bottom: 1px dashed #4068ab;
-}
-
-div.jBlog_admin_title {
-    font-size: 22px;
-    font-weight: bold;
-    margin-bottom: 12px;
-}
-
-div.jBlog_admin_list_title {
-    font-size: 12px;
-    font-weight: bold;
-    margin-bottom: 8px;
-}
-
-td.jBlog_admin_list_item {
-    padding: 15px;
-    border: dotted 1px #d0d0d0;
-}
+#mainpane {
+    width: 100%;
+}
+
+#content {
+    width: auto;
+
+}
+
+#jBlogRightSideBar {
+    width: 250px;
+    background-color: white;
+    border-left: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+    padding: 20px;
+    vertical-align: top;
+}
+
+#jBlogLeftSideBar {
+    width: 250px;
+    background-color: white;
+    border-right: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+    padding: 20px;
+    vertical-align: top;
+}
+
+BODY {
+    margin: 0px;
+    background-color: white;
+    font-size: 10px;
+    font-family: verdana, arial, helvetica, sans-serif;
+    height: 8.5in;
+}
+
+P, TD, TH, DIV, SPAN {
+    font-family: verdana, arial, helvetica, sans-serif;
+}
+
+#jBlog_banner {
+    height: 72px;
+    background-color: #6666CC;
+    width: 100%;
+    border-top: solid 4px #8080ff;
+    border-bottom: dashed 1px #000080;
+}
+
+#jBlog_banner h1 {
+    color: white;
+    font-size: 28px;
+    padding-left: 5px;
+    margin: 0px;
+}
+
+#jBlog_banner h2 {
+    font-size: 18px;
+    color: #e0e0e0;
+    padding-left: 5px;
+    padding-bottom: 10px;
+    margin: 0px;
+}
+
+
+.jBlog_title {
+   font-size: 20px;
+   color: #1a3c5a;
+   font-weight: bold;
+   border: 1px;
+   padding-left: 20px;
+   margin-bottom: 8px;
+   margin-top: 8px;
+}
+
+.jBlog_entry {
+    color: #404040;
+    font-size: 13px;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-bottom: 10px;
+    display: block;
+    width: 100%;
+}
+
+div.jBlog_Entry_Date {
+    border: 1px dashed #d0d0d0;
+    padding: 10px;
+    margin: 10px;
+    width: auto;
+}
+
+.jBlog_date {
+    text-align: right;
+    display: block;
+    width: 100%;
+    color: #000080;
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.jBlog_commentsTitle {
+    display: block;
+    background-color: #f2f4f6;
+    width: 100%;
+    border: 0px;
+    color: #404040;
+    font-size: 16px;
+    padding-left:8px;
+}
+
+.jBlog_time {
+    display: block;
+    margin-top: 8px;
+    font-size: 12px;
+    font-weight: bold;
+}
+
+TD.jBlog_commentsLabel {
+    font-size: 12px;
+    font-weight: bold;
+    width: 10%;
+    vertical-align: top;
+}
+
+TD.jBlog_comment {
+    padding-left:8px;
+    font-size: 13px;
+    margin-bottom: 12px;
+    color: #404040;
+}
+
+.jBlog_comment_source {
+    margin-top: 5px;
+}
+
+TD.jBlogEntriesBox {
+    background-color: #ffffff;
+    padding: 10px;
+    margin: 10px;
+}
+
+TD.jBlog_admin {
+    padding: 10px;
+}
+
+A {
+    font-size: 13px;
+    color: #8080FF;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+A:hover {
+    text-decoration: underline;
+}
+
+TABLE.jBlog_calendar TD {
+    font-size:11px;
+    padding: 3px;
+}
+TABLE.jBlog_calendar A {
+    font-weight: bold;
+    text-decoration:none;
+}
+
+TABLE.jBlog_calendar A:hover {
+    text-decoration:underline;
+}
+
+TD.jBlog_weekDayName {
+    background-color: #FFFFFF;
+    font-size:11px;
+    font-weight:bold;
+}
+
+div.jBlogPlug, div.jBlogPlug A {
+    font-size: 11px;
+}
+
+/* Container for each item on the side bar */
+div.jBlogSideBarItem {
+    padding-bottom: 12px;
+    margin-bottom: 12px;
+    border-bottom: solid 1px #d0d0d0;
+}
+
+/* title of an individual item */
+div.jBlogSideBarTitle {
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+img.jBlogImageButton {
+    cursor: hand;
+}
+
+td.jBlogSideBar {
+    width: 180px;
+    background-color: #ffffff;
+    padding: 10px;
+    border-right: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+}
+
+div.jBlog_admin_title {
+    font-size: 22px;
+    font-weight: bold;
+    margin-bottom: 12px;
+}
+
+div.jBlog_admin_list_title {
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+td.jBlog_admin_list_item {
+    padding: 15px;
+    border: dotted 1px #d0d0d0;
+}

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.73,1.74

[<sa...@us...>]

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
That bold pattern is more complicated that it looked

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- jBlog_functions.inc.php	14 Mar 2003 21:50:18 -0000	1.73
+++ jBlog_functions.inc.php	14 Mar 2003 22:46:07 -0000	1.74
@@ -509,7 +509,10 @@
     
     //bold
     $ret = str_replace('\*',chr(1),$ret);
-    $ret = preg_replace('/\B\*([^*]*)\*\B/','<strong>\1</strong>',$ret);
+    $ret = str_replace('**',chr(2),$ret);
+    $ret = preg_replace('/(\S)\*(\S)/','\1' . chr(1) . '\2',$ret);
+    $ret = preg_replace('/\B\*([^*]+)\*\B/','<strong>\1</strong>',$ret);
+    $ret = str_replace(chr(2),'**',$ret);
     $ret = str_replace(chr(1),'\*',$ret);
 
     // italics

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.72,1.73

[<sa...@us...>]

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Don't treat *s in the middle of words as bold markers

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- jBlog_functions.inc.php	14 Mar 2003 06:27:04 -0000	1.72
+++ jBlog_functions.inc.php	14 Mar 2003 21:50:18 -0000	1.73
@@ -509,7 +509,7 @@
     
     //bold
     $ret = str_replace('\*',chr(1),$ret);
-    $ret = preg_replace('/\*([\S ]+?)\*/','<strong>\1</strong>',$ret);
+    $ret = preg_replace('/\B\*([^*]*)\*\B/','<strong>\1</strong>',$ret);
     $ret = str_replace(chr(1),'\*',$ret);
 
     // italics

[php-blog-cvs] jBlog INSTALL,1.1.1.1,1.2

[<sa...@us...>]

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

Modified Files:
	INSTALL 
Log Message:
Add REQUIREMENTS section

Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/jBlog/INSTALL,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- INSTALL	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ INSTALL	14 Mar 2003 21:15:02 -0000	1.2
@@ -8,6 +8,23 @@
 5. Done!
 
 ###############################################################################
+# REQUIREMENTS                                                                #
+###############################################################################
+
+1. .htaccess support
+2. PHP Version 4 or greater (PHP 4.3.1 or greater recommended)
+3. php.ini options:
+   - short_open_tags on
+   - error_reporting E_ALL & ~E_NOTICE (or lower)
+   - file_uploads on (For import/image upload features)
+4. php extensions:
+   - None at this time.
+5. Supported database engine:
+   - MySQL
+   - PostGreSQL
+   - SQLite
+
+###############################################################################
 # USAGE                                                                       #
 ###############################################################################
 jBlog consists of 3 parts:

[php-blog-cvs] jBlog compat.php,1.2,1.3

[<sa...@us...>]

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

Modified Files:
	compat.php 
Log Message:
Make sure shorthand vars exist

Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/compat.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- compat.php	3 Mar 2003 21:50:51 -0000	1.2
+++ compat.php	14 Mar 2003 21:12:07 -0000	1.3
@@ -10,4 +10,15 @@
         return $data;
     }
 }
+
+if (!$_POST)
+	$_POST = &$HTTP_POST_VARS;
+if (!$_GET)
+	$_GET = &$HTTP_GET_VARS;
+if (!$_SESSION)
+	$_SESSION = &$HTTP_SESSION_VARS;
+if (!$_COOKIE)
+	$_COOKIE = &$HTTP_COOKIE_VARS;
+if (!$_SERVER)
+	$_SERVER = &$HTTP_SERVER_VARS;
 ?>

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.71,1.72

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fix display of comments form on index page with only one entry


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- jBlog_functions.inc.php	14 Mar 2003 05:26:20 -0000	1.71
+++ jBlog_functions.inc.php	14 Mar 2003 06:27:04 -0000	1.72
@@ -313,7 +313,7 @@
 				. date("H:i", $entry['timestamp'])
 				. "</a>";
 
-			if ($num_entries != 1) {
+			if (!isset($jBlog['GET']['id'])) {
 				$label = $entry['comments'] == 1 ? "Comment" : "Comments";
 				echo " | <a href=\"{$jBlog['jBlogHTTPPath']}comment.php?jBlog[entry_id]={$entry['id']}\" "
 					. "onClick=\"window.open(this.href, 'comments', 'width=480,height=480,scrollbars=yes'); return false;\">"
@@ -336,7 +336,7 @@
             echo "</rdf:RDF>\n";
             echo "-->\n";
 
-            if ($num_entries == 1) {
+            if (isset($jBlog['GET']['id'])) {
                 echo '<link rel="pingback" href="' . $jBlog['baseURL'] . "comment.php?type=pingback&entry_id={$entry['id']}\" />\n";
                 echo "\n<br />\n";
                 echo '<div class="jBlog_commentsTitle">Comments</div>';

[php-blog-cvs] jBlog jBlog_config_local.tpl,1.7,1.8

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

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

Modified Files:
	jBlog_config_local.tpl 
Log Message:
turn off wysiwyg until mozilla works.


Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_config_local.tpl	14 Mar 2003 04:04:26 -0000	1.7
+++ jBlog_config_local.tpl	14 Mar 2003 06:18:30 -0000	1.8
@@ -23,7 +23,7 @@
 $jBlog["pass"]     = "{pass|string|j}";                  // Password for admin login
 $jBlog["email"]     = "{email|string|j}";                  // Email for admin login
 $jBlog["want_mail"] = {want_mail|bool|true};               // Do you want to receive emails when comments are posted to your jBlog?
-$jBlog["wysiwyg"]	= {wysiwyg|bool|true};									// Do you want to use the WYSIWYG editor?
+$jBlog["wysiwyg"]	= {wysiwyg|bool|false};									// Do you want to use the WYSIWYG editor?
 $jBlog["layout_mode"] = "{layout_mode|string|table}";     // Layout mode
 
 $jBlog["blogTitle"] = "{blogTitle|string|Foo Bar}";  // Site title

[php-blog-cvs] jBlog jBlog_config.inc.php,1.7,1.8

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

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

Modified Files:
	jBlog_config.inc.php 
Log Message:
This might even work for magic_quotes_gpc people...


Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_config.inc.php	14 Mar 2003 05:38:36 -0000	1.7
+++ jBlog_config.inc.php	14 Mar 2003 05:50:58 -0000	1.8
@@ -65,7 +65,13 @@
 function jBlog_strip_quotes(&$var)
 {
     if (is_array($var)) {
-        array_walk($var[$k], 'jBlog_strip_quotes');
+		foreach ($var as $k => $v) {
+			if (is_array($v)) {
+				array_walk($var[$k], 'jBlog_strip_quotes');
+			} else {
+				$var[$k] = stripslashes($v);
+			}
+		}
     } else {
         $var = stripslashes($var);
     }

[php-blog-cvs] jBlog jBlog_config.inc.php,1.6,1.7

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

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

Modified Files:
	jBlog_config.inc.php 
Log Message:
Naughty ilia


Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_config.inc.php	14 Mar 2003 04:04:26 -0000	1.6
+++ jBlog_config.inc.php	14 Mar 2003 05:38:36 -0000	1.7
@@ -64,7 +64,7 @@
 // courtesy of il...@ph...
 function jBlog_strip_quotes(&$var)
 {
-    if (is_array($v)) {
+    if (is_array($var)) {
         array_walk($var[$k], 'jBlog_strip_quotes');
     } else {
         $var = stripslashes($var);

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.70,1.71

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
sorry Wez, forgot i already added that file :)


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- jBlog_functions.inc.php	14 Mar 2003 05:22:33 -0000	1.70
+++ jBlog_functions.inc.php	14 Mar 2003 05:26:20 -0000	1.71
@@ -12,7 +12,7 @@
 if (IN_JBLOG !== true) die ("Don't hack!");
 
 include_once "jBlog_db.inc.php";
-include_once "jBlog_compat.inc.php";
+include_once "compat.php";
 
 $jBlog["imageList"] = array();
 function jBlog_displayCommentForm($id) {

[php-blog-cvs] jBlog jBlog_compat.inc.php,1.2,NONE

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

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

Removed Files:
	jBlog_compat.inc.php 
Log Message:
compat.php already exists...
i *added* that file :)


--- jBlog_compat.inc.php DELETED ---

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.69,1.70

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Will probably need this here so that the image stuff will work


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- jBlog_functions.inc.php	14 Mar 2003 02:49:46 -0000	1.69
+++ jBlog_functions.inc.php	14 Mar 2003 05:22:33 -0000	1.70
@@ -12,6 +12,7 @@
 if (IN_JBLOG !== true) die ("Don't hack!");
 
 include_once "jBlog_db.inc.php";
+include_once "jBlog_compat.inc.php";
 
 $jBlog["imageList"] = array();
 function jBlog_displayCommentForm($id) {

[php-blog-cvs] jBlog jBlog_compat.inc.php,1.1,1.2

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

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

Modified Files:
	jBlog_compat.inc.php 
Log Message:
Always use binary mode for win32 luser compatibility


Index: jBlog_compat.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_compat.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_compat.inc.php	14 Mar 2003 05:20:13 -0000	1.1
+++ jBlog_compat.inc.php	14 Mar 2003 05:21:19 -0000	1.2
@@ -1,7 +1,7 @@
 <?php
 if (!function_exists("file_get_contents")) {
     function file_get_contents($filename) {
-        $fp = fopen($filename, "r");
+        $fp = fopen($filename, "rb");
         $data = fread($fp, filesize($filename));
         fclose($fp);
 

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.14,1.15

[<gsc...@us...>]

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

Modified Files:
	jBlog_admin_installer.inc.php 
Log Message:
added compat to installer


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jBlog_admin_installer.inc.php	14 Mar 2003 04:04:26 -0000	1.14
+++ jBlog_admin_installer.inc.php	14 Mar 2003 05:20:16 -0000	1.15
@@ -11,6 +11,7 @@
 
 if (file_exists("./jBlog_config_local.inc.php") && IN_JBLOG !== true) die ("Don't hack!");
 umask(0000);
+include_once('compat.php');
 
 function jBlog_query_default($optname, $default)
 {

[php-blog-cvs] jBlog jBlog_compat.inc.php,NONE,1.1

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

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

Added Files:
	jBlog_compat.inc.php 
Log Message:
add compat file for Pollita


--- NEW FILE: jBlog_compat.inc.php ---
<?php
if (!function_exists("file_get_contents")) {
    function file_get_contents($filename) {
        $fp = fopen($filename, "r");
        $data = fread($fp, filesize($filename));
        fclose($fp);

        return $data;
    }
}
?>

[php-blog-cvs] jBlog jBlog.css,1.3,1.4

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

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

Modified Files:
	jBlog.css 
Log Message:
Make my funky stylesheet the default


Index: jBlog.css
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog.css	5 Mar 2003 21:09:39 -0000	1.3
+++ jBlog.css	14 Mar 2003 04:51:35 -0000	1.4
@@ -1,174 +1,219 @@
-BODY {
-	background: #d4dce8;
-}
-
-.jBlog_banner {
-	font-size: 30px;
-	color: #1a3c5a;
-	border: 0px;
-	padding-left: 5px;
-}
-
-.jBlog_subbanner {
-	font-size: 20px;
-	color: #1a3c5a;
-	border: 0px;
-	padding-left: 5px;
-}
-
-.jBlog_title {
-	font-size: 20px;
-	color: #1a3c5a;
-	border: 0px;
-	padding-left: 20px;
-}
-
-.jBlog_entry {
-	color: #404040;
-	font-size: 14px;
-	padding-left: 20px;
-	width: 500px;
-	padding-bottom: 10px;
-}
-
-.jBlog_date, .jBlog_commentsTitle {
-	background: #f2f4f6;
-	border: 0px;
-	color; #404040;
-	font-size: 25px;
-	border: 1px dashed #AABBEE;
-	padding-left:8px;
-}
-
-.jBlog_commentsTitle {
-    border: none;
-}
-
-.jBlog_time {
-	font-size: 12px;
-	font-weight: bold;
-}
-
-TD.jBlog_commentsLabel {
-    font-size: 14px;
-    font-weight: bold;
-    width: 10%;
-}
-
-TD.jBlog_comment {
-    border: 1px dashed #FF0000;
-    padding-left:8px;
-}
-
-TD.jBlog_rightBar {
-
-}
-
-
-TD.jBlogLeftBox, TD.jBlogRightBox {
-	font-size: 14px;
-	background: #ffffff;
-    border: 1px solid #4068ab;
-}
-
-TD.jBlogLeftBox A, TD.jBlogRightBox A {
-	font-size: 13px;
-	color: #1a3c5a;
-    font-weight: bold;
-    text-decoration: none;
-}
-
-TD.jBlogLeftBox A:hover, TD.jBlogRightBox A:hover {
-	text-decoration: underline;
-}
-
-TABLE.jBlog_calendar {
-
-}
-
-TABLE.jBlog_calendar A {
-	font-weight: bold;
-}
-
-TD.jBlog_calendarHeader {
-    border-left:0px solid #000000;
-    background: #FFFFFF;
-    font-size:11px;
-}
-
-TD.jBlog_calendarHeader A {
-    text-decoration:none;
-    color: #000000;
-}
-
-TD.jBlog_calendarHeader A:hover {
-    text-decoration:underline;
-}
-
-TD.jBlog_weekDayName {
-    background: #FFFFFF;
-    font-family: Arial;
-    font-size:11px;
-    font-weight:bold;
-}
-
-TD.jBlog_calendarDay {
-    color: #000000;
-    background: #DEDEDE;
-    border-top: 1px solid #7B7B7B;
-    border-right: 1px solid #7B7B7B;
-    font-size:11px;
-}
-
-TD.jBlog_calendarDayFirstInRow {
-    color: #000000;
-    background: #DEDEDE;
-    border-top: 1px solid #7B7B7B;
-    border-right: 1px solid #7B7B7B;
-    border-left: 1px solid #7B7B7B;
-    font-size:11px;
-}
-
-TD.jBlog_calendarDayLastRow {
-    color: #000000;
-    background: #DEDEDE;
-    border-top: 1px solid #7B7B7B;
-    border-right: 1px solid #7B7B7B;
-    border-bottom: 1px solid #7B7B7B;
-    font-size:11px;
-}
-
-TD.jBlog_calendarDay A {
-    text-decoration:none;
-    color: #000000;
-}
-
-TD.jBlog_calendarDayFirstInRow A {
-    text-decoration:none;
-    color: #000000;
-}
-
-TD.jBlog_calendarDayLastRow A {
-    text-decoration:none;
-    color: #000000;
-}
-
-TD.jBlog_calendarDay A:hover {
-    text-decoration:underline;
-}
-
-TD.jBlog_calendarDayFirstInRow A:hover {
-    text-decoration:underline;
-}
-
-TD.jBlog_calendarDayLastRow A:hover {
-    text-decoration:underline;
-}
-
-TD.jBlog_calendarBlankDay {
-    color: #000000;
-    background: #EFEFEF;
-    border-top: 1px solid #7B7B7B;
-    border-right: 1px solid #7B7B7B;
-    font-size:8px;
-}
+#mainpane {
+    width: 100%;
+}
+
+#content {
+    width: auto;
+
+}
+
+#jBlogRightSideBar {
+    width: 250px;
+    background-color: white;
+    border-left: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+    padding: 20px;
+vertical-align: top;
+}
+
+#jBlogLeftSideBar {
+    width: 250px;
+    background-color: white;
+    border-right: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+    padding: 20px;
+vertical-align: top;
+}
+
+BODY {
+    margin: 0px;
+    background-color: white;
+    font-size: 10px;
+    font-family: verdana, arial, helvetica, sans-serif;
+    height: 8.5in;
+}
+
+P, TD, TH, DIV, SPAN {
+    font-family: verdana, arial, helvetica, sans-serif;
+}
+
+#jBlog_banner {
+    height: 72px;
+    background-color: #6666CC;
+    width: 100%;
+    border-top: solid 4px #8080ff;
+    border-bottom: dashed 1px #000080;
+}
+
+#jBlog_banner h1 {
+    color: white;
+    font-size: 28px;
+    padding-left: 5px;
+margin: 0px;
+}
+
+#jBlog_banner h2 {
+    font-size: 18px;
+    color: #e0e0e0;
+    padding-left: 5px;
+    padding-bottom: 10px;
+margin: 0px;
+}
+
+
+.jBlog_title {
+   font-size: 20px;
+   color: #1a3c5a;
+   font-weight: bold;
+   border: 1px;
+   padding-left: 20px;
+   margin-bottom: 8px;
+   margin-top: 8px;
+}
+
+.jBlog_entry {
+    color: #404040;
+    font-size: 13px;
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-bottom: 10px;
+    display: block;
+}
+
+div.jBlog_Entry_Date {
+    border: 1px dashed #d0d0d0;
+    padding: 10px;
+    margin: 10px;
+    width: auto;
+}
+
+.jBlog_date {
+    text-align: right;
+    display: block;
+    width: 100%;
+    color: #000080;
+    font-size: 18px;
+    font-weight: bold;
+}
+
+.jBlog_commentsTitle {
+    display: block;
+    background-color: #f2f4f6;
+    width: 100%;
+    border: 0px;
+    color: #404040;
+    font-size: 16px;
+    padding-left:8px;
+}
+
+.jBlog_time {
+    display: block;
+    margin-top: 8px;
+    font-size: 12px;
+    font-weight: bold;
+}
+
+TD.jBlog_commentsLabel {
+    font-size: 12px;
+    font-weight: bold;
+    width: 10%;
+    vertical-align: top;
+}
+
+TD.jBlog_comment {
+    padding-left:8px;
+    font-size: 13px;
+    margin-bottom: 12px;
+    color: #404040;
+}
+
+.jBlog_comment_source {
+    margin-top: 5px;
+}
+
+TD.jBlogEntriesBox {
+    background-color: #ffffff;
+    padding: 10px;
+    margin: 10px;
+}
+
+TD.jBlog_admin {
+    padding: 10px;
+}
+
+A {
+    font-size: 13px;
+    color: #8080FF;
+    font-weight: bold;
+    text-decoration: none;
+}
+
+A:hover {
+    text-decoration: underline;
+}
+
+TABLE.jBlog_calendar TD {
+    font-size:11px;
+    padding: 3px;
+}
+TABLE.jBlog_calendar A {
+    font-weight: bold;
+    text-decoration:none;
+}
+
+TABLE.jBlog_calendar A:hover {
+    text-decoration:underline;
+}
+
+TD.jBlog_weekDayName {
+    background-color: #FFFFFF;
+    font-size:11px;
+    font-weight:bold;
+}
+
+div.jBlogPlug, div.jBlogPlug A {
+    font-size: 11px;
+}
+
+/* Container for each item on the side bar */
+div.jBlogSideBarItem {
+    padding-bottom: 12px;
+    margin-bottom: 12px;
+    border-bottom: solid 1px #d0d0d0;
+}
+
+/* title of an individual item */
+div.jBlogSideBarTitle {
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+img.jBlogImageButton {
+    cursor: hand;
+}
+
+td.jBlogSideBar {
+    width: 180px;
+    background-color: #ffffff;
+    padding: 10px;
+    border-right: 1px dashed #4068ab;
+    border-bottom: 1px dashed #4068ab;
+}
+
+div.jBlog_admin_title {
+    font-size: 22px;
+    font-weight: bold;
+    margin-bottom: 12px;
+}
+
+div.jBlog_admin_list_title {
+    font-size: 12px;
+    font-weight: bold;
+    margin-bottom: 8px;
+}
+
+td.jBlog_admin_list_item {
+    padding: 15px;
+    border: dotted 1px #d0d0d0;
+}

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.13,1.14 jBlog_config.inc.php,1.5,1.6 jBlog_config_local.tpl,1.6,1.7

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

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_config.inc.php 
	jBlog_config_local.tpl 
Log Message:
Fix bool fields in the configuration screen.
Fix "'" handling in the configuration screen (it was not a magic_quotes_gpc
issue).
Add magic_quotes_gpc avoidance code, thanks to Ilia.


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jBlog_admin_installer.inc.php	14 Mar 2003 02:38:05 -0000	1.13
+++ jBlog_admin_installer.inc.php	14 Mar 2003 04:04:26 -0000	1.14
@@ -88,6 +88,7 @@
 
 function jBlog_printConfigTemplate($t, $from = false) {
 	global $jBlog;
+
     echo "<form action='?' method='POST'>";
     echo "<input type='hidden' name='jBlog[adminModule]' value='installer'>";
     echo "<input type='hidden' name='installAction' value='check'>";
@@ -101,11 +102,11 @@
 			echo "<td valign='top'>".$value[$x]["name"].":</td>";
             echo "<td>";
             if ($value[$x]["type"] == "bool") {
-				echo "<input type='radio' name='".$value[$x]["name"]."' value='true'  ".(($values[$x]["default"]=='true') ? "" : "CHECKED")."> Yes<br>";
-                echo "<input type='radio' name='".$value[$x]["name"]."' value='false' ".(($values[$x]["default"]=='true') ? "CHECKED" : "")."> No<br>";
+				echo "<input type='radio' name='".$value[$x]["name"]."' value='true'  ".(($value[$x]["default"]==true) ? "CHECKED" : "")."> Yes<br>";
+                echo "<input type='radio' name='".$value[$x]["name"]."' value='false' ".(($value[$x]["default"]==true) ? "" : "CHECKED")."> No<br>";
             }
             else {
-				echo "<input type='text' name='".$value[$x]["name"]."' value='".$value[$x]["default"]."'>";
+				echo "<input type='text' name='".$value[$x]["name"]."' value=\"".htmlentities($value[$x]["default"])."\">";
             }
             echo "</td>";
             echo "<td valign='top'><font color='#bbbbbb'>// ".$value[$x]["desc"]." (".$value[$x]["type"].")</font></td>";

Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_config.inc.php	14 Mar 2003 02:38:05 -0000	1.5
+++ jBlog_config.inc.php	14 Mar 2003 04:04:26 -0000	1.6
@@ -60,6 +60,33 @@
 	die ("jBlog error: unable to connect to database - exiting");
 }
 
+// Avoid magic_quotes_gpc issues
+// courtesy of il...@ph...
+function jBlog_strip_quotes(&$var)
+{
+    if (is_array($v)) {
+        array_walk($var[$k], 'jBlog_strip_quotes');
+    } else {
+        $var = stripslashes($var);
+    }
+}
+
+if (ini_get("magic_quotes_gpc")) {
+    if (@count($_GET)) {
+        array_walk($_GET, 'jBlog_strip_quotes');
+    }
+    if (@count($_POST)) {
+        array_walk($_POST, 'jBlog_strip_quotes');
+    }
+    if (@count($_COOKIES)) {
+        array_walk($_COOKIES, 'jBlog_strip_quotes');
+    }
+    if (@count($_FILES)) {
+        array_walk($_FILES, 'jBlog_strip_quotes');
+    }
+}
+
+
 // Merge get and post into the jBlog array
 $jBlog["GET"] = &$_GET["jBlog"];
 $jBlog["POST"] = &$_POST["jBlog"];

Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_config_local.tpl	13 Mar 2003 20:23:16 -0000	1.6
+++ jBlog_config_local.tpl	14 Mar 2003 04:04:26 -0000	1.7
@@ -4,7 +4,7 @@
 * General configure options, adjust to your needs:                       *
 *************************************************************************/
 // Database Settings
-$jBlog["dbType"]   = "{dbType|string|mysql}";			 // Database type (mysql|sqlite)
+$jBlog["dbType"]   = "{dbType|string|mysql}";			 // Database type (mysql|postgres)
 $jBlog["dbHost"]   = "{dbHost|string|localhost}";        // MySQL host
 $jBlog["dbUser"]   = "{dbUser|string|jBlog}";            // Username
 $jBlog["dbPass"]   = "{dbPass|string|jBlog}";            // Password