php-blog-cvs — Serendipity commit list

[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

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

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Fix this


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- jBlog_functions.inc.php	14 Mar 2003 02:38:05 -0000	1.68
+++ jBlog_functions.inc.php	14 Mar 2003 02:49:46 -0000	1.69
@@ -189,14 +189,14 @@
         $body = ',body, extended';
 
 	if (is_numeric($range)) {
-		$year = substr($range, 0, 4);
-		$month = substr($range, 4, 2);
-		$day = substr($range, 6, 2);
+		$year = (int)substr($range, 0, 4);
+		$month = (int)substr($range, 4, 2);
+		$day = (int)substr($range, 6, 2);
 
 		$startts = mktime(0, 0, 0, $month, $day, $year);
 		$endts = mktime(0, 0, 0, $month, $day+1, $year);
 
-		$and = " AND timestamp >= $startts AND timestamp <= $endts ";
+		$and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
 	}
 
     if (!empty($limit)) {

[php-blog-cvs] jBlog jBlog_db_postgres.inc.php,NONE,1.1 db.sql,1.18,1.19 jBlog_admin_entries.inc.php,1.10,1.11 jBlog_admin_installer.inc.php,1.12,1.13 jBlog_config.inc.php,1.4,1.5 jBlog_db.inc.php,1.1,1.2 jBlog_db_mysql.inc.php,1.4,1.5 jBlog_db_sqlite.inc.php,1.1,1.2 jBlog_functions.inc.php,1.67,1.68

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

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

Modified Files:
	db.sql jBlog_admin_entries.inc.php 
	jBlog_admin_installer.inc.php jBlog_config.inc.php 
	jBlog_db.inc.php jBlog_db_mysql.inc.php 
	jBlog_db_sqlite.inc.php jBlog_functions.inc.php 
Added Files:
	jBlog_db_postgres.inc.php 
Log Message:
More abstraction work.
Add postgres support - it works.
sqlite does not work (seems like the extension itself needs some work).

*** UPDATE YOUR SCHEMA ***
-  password varchar(20) default null,
+  password varchar(32) default null,

passwords are now stored as md5("mypassword"); you will need to update the
encrypted form of your password too.

Although the db.sql looks quite different, it's still more or less the same.
If you need to change the schema, dump to a separate file and merge in the
changes using the special {} markers and separate keys into CREATE INDEX 
statements for more portability.

The calendar code should be a little more cpu friendly now.



--- NEW FILE: jBlog_db_postgres.inc.php ---
<?php # $Id: jBlog_db_postgres.inc.php,v 1.1 2003/03/14 02:38:05 wez Exp $

function jBlog_db_connect()
{
	global $jBlog;

	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $jBlog['dbHost'], $jBlog['dbName'], $jBlog['dbUser'], $jBlog['dbPass']));

	return $jBlog['dbConn'];
}

function jBlog_db_escape_string($string)
{
	return pg_escape_string($string);
}

function jBlog_db_limit($start, $offset)
{
	return "$offset, $start";
}

function jBlog_db_affected_rows()
{
	global $jBlog;
	return pg_affected_rows($jBlog['dbLastResult']);
}

function jBlog_db_insert_id()
{
	global $jBlog;
	return pg_last_oid($jBlog['dbLastResult']);
}

function jBlog_db_query($sql, $single = false, $result_type = "both")
{
	global $jBlog;
	static $type_map = array(
		'assoc' => PGSQL_ASSOC,
		'num'	=> PGSQL_NUM,
		'both'	=> PGSQL_BOTH
		);

	$jBlog['dbLastResult'] = pg_query($jBlog['dbConn'], $sql);

	if (!$jBlog['dbLastResult']) {
		print pg_last_error($jBlog['dbConn']);
		if (function_exists("debug_backtrace")) {
            highlight_string(var_export(debug_backtrace(), 1));
        }
		return false;
	}
	if ($jBlog['dbLastResult'] === true) {
		return true;
	}

	$result_type = $type_map[$result_type];

	$n = pg_num_rows($jBlog['dbLastResult']);

	switch ($n) {
		case 0:
			if ($single) {
				return false;
			}
			return true;
			
		case 1:
			if ($single) {
				return pg_fetch_array($jBlog['dbLastResult'], 0, $result_type);
			}
		default:
			$rows = array();
			for ($i = 0; $i < $n; $i++) {
				$rows[] = pg_fetch_array($jBlog['dbLastResult'], $i, $result_type);
			}
			return $rows;
	}
}

function jBlog_db_schema_import($query)
{
	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}', 'int(1)', 'int(10)', 'int(11)', 'int(4)');
	static $replace = array('SERIAL primary key', '', '', 'int2', 'int4', 'int4', 'int4');

	return jBlog_db_query(str_replace($search, $replace, $query));
}

function jBlog_db_probe($hash, &$errs)
{
	global $jBlog;

	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $hash['dbHost'], $hash['dbName'], $hash['dbUser'], $hash['dbPass']));
	if (!$jBlog['dbConn']) {
		$errs[] = "Could not connect to database; check your settings.";
		return false;
	}
	return true;
}

?>

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- db.sql	13 Mar 2003 18:37:05 -0000	1.18
+++ db.sql	14 Mar 2003 02:38:05 -0000	1.19
@@ -4,7 +4,7 @@
 
 create table {PREFIX}authors (
   username varchar(20) default null,
-  password varchar(20) default null,
+  password varchar(32) default null,
   authorid {AUTOINCREMENT},
   mail_comments int(1) default '1',
   mail_trackbacks int(1) default '1',
@@ -17,18 +17,19 @@
 
 create table {PREFIX}comments (
   id {AUTOINCREMENT},
-  entry_id int(10) unsigned not null default '0',
-  timestamp int(10) unsigned default null,
+  entry_id int(10) {UNSIGNED} not null default '0',
+  timestamp int(10) {UNSIGNED} default null,
   title varchar(150) default null,
   author varchar(80) default null,
   email varchar(200) default null,
   url varchar(200) default null,
   ip varchar(15) default null,
   body text,
-  type varchar(100) default 'regular',
-  fulltext key body (body)
+  type varchar(100) default 'regular'
 );
 
+CREATE {FULLTEXT} INDEX body on {PREFIX}comments (body);
+
 #
 # table structure for table '{PREFIX}entries'
 #
@@ -36,24 +37,25 @@
 create table {PREFIX}entries (
   id {AUTOINCREMENT},
   title varchar(200) default null,
-  timestamp int(10) unsigned default null,
+  timestamp int(10) {UNSIGNED} default null,
   body text,
-  comments int(4) unsigned default '0',
+  comments int(4) {UNSIGNED} default '0',
   extended text,
   exflag int(1) default null,
   author varchar(20) default null,
   authorid int(11) default null,
-  categoryid int(11) default null,
-  fulltext key title (title,body,extended)
+  categoryid int(11) default null
 );
 
+CREATE {FULLTEXT} INDEX title on {PREFIX}entries (title,body,extended);
+
 #
 # table structure for table '{PREFIX}references'
 #
 
 create table {PREFIX}references (
   id {AUTOINCREMENT},
-  entry_id int(10) unsigned not null default '0',
+  entry_id int(10) {UNSIGNED} not null default '0',
   link text,
   name text
 );
@@ -64,7 +66,7 @@
 
 CREATE TABLE {PREFIX}referrers (
   url varchar(128) NOT NULL default '',
-  day date NOT NULL default '0000-00-00',
+  day date NOT NULL,
   count int(11) NOT NULL default '0',
   PRIMARY KEY  (url,day)
 );
@@ -87,14 +89,15 @@
 CREATE TABLE {PREFIX}suppress (
   url varchar(128) default NULL,
   ip varchar(15) default NULL,
-  last timestamp(14) NOT NULL,
-  unique key (url, ip)
+  last timestamp NOT NULL
 );
 
+CREATE unique INDEX url on {PREFIX}suppress (url, ip);
+
 CREATE TABLE {PREFIX}plugins (
 	name varchar(128) not null,
-	placement enum ('left', 'right', 'hide') not null default 'right',
-	sort_order int(4) not null,
+	placement varchar(6) not null default 'right',
+	sort_order int(4) not null default '0',
 	PRIMARY KEY(name)
 );
 

Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_admin_entries.inc.php	13 Mar 2003 12:44:39 -0000	1.10
+++ jBlog_admin_entries.inc.php	14 Mar 2003 02:38:05 -0000	1.11
@@ -20,7 +20,7 @@
 	$perPage = 30;
 
     // Fetch the entries
-    $entries = jBlog_fetchEntries(false, false, $jBlog["GET"]["offset"].", $perPage");
+    $entries = jBlog_fetchEntries(false, false, jBlog_db_limit($jBlog["GET"]["offset"], $perPage));
 
     // Prepare table
 	echo "<div class='jBlog_admin_list'>";

Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jBlog_admin_installer.inc.php	13 Mar 2003 18:37:06 -0000	1.12
+++ jBlog_admin_installer.inc.php	14 Mar 2003 02:38:05 -0000	1.13
@@ -259,16 +259,17 @@
 					} else {
 						$mail_comments = 0;
 					}
+					$enc_pass = md5($_POST['pass']);
 					$query = "INSERT INTO $_POST[dbPrefix]authors
 						(username, password, email, mail_comments) 
 						VALUES('$_POST[user]',
-								password('$_POST[pass]'),
+								'$enc_pass',
 								'$_POST[email]',
 								$mail_comments) ";
 					jBlog_db_query($query);
 
 					$text = jBlog_db_escape_string(file_get_contents('./jBlog.css'));
-					$query = "INSERT into $_POST[dbPrefix]css values(NULL, 'default', '$text')";
+					$query = "INSERT into $_POST[dbPrefix]css (name, data) values ('default', '$text')";
 					$res = jBlog_db_query($query);
 					if (is_string($res)) {
 						echo $res;

Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_config.inc.php	13 Mar 2003 12:44:39 -0000	1.4
+++ jBlog_config.inc.php	14 Mar 2003 02:38:05 -0000	1.5
@@ -56,7 +56,7 @@
 
 
 // Connect to database
-if (!is_resource(jBlog_db_connect())) {
+if (!jBlog_db_connect()) {
 	die ("jBlog error: unable to connect to database - exiting");
 }
 

Index: jBlog_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_db.inc.php	13 Mar 2003 18:37:07 -0000	1.1
+++ jBlog_db.inc.php	14 Mar 2003 02:38:05 -0000	1.2
@@ -18,6 +18,9 @@
 			$where .= " AND ";
 		$where .= "$k='" . jBlog_db_escape_string($v) . "'";
 	}
+	if (strlen($where)) {
+		$where = " WHERE $where";
+	}
 	return jBlog_db_query("UPDATE $jBlog[dbPrefix]$table SET $set $where");
 }
 
@@ -31,7 +34,7 @@
 	foreach ($values as $k => $v) {
 		if (strlen($vals))
 			$vals .= ", ";
-		$vals .= "$k='" . jBlog_db_escape_string($v) . "'";
+		$vals .= "'" . jBlog_db_escape_string($v) . "'";
 	}
 	return jBlog_db_query("INSERT INTO $jBlog[dbPrefix]$table ($names) values ($vals)");
 }

Index: jBlog_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_mysql.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_db_mysql.inc.php	13 Mar 2003 18:48:45 -0000	1.4
+++ jBlog_db_mysql.inc.php	14 Mar 2003 02:38:05 -0000	1.5
@@ -15,7 +15,9 @@
 		'num'	=> MYSQL_NUM,
 		'both'	=> MYSQL_BOTH
 		);
-	
+
+	//highlight_string(var_export($sql, 1));
+
 	$c = mysql_db_query($jBlog['dbName'], $sql);
 	if (!$c) {
 		print mysql_error();
@@ -64,6 +66,11 @@
 	return mysql_escape_string($string);
 }
 
+function jBlog_db_limit($start, $offset)
+{
+	return "$start, $offset";
+}
+
 function jBlog_db_connect()
 {
 	global $jBlog;
@@ -74,8 +81,8 @@
 
 function jBlog_db_schema_import($query)
 {
-	static $search = array('{AUTOINCREMENT}');
-	static $replace = array('int(11) not null auto_increment primary key');
+	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}');
+	static $replace = array('int(11) not null auto_increment primary key', 'unsigned', 'FULLTEXT');
 
 	return jBlog_db_query(str_replace($search, $replace, $query));
 }

Index: jBlog_db_sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_sqlite.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_db_sqlite.inc.php	13 Mar 2003 18:37:07 -0000	1.1
+++ jBlog_db_sqlite.inc.php	14 Mar 2003 02:38:05 -0000	1.2
@@ -9,10 +9,10 @@
 
 function jBlog_db_escape_string($string)
 {
-	static $replace = array('%00', '%25');
-	static $search = array("\x00", '%');
+	static $search = array("\x00", '%', '\'', '\"');
+	static $replace = array('%00', '%25', '\\\'', '\\\"');
 
-	return addslashes(str_replace($search, $replace, $string));
+	return str_replace($search, $replace, $string);
 }
 
 function jBlog_db_affected_rows()
@@ -46,8 +46,13 @@
 	global $jBlog;
 
 	$res = sqlite_exec($sql, $jBlog['dbConn']);
-
 	if (!$res) {
+//		if (function_exists("debug_backtrace")) {
+//            highlight_string(var_export(debug_backtrace(), 1));
+//        }
+		var_dump($res);
+		var_dump($sql);
+
 		return "problem with query";
 	}
 
@@ -100,7 +105,7 @@
 	global $jBlog;
 
 	$jBlog['dbConn'] = sqlite_open($jBlog['jBlogPath'] . "sqlite.db");
-	if (is_resource($jBlog['dbConn'])) {
+	if ($jBlog['dbConn']) {
 		return true;
 	}
 	$errs[] = "Unable to open \"$jBlog[jBlogPath]sqlite.db\" - check permissions!";
@@ -109,8 +114,8 @@
 
 function jBlog_db_schema_import($query)
 {
-	static $search = array('{AUTOINCREMENT}');
-	static $replace = array('INTEGER PRIMARY KEY');
+	static $search = array('{AUTOINCREMENT}', '{UNSIGNED}', '{FULLTEXT}');
+	static $replace = array('INTEGER PRIMARY KEY', '', '');
 
 	return jBlog_db_query(str_replace($search, $replace, $query));
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- jBlog_functions.inc.php	13 Mar 2003 22:18:23 -0000	1.67
+++ jBlog_functions.inc.php	14 Mar 2003 02:38:05 -0000	1.68
@@ -89,18 +89,21 @@
 
         if ($month <12) {
             $nextMonth = $month+1;
-            $nextYear  = $year;}
-        else {
+            $nextYear  = $year;
+		} else {
             $nextMonth = 1;
-            $nextYear  = $year+1;}
+            $nextYear  = $year+1;
+		}
+
+		$endts = mktime(0, 0, 0, $month + 1, 1, $year);
 
         // Find out about diary entries
-        $querystring = "SELECT FROM_UNIXTIME(timestamp, '%e') as day, timestamp FROM ".$jBlog["dbPrefix"]."entries WHERE FROM_UNIXTIME(timestamp,'%c') LIKE $month AND FROM_UNIXTIME(timestamp,'%Y') LIKE $year";
+        $querystring = "SELECT timestamp from $jBlog[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts";
         $rows = jBlog_db_query($querystring);
         $activeDays = array();
 		if (is_array($rows)) {
 			foreach ($rows as $row) {
-				$activeDays[$row["day"]] = $row["timestamp"];
+				$activeDays[date("j", $row["timestamp"])] = $row["timestamp"];
 			}
 		}
 
@@ -185,15 +188,25 @@
     if ($full === true)
         $body = ',body, extended';
 
-    if (is_numeric($range)) {
-        $and = "AND FROM_UNIXTIME(timestamp, '%Y%m%d') LIKE '$range%' ";
-    } 
+	if (is_numeric($range)) {
+		$year = substr($range, 0, 4);
+		$month = substr($range, 4, 2);
+		$day = substr($range, 6, 2);
+
+		$startts = mktime(0, 0, 0, $month, $day, $year);
+		$endts = mktime(0, 0, 0, $month, $day+1, $year);
+
+		$and = " AND timestamp >= $startts AND timestamp <= $endts ";
+	}
 
     if (!empty($limit)) {
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT e.*, a.username, c.category_name FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a left join {$jBlog['dbPrefix']}category c ON e.categoryid = c.categoryid  WHERE e.authorid = a.authorid " . $and .
+    $query = "SELECT e.*, a.username, c.category_name FROM
+			({$jBlog['dbPrefix']}entries AS e LEFT JOIN {$jBlog['dbPrefix']}category c ON e.categoryid = c.categoryid)
+			LEFT JOIN {$jBlog['dbPrefix']}authors a ON
+			e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
     if (is_string($ret)) {
@@ -814,35 +827,40 @@
 
     $newEntry = 0;
     $exflag = 0;
-
-	if (!is_numeric($entry["id"])) $entry["id"] = "NULL";
-    if (!is_numeric($entry["timestamp"])) $entry["timestamp"] = time();
+    
+	if (!is_numeric($entry["timestamp"])) {
+		$entry["timestamp"] = time();
+	}
+	
     if(strlen($entry["extended"])) {
         $exflag = 1;
     }
-    $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
-                    (id, title, timestamp, body, extended, comments, exflag, author, authorid, categoryid)
-                    VALUES (
-                    ".$entry["id"].",
-                    '".jBlog_db_escape_string($entry["title"])."',
-                    ".$entry["timestamp"].",
-					'".jBlog_db_escape_string($entry["body"])."', 
-					'".jBlog_db_escape_string($entry["extended"])."', 
-                    '0', '$exflag',
-                    '".jBlog_db_escape_string($jBlog["user"])."',
-                    '".$jBlog["authorid"]."'," .
-					(int)$entry['categoryid'] . 
-					")";
-    $query = jBlog_db_query($querystring);
 
-	if (is_string($query)) {
-		return $query;
-	}
+	$entry['exflag'] = $exflag;
+	$entry['author'] = $jBlog['user'];
+	$entry['authorid'] = $jBlog['authorid'];
+
+	if (!is_numeric($entry["id"])) {
+		/* we need to insert */
+
+		unset($entry['id']);
+		$entry['comments'] = 0;
+		
+		$res = jBlog_db_insert("entries", $entry);
 	
-    if ($entry['id'] == "NULL") {
+		$entry['id'] = jBlog_db_insert_id();
         $newEntry = 1;
-        $entry['id'] = jBlog_db_insert_id();
-    }
+	} else {
+		/* we need to update */
+
+		$res = jBlog_db_update("entries", array('id'=>$entry['id']), $entry);
+        $newEntry = 0;
+	}
+
+	if (is_string($res)) {
+		return $res;
+	}
+	
     if($exflag) {
         jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
     }
@@ -912,22 +930,21 @@
     $newEntry = 0;
     $exflag = 0;
 
-	if (!is_numeric($css["cssid"])) $css["cssid"] = "NULL";
-    $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."css
-                    (cssid, name, data)
-                    VALUES (
-                    ".$css["cssid"].",
-                    '".jBlog_db_escape_string($css["name"])."',
-					'".jBlog_db_escape_string($css["data"])."')";
-    $query = jBlog_db_query($querystring);
-	if (is_string($query)) {
-		return $query;
+
+	if ($css["cssid"] == 0) {
+		
+		unset($css['cssid']);
+		$res = jBlog_db_insert('css', $css);
+		$newEntry = 1;
+		$css['cssid'] = jBlog_db_insert_id();
+	} else {
+		$res = jBlog_db_update('css', array('cssid' => $css['cssid']), $css);
 	}
-    if ($css['cssid'] == "NULL") {
-        $newEntry = 1;
-        $css['cssid'] = jBlog_db_insert_id();
-    }
-    return $css['cssid'];
+		
+	if (is_string($res)) {
+		return $res;
+	}
+    return (int)$css['cssid'];
 }
 
 /**
@@ -1330,13 +1347,14 @@
         $jBlog['authorid'] = $_SESSION['jBlogAuthorid'];
         return 1;
     }
+	$password = md5($password);
     $query = "SELECT 
                 *
               FROM
                 $jBlog[dbPrefix]authors
               WHERE
                 username = '$username'
-              AND password = PASSWORD('$password')";
+              AND password = '$password'";
     $row = jBlog_db_query($query, true);
     if (is_string($row)) {
         print $row;
@@ -1366,7 +1384,8 @@
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND url = '$_SERVER[HTTP_REFERER]'
                   AND last > now() - 900";
-    $suppressu = "REPLACE INTO $jBlog[dbPrefix]suppress
+	$suppressp = "DELETE FROM $jBlog[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
+    $suppressu = "INSERT INTO $jBlog[dbPrefix]suppress
                   (url, ip, last) 
                   VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
     $update = "UPDATE $jBlog[dbPrefix]referrers
@@ -1381,6 +1400,7 @@
         jBlog_db_query($suppressu);
         return;
     } 
+    jBlog_db_query($suppressp);
     jBlog_db_query($suppressu);
     jBlog_db_query($update);
     if (jBlog_db_affected_rows() == 0) {
@@ -1397,7 +1417,7 @@
 
 function jBlog_displayTopReferrers($limit=10) {
     global $jBlog;
-    $query = "SELECT url, sum(count) total
+    $query = "SELECT url, sum(count) AS total
               FROM $jBlog[dbPrefix]referrers
               GROUP BY url
               ORDER BY total desc
@@ -1415,8 +1435,9 @@
 
 function jBlog_set_config_var($name, $val) {
     global $jBlog;
-	$val = jBlog_db_escape_string($val);
-	$r = jBlog_db_query("REPLACE INTO $jBlog[dbPrefix]config (name,value) values('$name','$val')");
+
+	jBlog_db_query("DELETE FROM $jBlog[dbPrefix]config where name='" . jBlog_db_escape_string($name) . "'");
+	$r = jBlog_db_insert("config", array("name"=>$name, "value"=>$val));
 	if (is_string($r)) {
 		echo $r;
 	}

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.66,1.67 jBlog_rss_exchange.inc.php,1.2,1.3

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

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

Modified Files:
	jBlog_functions.inc.php jBlog_rss_exchange.inc.php 
Log Message:
some fixes for rss import/export and citation management


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- jBlog_functions.inc.php	13 Mar 2003 21:55:54 -0000	1.66
+++ jBlog_functions.inc.php	13 Mar 2003 22:18:23 -0000	1.67
@@ -799,7 +799,7 @@
     preg_match_all('@<cite[^>]*>([^<]+)</cite>@i', $text, $matches);
 
     foreach ($matches[1] as $citation) {
-        $query = "INSERT INTO {$jBlog['dbPrefix']}references (en)try_id, name) VALUES(";
+        $query = "INSERT INTO {$jBlog['dbPrefix']}references (entry_id, name) VALUES(";
         $query .= "'$tmpid', '" . jBlog_db_escape_string($citation) . "')";
 
         jBlog_db_query($query);

Index: jBlog_rss_exchange.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_rss_exchange.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_rss_exchange.inc.php	13 Mar 2003 20:42:32 -0000	1.2
+++ jBlog_rss_exchange.inc.php	13 Mar 2003 22:18:23 -0000	1.3
@@ -25,6 +25,9 @@
     
     $entry['title'] = $item['title'];
     $entry['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); 
+    if ($entry['timestamp'] == -1) {
+        $entry['timestamp'] = time();
+    }
 
     return true;
 }

[php-blog-cvs] jBlog jBlog_admin_interop.inc.php,1.1,1.2 jBlog_functions.inc.php,1.65,1.66 rss.php,1.3,1.4

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

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

Modified Files:
	jBlog_admin_interop.inc.php jBlog_functions.inc.php rss.php 
Log Message:
add entry export


Index: jBlog_admin_interop.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_interop.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_admin_interop.inc.php	13 Mar 2003 20:21:43 -0000	1.1
+++ jBlog_admin_interop.inc.php	13 Mar 2003 21:55:54 -0000	1.2
@@ -9,8 +9,23 @@
         echo "Entries were not successfully inserted\n<br />\n";
     }
 }
+else if (!empty($_POST['export'])) {
 ?>
+    <a href="<?=$jBlog['jBlogHTTPPath']?>rss.php?version=2.0&all=1">View Feed Export</a>
+<?php
+    exit;
+}
+?>
+<p>
+<h3>Import</h3>
 <form method="POST">
 RSS URL: <input type="text" name="url" size="30" />
-<input type="submit" name="Import RSS" />
+<input type="submit" value="Import RSS" />
+</form>
+</p>
+<p>
+<h3>Export</h3>
+<form method="POST">
+<input type="submit" name="export" value="Export RSS" />
 </form>
+</p>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- jBlog_functions.inc.php	13 Mar 2003 20:08:28 -0000	1.65
+++ jBlog_functions.inc.php	13 Mar 2003 21:55:54 -0000	1.66
@@ -178,7 +178,7 @@
 * Give it a range in YYYYMMDD format to gather the desired entries
 * (For february 2002 you would pass 200202 e.g.
 **/
-function jBlog_fetchEntries($range, $full = true, $limit = "") {
+function jBlog_fetchEntries($range = null, $full = true, $limit = "") {
 	global $jBlog;
     $and = "";
 

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/rss.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rss.php	10 Mar 2003 03:47:27 -0000	1.3
+++ rss.php	13 Mar 2003 21:55:55 -0000	1.4
@@ -18,7 +18,11 @@
     break;
 case 'content':
 default:
-    $entries = jBlog_fetchEntries(null, true, 15);
+    if ($_GET['all']) {
+        $entries = jBlog_fetchEntries(null, true);
+    } else {
+        $entries = jBlog_fetchEntries(null, true, 15);
+    }
     break;
 }