php-blog-cvs — Serendipity commit list

[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;
 }
 

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

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

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

Modified Files:
	jBlog_rss_exchange.inc.php 
Log Message:
remove func def that shouldn't be there.


Index: jBlog_rss_exchange.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_rss_exchange.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_rss_exchange.inc.php	13 Mar 2003 20:20:56 -0000	1.1
+++ jBlog_rss_exchange.inc.php	13 Mar 2003 20:42:32 -0000	1.2
@@ -1,10 +1,6 @@
 <?php
 require_once 'bundled-libs/Onyx/RSS.php';
 
-function jBlog_rss_buildItem($entry, &$item)
-{
-}
-
 function jBlog_rss_buildEntry($item, &$entry) 
 {
     $entry = array();

Re: [php-blog-cvs] jBlog jBlog_rss_exchange.inc.php,NONE,1.1 jBlog_admin.php,1.20,1.21

[George S. <ge...@om...>]

I just noticed that Onyx/RSS is GPL'd.  That's a big license shift.

On Thursday, March 13, 2003, at 03:21  PM, 
ste...@us... wrote:

[php-blog-cvs] jBlog jBlog_config_local.tpl,1.5,1.6

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

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

Modified Files:
	jBlog_config_local.tpl 
Log Message:
Remove this... it was already there... (first line)


Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_config_local.tpl	13 Mar 2003 18:55:08 -0000	1.5
+++ jBlog_config_local.tpl	13 Mar 2003 20:23:16 -0000	1.6
@@ -10,7 +10,6 @@
 $jBlog["dbPass"]   = "{dbPass|string|jBlog}";            // Password
 $jBlog["dbName"]   = "{dbName|string|jBlog}";                 // Name of your database
 $jBlog["dbPrefix"] = "{dbPrefix|string|jBlog_}";         // Prefix for the table names, i.e. jBlog_
-$jBlog["dbType"] = "{dbType|string|mysql}";               // Type of database to use
 
 // Paths (note: don't forget trailing slashes for directories!!!!)
 $jBlog["jBlogPath"] = "{jBlogPath|string|/www/apache/htdocs/htdocs/jBlog/}";             // Here you need all the *.inc.php.

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

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

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

Added Files:
	jBlog_admin_interop.inc.php 
Log Message:
left over file from rss import


--- NEW FILE: jBlog_admin_interop.inc.php ---
<?php
include_once 'jBlog_rss_exchange.inc.php';
if (IN_JBLOG !== true) die ("Don't hack!");
session_start();
if (!empty($_POST['url'])) {
    if (jBlog_rss_import($_POST['url'])) {
        echo "Entries sucessfully inserted!\n<br />\n";
    } else {
        echo "Entries were not successfully inserted\n<br />\n";
    }
}
?>
<form method="POST">
RSS URL: <input type="text" name="url" size="30" />
<input type="submit" name="Import RSS" />
</form>

[php-blog-cvs] jBlog jBlog_rss_exchange.inc.php,NONE,1.1 jBlog_admin.php,1.20,1.21

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

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

Modified Files:
	jBlog_admin.php 
Added Files:
	jBlog_rss_exchange.inc.php 
Log Message:
add the ability to import rss feeds


--- NEW FILE: jBlog_rss_exchange.inc.php ---
<?php
require_once 'bundled-libs/Onyx/RSS.php';

function jBlog_rss_buildItem($entry, &$item)
{
}

function jBlog_rss_buildEntry($item, &$entry) 
{
    $entry = array();

    if ($item['description']) {
        $entry['body'] = $item['description'];
    }

    if ($item['content:encoded']) {
        if (!isset($entry['body'])) {
            $data = &$entry['body'];
        } else {
            $data = &$entry['extended'];
        }
        
        if ($entry['body'] != substr($item['content:encoded'], 0, strlen($entry['body']))) {
            $data .= substr($item['content:encoded'], strlen($entry['body']));
        } else {
            $data = $item['content:encoded'];
        }
    }
    
    $entry['title'] = $item['title'];
    $entry['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']); 

    return true;
}

function jBlog_rss_import($url) 
{
    global $jBlog;

    $c = &new Onyx_RSS();
    $c->parse($url);

    $jBlog['noautodiscovery'] = 1;
    while ($item = $c->getNextItem()) {
        if (jBlog_rss_buildEntry($item, $entry)) {
            jBlog_updertEntry($entry);
        }
    }
    
    return true;
}
?>

Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- jBlog_admin.php	13 Mar 2003 12:44:39 -0000	1.20
+++ jBlog_admin.php	13 Mar 2003 20:20:56 -0000	1.21
@@ -91,9 +91,10 @@
 					<div class="jBlogSideBarItem">
 					<div class="jBlogSideBarTitle">Admin:</div>
 					<div class="jBlogSideBarContent">
-                    &bull; <a href='?jBlog[adminModule]=installer'>Configuration</a></br>
-                    &bull; <a href='?jBlog[adminModule]=logout'>Log out</a><br>
-                    &bull; <a href='<?= $jBlog['jBlogHTTPPath'] ?>'>Back to Blog...</a><br>
+                    &bull; <a href='?jBlog[adminModule]=installer'>Configuration</a><br />
+                    &bull; <a href="?jBlog[adminModule]=interop">Import/Export Entries</a><br />
+                    &bull; <a href='?jBlog[adminModule]=logout'>Log out</a><br />
+                    &bull; <a href='<?= $jBlog['jBlogHTTPPath'] ?>'>Back to Blog...</a><br />
 					</div>
 					</div>
                 </td>
@@ -126,6 +127,10 @@
 							case "plugins":
 								include "jBlog_admin_plugins.inc.php";
 								break;
+
+                            case "interop":
+                                include "jBlog_admin_interop.inc.php";
+                                break;
 
 							case "logout":
 								session_destroy();

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.64,1.65

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fix up the rss a lickle bit.,


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- jBlog_functions.inc.php	13 Mar 2003 18:37:07 -0000	1.64
+++ jBlog_functions.inc.php	13 Mar 2003 20:08:28 -0000	1.65
@@ -451,32 +451,21 @@
 function jBlog_printEntries_rss($entries, $version) {
     global $jBlog;
 
-    if (!is_array($entries)) {
-        die("jBlog error: no valid entries found");
-    }
-
-    if ($version == '0.91' || $version == '2.0') {
+    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
             echo "<link>{$jBlog['baseURL']}e_{$entry['id']}.html</link>\n";
             if ($version == '2.0') {
+                // extract author information
+                $query = "select email from {$jBlog['dbPrefix']}authors where username='{$entry['username']}'";
+                $results = jBlog_db_query($query);
+                echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n"; 
                 echo "<content:encoded>\n";
                 echo utf8_encode(htmlspecialchars(jBlog_emoticate(jBlog_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
                 echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
                 echo "<guid>{$jBlog['baseURL']}e_{$entry['id']}.html</guid>\n";
-                $references = jBlog_fetchReferences($entry['id']);
-                if (!empty($references)) {
-                    echo "<robot:references>\n";
-                    foreach ($references as $reference) {
-                        echo "<reference>\n";
-                        echo "<name>{$reference['name']}</name>\n";
-                        echo "<link>{$reference['link']}</link>\n";
-                        echo "</reference>\n";
-                    }
-                    echo "</robot:references>\n";
-                }
             } else {
                 echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
             }
@@ -766,6 +755,7 @@
 jBlog_handle_references($id, $author, $title, $text)
 {
     global $jBlog;
+    
     if (!preg_match_all('@<a[^>]+?href\s*=\s*["\']?([^\'" >]+?)[ \'"]?>([^<]*)</a>@i', $text, $matches)) {
         return;
     }
@@ -791,7 +781,9 @@
         if ($row[0] > 0) {
             continue;
         }
-        jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        if (!$jBlog['noautodiscovery']) {
+            jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        }
     }
     jBlog_db_query("DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");
 

[php-blog-cvs] jBlog jBlog_config_local.tpl,1.4,1.5

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

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

Modified Files:
	jBlog_config_local.tpl 
Log Message:
add new variables


Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_config_local.tpl	13 Mar 2003 18:37:07 -0000	1.4
+++ jBlog_config_local.tpl	13 Mar 2003 18:55:08 -0000	1.5
@@ -10,6 +10,7 @@
 $jBlog["dbPass"]   = "{dbPass|string|jBlog}";            // Password
 $jBlog["dbName"]   = "{dbName|string|jBlog}";                 // Name of your database
 $jBlog["dbPrefix"] = "{dbPrefix|string|jBlog_}";         // Prefix for the table names, i.e. jBlog_
+$jBlog["dbType"] = "{dbType|string|mysql}";               // Type of database to use
 
 // Paths (note: don't forget trailing slashes for directories!!!!)
 $jBlog["jBlogPath"] = "{jBlogPath|string|/www/apache/htdocs/htdocs/jBlog/}";             // Here you need all the *.inc.php.
@@ -24,6 +25,7 @@
 $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["layout_mode"] = "{layout_mode|string|table}";     // Layout mode
 
 $jBlog["blogTitle"] = "{blogTitle|string|Foo Bar}";  // Site title
 $jBlog["blogDescription"] = "{blogDescription|string|Welcome to Foobarblog}"; // Description of your blog
@@ -34,5 +36,5 @@
 $jBlog["magick"] = {magick|bool|true};                   // Do you have image magick installed
 $jBlog["convert"] = "{convert|string|/usr/local/bin/convert}"; // Full path & name of your convert binary
 $jBlog["thumbSuffix"] = "{thumbSuffix|string|jBlogThumb}";     // Thumbnails will be named original.Suffix.ext
-$jBlog["thumbSize"]   = {thumbSize|int|110};                   // Maximum dimension of thumbnails
+$jBlog["thumbSize"]   = "{thumbSize|int|110}";                   // Maximum dimension of thumbnails
 ?>

[php-blog-cvs] jBlog TODO,1.3,1.4 jBlog_db_mysql.inc.php,1.3,1.4

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

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

Modified Files:
	TODO jBlog_db_mysql.inc.php 
Log Message:
fix for older php versions


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/jBlog/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- TODO	13 Mar 2003 18:11:47 -0000	1.3
+++ TODO	13 Mar 2003 18:48:44 -0000	1.4
@@ -1,5 +1,7 @@
 * Split up the administration and entry editing sections into two 
 separate areas.
+* Split up jBlog_functions.inc.php
+* Move the library files out of the docroot
 * Unify the configuration system
 * Make uploads per-user
 * XHTML 1.0 Strict Compliance

Index: jBlog_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_mysql.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_db_mysql.inc.php	13 Mar 2003 18:37:07 -0000	1.3
+++ jBlog_db_mysql.inc.php	13 Mar 2003 18:48:45 -0000	1.4
@@ -19,7 +19,9 @@
 	$c = mysql_db_query($jBlog['dbName'], $sql);
 	if (!$c) {
 		print mysql_error();
-		highlight_string(var_export(debug_backtrace(), 1));
+		if (function_exists("debug_backtrace")) {
+            highlight_string(var_export(debug_backtrace(), 1));
+        }
 		return false;
 	}
 	if ($c === true) {

[php-blog-cvs] jBlog jBlog_db.inc.php,NONE,1.1 jBlog_db_sqlite.inc.php,NONE,1.1 db.sql,1.17,1.18 htaccess.tpl,1.3,1.4 jBlog_admin_installer.inc.php,1.11,1.12 jBlog_config_local.tpl,1.3,1.4 jBlog_db_mysql.inc.php,1.2,1.3 jBlog_functions.inc.php,1.63,1.64

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

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

Modified Files:
	db.sql htaccess.tpl jBlog_admin_installer.inc.php 
	jBlog_config_local.tpl jBlog_db_mysql.inc.php 
	jBlog_functions.inc.php 
Added Files:
	jBlog_db.inc.php jBlog_db_sqlite.inc.php 
Log Message:
More db abstraction work.
Fixes a few buglets.
Provides theoretical support for sqlite.
We need a tool to generate the revise schema format;
please be careful if you need to alter the schema!


--- NEW FILE: jBlog_db.inc.php ---
<?php # $Id: jBlog_db.inc.php,v 1.1 2003/03/13 18:37:07 wez Exp $

include_once $jBlog['jBlogPath'] . "/jBlog_db_" . $jBlog['dbType'] . ".inc.php";

function jBlog_db_update($table, $keys, $values)
{
	global $jBlog;

	$set = "";
	foreach ($values as $k => $v) {
		if (strlen($set))
			$set .= ", ";
		$set .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	$where = "";
	foreach ($keys as $k => $v) {
		if (strlen($where))
			$where .= " AND ";
		$where .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	return jBlog_db_query("UPDATE $jBlog[dbPrefix]$table SET $set $where");
}

function jBlog_db_insert($table, $values)
{
	global $jBlog;

	$names = implode(",", array_keys($values));

	$vals = "";
	foreach ($values as $k => $v) {
		if (strlen($vals))
			$vals .= ", ";
		$vals .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	return jBlog_db_query("INSERT INTO $jBlog[dbPrefix]$table ($names) values ($vals)");
}


?>

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

function jBlog_db_connect()
{
	global $jBlog;

	$jBlog['dbConn'] = sqlite_open($jBlog['jBlogPath'] . "sqlite.db");
}

function jBlog_db_escape_string($string)
{
	static $replace = array('%00', '%25');
	static $search = array("\x00", '%');

	return addslashes(str_replace($search, $replace, $string));
}

function jBlog_db_affected_rows()
{
	return sqlite_changes($GLOBALS['jBlog']['dbConn']);
}

function jBlog_db_insert_id()
{
	return sqlite_last_insert_rowid($GLOBALS['jBlog']['dbConn']);
}

function jBlog_db_sqlite_fetch_array($res)
{
	static $search = array('%00', '%25');
	static $replace = array("\x00", '%');
	
	$row = sqlite_fetch_array($res);
	if (!is_array($row))
		return $row;
	/* strip any slashes */
	$r = array();
	foreach ($row as $i => $v) {
		$r[$i] = str_replace($search, $replace, $v);
	}
	return $r;
}

function jBlog_db_query($sql, $single = false, $result_type = "both")
{
	global $jBlog;

	$res = sqlite_exec($sql, $jBlog['dbConn']);

	if (!$res) {
		return "problem with query";
	}

	if ($res === true) {
		return true;
	}

	$rows = array();
	
	if ($result_type == 'num') {
		while (($row = jBlog_db_sqlite_fetch_array($res))) {
			$rows[] = $row;
		}
	} else {

		$field_names = jBlog_db_sqlite_fetch_array($res);

		if ($result_type == 'both') {
			while (($row = sqlite_fetch_array($res))) {
				foreach ($field_names as $i => $name) {
					$row[$name] = $row[$i];
				}
				$rows[] = $row;
			}
		} else {
			/* string keys only */
			while (($row = jBlog_db_sqlite_fetch_array($res))) {
				$r = array();
				foreach ($field_names as $i => $name) {
					$r[$name] = $row[$i];
				}
				$rows[] = $r;
			}
		}
	}

	if ($single && count($rows) == 0) {
		return false;
	}

	if ($single && count($rows) == 1) {
		return $rows[0];
	}

	return $rows;
}

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

	$jBlog['dbConn'] = sqlite_open($jBlog['jBlogPath'] . "sqlite.db");
	if (is_resource($jBlog['dbConn'])) {
		return true;
	}
	$errs[] = "Unable to open \"$jBlog[jBlogPath]sqlite.db\" - check permissions!";
	return false;
}

function jBlog_db_schema_import($query)
{
	static $search = array('{AUTOINCREMENT}');
	static $replace = array('INTEGER PRIMARY KEY');

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

}

?>

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- db.sql	13 Mar 2003 03:35:59 -0000	1.17
+++ db.sql	13 Mar 2003 18:37:05 -0000	1.18
@@ -5,19 +5,18 @@
 create table {PREFIX}authors (
   username varchar(20) default null,
   password varchar(20) default null,
-  authorid int(11) not null auto_increment,
+  authorid {AUTOINCREMENT},
   mail_comments int(1) default '1',
   mail_trackbacks int(1) default '1',
-  email varchar(128) not null default '',
-  primary key  (authorid)
-) type=myisam;
+  email varchar(128) not null default ''
+);
 
 #
 # table structure for table '{PREFIX}comments'
 #
 
 create table {PREFIX}comments (
-  id int(10) unsigned not null auto_increment,
+  id {AUTOINCREMENT},
   entry_id int(10) unsigned not null default '0',
   timestamp int(10) unsigned default null,
   title varchar(150) default null,
@@ -27,16 +26,15 @@
   ip varchar(15) default null,
   body text,
   type varchar(100) default 'regular',
-  primary key  (id),
   fulltext key body (body)
-) type=myisam;
+);
 
 #
 # table structure for table '{PREFIX}entries'
 #
 
 create table {PREFIX}entries (
-  id int(10) unsigned not null auto_increment,
+  id {AUTOINCREMENT},
   title varchar(200) default null,
   timestamp int(10) unsigned default null,
   body text,
@@ -46,21 +44,19 @@
   author varchar(20) default null,
   authorid int(11) default null,
   categoryid int(11) default null,
-  primary key  (id),
   fulltext key title (title,body,extended)
-) type=myisam;
+);
 
 #
 # table structure for table '{PREFIX}references'
 #
 
 create table {PREFIX}references (
-  id int(10) unsigned not null auto_increment,
+  id {AUTOINCREMENT},
   entry_id int(10) unsigned not null default '0',
   link text,
-  name text,
-  primary key  (id)
-) type=myisam;
+  name text
+);
 
 #
 # Table structure for table '{PREFIX}referrers'
@@ -71,18 +67,17 @@
   day date NOT NULL default '0000-00-00',
   count int(11) NOT NULL default '0',
   PRIMARY KEY  (url,day)
-) TYPE=MyISAM;
+);
 
 #
 # Table structure for table 'jBlog_css'
 #
 
 CREATE TABLE {PREFIX}css (
-  cssid int(11) NOT NULL auto_increment,
+  cssid {AUTOINCREMENT},
   name varchar(40) default NULL,
-  data text,
-  PRIMARY KEY  (cssid)
-) TYPE=MyISAM;
+  data text
+);
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,
@@ -94,7 +89,7 @@
   ip varchar(15) default NULL,
   last timestamp(14) NOT NULL,
   unique key (url, ip)
-) TYPE=MyISAM;
+);
 
 CREATE TABLE {PREFIX}plugins (
 	name varchar(128) not null,
@@ -104,9 +99,8 @@
 );
 
 CREATE TABLE {PREFIX}category (
-  categoryid int(11) NOT NULL auto_increment,
+  categoryid {AUTOINCREMENT},
   category_name varchar(255) default NULL,
   category_description text,
-  authorid int(11) default NULL,
-  PRIMARY KEY  (categoryid)
-) TYPE=MyISAM;
+  authorid int(11) default NULL
+);

Index: htaccess.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/htaccess.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- htaccess.tpl	5 Mar 2003 04:10:01 -0000	1.3
+++ htaccess.tpl	13 Mar 2003 18:37:06 -0000	1.4
@@ -1 +1,5 @@
 ErrorDocument 404 {PREFIX}index.php
+
+<Files sqlite.db>
+   deny from all
+</Files>

Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jBlog_admin_installer.inc.php	10 Mar 2003 22:25:51 -0000	1.11
+++ jBlog_admin_installer.inc.php	13 Mar 2003 18:37:06 -0000	1.12
@@ -149,17 +149,6 @@
 
         case "check":
 
-		// Probe database
-        if (!@mysql_connect($_POST["dbHost"], $_POST["dbUser"], $_POST["dbPass"])) {
-        	$errs[] = "Could not connect to database, check your settings.";
-               $errs[] = "The MySQL error was: " . mysql_error();
-          }
-				else {
-					// Check that target database exists
-
-					if (!@mysql_select_db($_POST["dbName"]))
-						$errs[] = "The database you specified does not exist.";
-				}
 
 		// Check dirs
         if (!is_dir($_POST["jBlogPath"])) {
@@ -195,18 +184,28 @@
             $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["jBlogPath"]."plugins</i>";
 		}
 
+		$_POST['dbType'] = strtolower(basename($_POST['dbType']));
+		foreach ($_POST as $k => $v) {
+			if (substr($k, 0, 2) == 'db' || $k == 'jBlogPath') {
+				$jBlog[$k] = $v;
+			}
+		}
+		include_once $_POST['jBlogPath'] . "/jBlog_db_" . $_POST['dbType'] . ".inc.php";
+		
+		// Probe database (do it after the dir stuff, as we need to be able to create the
+		// sqlite database)
+		jBlog_db_probe($_POST, $errs);
+
 		// Check imagick
         if ($_POST["magick"] == "true" && !is_executable($_POST["convert"])) {
 			$errs[] = "Can't execute convert binary!";
         }
 
         // Something went wrong
-        if (is_array($errs)) {
+        if (is_array($errs) && count($errs)) {
 			echo "<font color='#ff0000'>".implode("<br>", $errs)."</font><p>";
 			jBlog_printConfigTemplate(jBlog_parseTemplate("./jBlog_config_local.tpl"), $_POST);
-        }
-
-        else {
+        } else {
 			echo "Everything seems to be alright, saving config...<p>";
             $f = implode("", file("./jBlog_config_local.tpl"));
             $p = jBlog_parseTemplate("./jBlog_config_local.tpl");
@@ -250,11 +249,10 @@
 
 					// Create tables
 					echo "Attempting to setup Database...<br>";
-					@mysql_select_db($_POST["dbName"]);
 					$queries = jBlog_parse_sql_tables('./db.sql');
 					$queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
 					foreach ($queries as $query) {
-						mysql_query($query);
+						jBlog_db_schema_import($query);
 					}
 					if($_POST['want_mail'] == true) {
 						$mail_comments = 1;
@@ -267,12 +265,13 @@
 								password('$_POST[pass]'),
 								'$_POST[email]',
 								$mail_comments) ";
-					mysql_query($query);
+					jBlog_db_query($query);
 
-					$text = mysql_escape_string(file_get_contents('./jBlog.css'));
+					$text = jBlog_db_escape_string(file_get_contents('./jBlog.css'));
 					$query = "INSERT into $_POST[dbPrefix]css values(NULL, 'default', '$text')";
-					if (!mysql_query($query)) {
-						echo mysql_error();
+					$res = jBlog_db_query($query);
+					if (is_string($res)) {
+						echo $res;
 					}
 
 					/* register default plugins */

Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_config_local.tpl	10 Mar 2003 21:05:29 -0000	1.3
+++ jBlog_config_local.tpl	13 Mar 2003 18:37:07 -0000	1.4
@@ -4,6 +4,7 @@
 * General configure options, adjust to your needs:                       *
 *************************************************************************/
 // Database Settings
+$jBlog["dbType"]   = "{dbType|string|mysql}";			 // Database type (mysql|sqlite)
 $jBlog["dbHost"]   = "{dbHost|string|localhost}";        // MySQL host
 $jBlog["dbUser"]   = "{dbUser|string|jBlog}";            // Username
 $jBlog["dbPass"]   = "{dbPass|string|jBlog}";            // Password

Index: jBlog_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_mysql.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_db_mysql.inc.php	13 Mar 2003 17:08:09 -0000	1.2
+++ jBlog_db_mysql.inc.php	13 Mar 2003 18:37:07 -0000	1.3
@@ -19,6 +19,7 @@
 	$c = mysql_db_query($jBlog['dbName'], $sql);
 	if (!$c) {
 		print mysql_error();
+		highlight_string(var_export(debug_backtrace(), 1));
 		return false;
 	}
 	if ($c === true) {
@@ -56,51 +57,47 @@
 	return mysql_affected_rows();
 }
 
-function jBlog_db_update($table, $keys, $values)
+function jBlog_db_escape_string($string)
 {
-	global $jBlog;
-
-	$set = "";
-	foreach ($values as $k => $v) {
-		if (strlen($set))
-			$set .= ", ";
-		$set .= "$k='" . jBlog_db_escape_string($v) . "'";
-	}
-	$where = "";
-	foreach ($keys as $k => $v) {
-		if (strlen($where))
-			$where .= ", ";
-		$where .= "$k='" . jBlog_db_escape_string($v) . "'";
-	}
-	return jBlog_db_query("UPDATE {$jBlog['dbPrefix']}$table SET $set $where");
+	return mysql_escape_string($string);
 }
 
-function jBlog_db_insert($table, $values)
+function jBlog_db_connect()
 {
 	global $jBlog;
 
-	$names = implode(",", array_keys($values));
-
-	$vals = "";
-	foreach ($values as $k => $v) {
-		if (strlen($vals))
-			$vals .= ", ";
-		$vals .= "$k='" . jBlog_db_escape_string($v) . "'";
-	}
-	return jBlog_db_query("INSERT INTO {$jBlog['dbPrefix']}$table ($names) values ($vals)");
+	$jBlog['dbConn'] = mysql_connect($jBlog['dbHost'], $jBlog['dbUser'], $jBlog['dbPass']);
+	return $jBlog['dbConn'];
 }
 
-function jBlog_db_escape_string($string)
+function jBlog_db_schema_import($query)
 {
-	return mysql_escape_string($string);
+	static $search = array('{AUTOINCREMENT}');
+	static $replace = array('int(11) not null auto_increment primary key');
+
+	return jBlog_db_query(str_replace($search, $replace, $query));
 }
 
-function jBlog_db_connect()
+/* probes the usability of the DB during installation */
+function jBlog_db_probe($hash, &$errs)
 {
 	global $jBlog;
+	
+	if (!($c = @mysql_connect($hash['dbHost'], $hash['dbUser'], $hash['dbPass']))) {
+		$errs[] = "Could not connect to database; check your settings.";
+		$errs[] = "The mySQL error was: " . mysql_error();
+		return false;
+	}
+	
+	$jBlog['dbConn'] = $c;
 
-	$jBlog['dbConn'] = mysql_connect($jBlog['dbHost'], $jBlog['dbUser'], $jBlog['dbPass']);
-	return $jBlog['dbConn'];
+	if (!@mysql_select_db($hash['dbName'])) {
+		$errs[] = "The database you specified does not exist.";
+		$errs[] = "The mySQL error was: " . mysql_error();
+		return false;
+	}
+
+	return true;
 }
 
 ?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- jBlog_functions.inc.php	13 Mar 2003 18:18:51 -0000	1.63
+++ jBlog_functions.inc.php	13 Mar 2003 18:37:07 -0000	1.64
@@ -11,7 +11,7 @@
 
 if (IN_JBLOG !== true) die ("Don't hack!");
 
-include_once "jBlog_db_mysql.inc.php";
+include_once "jBlog_db.inc.php";
 
 $jBlog["imageList"] = array();
 function jBlog_displayCommentForm($id) {
@@ -98,9 +98,11 @@
         $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";
         $rows = jBlog_db_query($querystring);
         $activeDays = array();
-		foreach ($rows as $row) {
-            $activeDays[$row["day"]] = $row["timestamp"];
-        }
+		if (is_array($rows)) {
+			foreach ($rows as $row) {
+				$activeDays[$row["day"]] = $row["timestamp"];
+			}
+		}
 
         // Prepare the table
 ?>
@@ -221,11 +223,10 @@
 	global $jBlog;
 
 	if ($authorid === null) {
-		$authorid = $_SESSION['jBlogAuthorid'];
+		$authorid = $jBlog['authorid'];
 	}
 	
-    $querystring = "SELECT * FROM ".$jBlog['dbPrefix']."category 
-                    WHERE authorid = $authorid";
+    $querystring = "SELECT * FROM ".$jBlog['dbPrefix']."category WHERE authorid = $authorid";
 
 	return jBlog_db_query($querystring);
 }
@@ -240,7 +241,7 @@
     $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
                     WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
 
-	return jBlog_db_query($query);
+	return jBlog_db_query($querystring);
 }
 
 
@@ -1112,14 +1113,16 @@
 
 	$cats = jBlog_fetchCategories();
 
-	$cat_list = "<select name=\"jBlog[categoryid]\">";
-	foreach ($cats as $cat_data) {
-		$selected = $cat_data['categoryid'] == $entry['categoryid'] ? " selected" : "";
-		$cat_list .= "<option value=\"$cat_data[categoryid]\"$selected>" .
-			htmlentities($cat_data['category_name']) .
-			" - " .
-			htmlentities($cat_data['category_description']) .
-			"</option>\n";
+	$cat_list = "<select name=\"jBlog[categoryid]\"><option value=\"0\">[No Category]</option>\n";
+	if (is_array($cats)) {
+		foreach ($cats as $cat_data) {
+			$selected = $cat_data['categoryid'] == $entry['categoryid'] ? " selected" : "";
+			$cat_list .= "<option value=\"$cat_data[categoryid]\"$selected>" .
+				htmlentities($cat_data['category_name']) .
+				" - " .
+				htmlentities($cat_data['category_description']) .
+				"</option>\n";
+		}
 	}
 	$cat_list .= "</select>";
 
@@ -1342,8 +1345,8 @@
               WHERE
                 username = '$username'
               AND password = PASSWORD('$password')";
-    $row = jBlog_db_query($query);
-    if(is_string($row)) {
+    $row = jBlog_db_query($query, true);
+    if (is_string($row)) {
         print $row;
     }
     if($row) {

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.62,1.63

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fixed support for null categories in fetchEntries



Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- jBlog_functions.inc.php	13 Mar 2003 12:47:17 -0000	1.62
+++ jBlog_functions.inc.php	13 Mar 2003 18:18:51 -0000	1.63
@@ -191,7 +191,7 @@
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT e.*, a.*, 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 e.authorid = c.authorid " . $and .
+    $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 .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
     if (is_string($ret)) {

[php-blog-cvs] jBlog TODO,1.2,1.3

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

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

Modified Files:
	TODO 
Log Message:
new entry


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/jBlog/TODO,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TODO	13 Mar 2003 15:25:51 -0000	1.2
+++ TODO	13 Mar 2003 18:11:47 -0000	1.3
@@ -1,6 +1,7 @@
 * Split up the administration and entry editing sections into two 
 separate areas.
 * Unify the configuration system
+* Make uploads per-user
 * XHTML 1.0 Strict Compliance
 * Finalize the database schema
 * Add the ability to import and export RSS feeds

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

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

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

Modified Files:
	jBlog_admin_category.inc.php 
Log Message:
eliminate some warnings, the one i posted to irc still exists


Index: jBlog_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_category.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_admin_category.inc.php	13 Mar 2003 12:44:39 -0000	1.1
+++ jBlog_admin_category.inc.php	13 Mar 2003 18:09:40 -0000	1.2
@@ -25,7 +25,7 @@
 
 $cats = jBlog_fetchCategories();
 
-if ($cat_to_edit > 0) {
+if ($cat_to_edit > 0 && count($cats)) {
 	foreach ($cats as $cat_data) {
 		if ($cat_data['categoryid'] == $cat_to_edit) {
 			$this_cat = $cat_data;
@@ -67,10 +67,12 @@
 
 <table>
 <?php
-foreach ($cats as $cat_data) {
-	$name = htmlentities($cat_data['category_name']);
-	$desc = htmlentities($cat_data['category_description']);
-	echo "<tr><td>&bull; <a href=\"?jBlog[adminModule]=category&jBlog[cat][catid]=$cat_data[categoryid]\">$name - $desc</a></td></tr>\n";
+if (is_array($cats)) {
+    foreach ($cats as $cat_data) {
+    	$name = htmlentities($cat_data['category_name']);
+	    $desc = htmlentities($cat_data['category_description']);
+    	echo "<tr><td>&bull; <a href=\"?jBlog[adminModule]=category&jBlog[cat][catid]=$cat_data[categoryid]\">$name - $desc</a></td></tr>\n";
+    }
 }
 ?>
 <tr><td>&bull; <a href="?jBlog[adminModule]=category&jBlog[cat][catid]=0">Create New Category</a></td></tr>

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

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

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

Modified Files:
	jBlog_db_mysql.inc.php 
Log Message:
fix parse errors


Index: jBlog_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_mysql.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_db_mysql.inc.php	13 Mar 2003 12:44:39 -0000	1.1
+++ jBlog_db_mysql.inc.php	13 Mar 2003 17:08:09 -0000	1.2
@@ -72,7 +72,7 @@
 			$where .= ", ";
 		$where .= "$k='" . jBlog_db_escape_string($v) . "'";
 	}
-	return jBlog_db_query("UPDATE $jBlog['dbPrefix']$table SET $set $where");
+	return jBlog_db_query("UPDATE {$jBlog['dbPrefix']}$table SET $set $where");
 }
 
 function jBlog_db_insert($table, $values)
@@ -87,7 +87,7 @@
 			$vals .= ", ";
 		$vals .= "$k='" . jBlog_db_escape_string($v) . "'";
 	}
-	return jBlog_db_query("INSERT INTO $jBlog['dbPrefix']$table ($names) values ($vals)");
+	return jBlog_db_query("INSERT INTO {$jBlog['dbPrefix']}$table ($names) values ($vals)");
 }
 
 function jBlog_db_escape_string($string)

[php-blog-cvs] jBlog TODO,1.1,1.2

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

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

Modified Files:
	TODO 
Log Message:
this stuff has been done - kickass


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/jBlog/TODO,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TODO	11 Mar 2003 19:14:53 -0000	1.1
+++ TODO	13 Mar 2003 15:25:51 -0000	1.2
@@ -5,11 +5,9 @@
 * Finalize the database schema
 * Add the ability to import and export RSS feeds
 * Generate RSS 1.0 Feeds
-* Implement wiki style comments
 * Finalize the plugin api
 * Add an OPML plugin for easy blogroll inclusion
 * Add a citation extractor plugin
-* Add categories
 * Add support for multiple weblogs
 * Add the ability to have a printer friendly format for the weblog
 * Add a set of css templates that are distributed with jBlog.  choose

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.61,1.62

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
re-enable this


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- jBlog_functions.inc.php	13 Mar 2003 12:44:39 -0000	1.61
+++ jBlog_functions.inc.php	13 Mar 2003 12:47:17 -0000	1.62
@@ -1124,7 +1124,7 @@
 	$cat_list .= "</select>";
 
 
-	if (false && $jBlog["wysiwyg"])
+	if ($jBlog["wysiwyg"])
 	{
     ?>
     	<font color="#ff0000"><?=$errMsg?></font>

[php-blog-cvs] jBlog jBlog_admin_category.inc.php,NONE,1.1 jBlog_db_mysql.inc.php,NONE,1.1 index.php,1.7,1.8 jBlog_admin.php,1.19,1.20 jBlog_admin_css.inc.php,1.3,1.4 jBlog_admin_entries.inc.php,1.9,1.10 jBlog_admin_plugins.inc.php,1.4,1.5 jBlog_config.inc.php,1.3,1.4 jBlog_functions.inc.php,1.60,1.61

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

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

Modified Files:
	index.php jBlog_admin.php jBlog_admin_css.inc.php 
	jBlog_admin_entries.inc.php jBlog_admin_plugins.inc.php 
	jBlog_config.inc.php jBlog_functions.inc.php 
Added Files:
	jBlog_admin_category.inc.php jBlog_db_mysql.inc.php 
Log Message:
Moving towards db abstraction.
Added categories support to the web interface.


--- NEW FILE: jBlog_admin_category.inc.php ---
<?php
if (IN_JBLOG !== true) die ("Don't hack!");

session_start();

$cat_to_edit = (int)$_GET['jBlog']['cat']['catid'];
$msg = "";

if (isset($_POST['SAVE'])) {
	$name = addslashes($_POST['jBlog']['cat']['name']);
	$desc = addslashes($_POST['jBlog']['cat']['description']);
	if ($cat_to_edit == 0) {
		$query = "INSERT INTO $jBlog[dbPrefix]category (category_name, category_description, authorid) values ('$name', '$desc', $_SESSION[jBlogAuthorid])";
	} else {
		$query = "UPDATE $jBlog[dbPrefix]category SET category_name='$name', category_description='$desc' where categoryid=$cat_to_edit";
	}
	
	$r = jBlog_db_query($query);
	if (is_string($r)) {
		$msg = $r;
	} else {
		$msg = "Category Saved";
	}
}

$cats = jBlog_fetchCategories();

if ($cat_to_edit > 0) {
	foreach ($cats as $cat_data) {
		if ($cat_data['categoryid'] == $cat_to_edit) {
			$this_cat = $cat_data;
			break;
		}
	}
}

?>
<font color="red"><?= $msg ?></font>
<form method="POST" name="jBlogCategory">

<?php
if ($cat_to_edit == 0) {
	$desc = "Create a New Category";
	$save = "Create";
} else {
	$desc = htmlentities("Edit \"$this_cat[category_name] - $this_cat[category_description]\"");
	$save = "Save";
}
?>
<b><?= $desc ?></b>
<table cellpadding="5">
<tr>
<th>Name</th>
<td><input type="text" name="jBlog[cat][name]" value="<?= htmlentities($this_cat['category_name']) ?>" /></td>
</tr>

<tr>
<th>Description</th>
<td><input type="text" name="jBlog[cat][description]" value="<?= htmlentities($this_cat['category_description']) ?>"/></td>
</tr>
</table>
<input type="submit" name="SAVE" value="<?= $save ?>">
<br />
<br />

<b>Click on a category to edit it</b>

<table>
<?php
foreach ($cats as $cat_data) {
	$name = htmlentities($cat_data['category_name']);
	$desc = htmlentities($cat_data['category_description']);
	echo "<tr><td>&bull; <a href=\"?jBlog[adminModule]=category&jBlog[cat][catid]=$cat_data[categoryid]\">$name - $desc</a></td></tr>\n";
}
?>
<tr><td>&bull; <a href="?jBlog[adminModule]=category&jBlog[cat][catid]=0">Create New Category</a></td></tr>
</table>

</form>

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

/* Issues a query to the underlying database;
 * returns:
 *   false if there was an error,
 *   true if the query succeeded but did not generate any rows
 *   array of field values if it returned a single row and $single is true
 *   array of array of field values if it returned row(s)
 */
function jBlog_db_query($sql, $single = false, $result_type = "both")
{
	global $jBlog;
	static $type_map = array(
		'assoc' => MYSQL_ASSOC,
		'num'	=> MYSQL_NUM,
		'both'	=> MYSQL_BOTH
		);
	
	$c = mysql_db_query($jBlog['dbName'], $sql);
	if (!$c) {
		print mysql_error();
		return false;
	}
	if ($c === true) {
		return true;
	}

	$result_type = $type_map[$result_type];
	
	switch(mysql_num_rows($c)) {
		case 0:
			if ($single) {
				return false;
			}
			return true;
		case 1:
			if ($single) {
				return mysql_fetch_array($c, $result_type);
			}
		default:
			$rows = array();
			while (($row = mysql_fetch_array($c, $result_type))) {
				$rows[] = $row;
			}
			return $rows;
	}
}

function jBlog_db_insert_id()
{
	return mysql_insert_id();
}

function jBlog_db_affected_rows()
{
	return mysql_affected_rows();
}

function jBlog_db_update($table, $keys, $values)
{
	global $jBlog;

	$set = "";
	foreach ($values as $k => $v) {
		if (strlen($set))
			$set .= ", ";
		$set .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	$where = "";
	foreach ($keys as $k => $v) {
		if (strlen($where))
			$where .= ", ";
		$where .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	return jBlog_db_query("UPDATE $jBlog['dbPrefix']$table SET $set $where");
}

function jBlog_db_insert($table, $values)
{
	global $jBlog;

	$names = implode(",", array_keys($values));

	$vals = "";
	foreach ($values as $k => $v) {
		if (strlen($vals))
			$vals .= ", ";
		$vals .= "$k='" . jBlog_db_escape_string($v) . "'";
	}
	return jBlog_db_query("INSERT INTO $jBlog['dbPrefix']$table ($names) values ($vals)");
}

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

function jBlog_db_connect()
{
	global $jBlog;

	$jBlog['dbConn'] = mysql_connect($jBlog['dbHost'], $jBlog['dbUser'], $jBlog['dbPass']);
	return $jBlog['dbConn'];
}

?>

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.php	11 Mar 2003 19:05:18 -0000	1.7
+++ index.php	13 Mar 2003 12:44:39 -0000	1.8
@@ -35,10 +35,8 @@
         $_GET['jBlog']['action'] = 'read';
         $_GET['jBlog']['id'] = $id;
 
-        $cursor = mysql_db_query($jBlog['dbName'], 
-                                 "SELECT title FROM {$jBlog['dbPrefix']}entries " .
-                                 'WHERE id=' . mysql_escape_string($id));
-        $title = mysql_fetch_row($cursor);
+        $title = jBlog_db_query("SELECT title FROM {$jBlog['dbPrefix']}entries " .
+                                 'WHERE id=' . jBlog_db_escape_string($id), true);
         $title = $title[0];
         
         $jBlog['blogSubTitle'] = $title;

Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- jBlog_admin.php	11 Mar 2003 18:49:06 -0000	1.19
+++ jBlog_admin.php	13 Mar 2003 12:44:39 -0000	1.20
@@ -65,6 +65,13 @@
 					</div>
 
 					<div class="jBlogSideBarItem">
+					<div class="jBlogSideBarTitle">Categories:</div>
+					<div class="jBlogSideBarContent">
+                    &bull; <a href='?jBlog[adminModule]=category&jBlog[adminAction]=editSelect'>Edit Categories</a><br>
+					</div>
+					</div>
+
+					<div class="jBlogSideBarItem">
 					<div class="jBlogSideBarTitle">Images:</div>
 					<div class="jBlogSideBarContent">
 					&bull; <a href='?jBlog[adminModule]=images&jBlog[adminAction]=addSelect'>Add images</a><br>
@@ -111,6 +118,10 @@
 							case "css":
 								include("jBlog_admin_css.inc.php");
                             break;
+
+							case "category":
+								include "jBlog_admin_category.inc.php";
+								break;
 
 							case "plugins":
 								include "jBlog_admin_plugins.inc.php";

Index: jBlog_admin_css.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_css.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_admin_css.inc.php	6 Mar 2003 17:09:34 -0000	1.3
+++ jBlog_admin_css.inc.php	13 Mar 2003 12:44:39 -0000	1.4
@@ -19,7 +19,7 @@
                                       "name"=>$jBlog["POST"]["name"],
                                       "data" =>$jBlog["POST"]["data"]);
         $res = jBlog_updateCSS($entry);
-        if ($res != "")
+        if (is_string($res))
             jBlog_printCSSForm("?", "edit", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css", "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
         else
             jBlog_printCSSForm("?", "edit", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css", "jBlog[adminAction]" => "save"), $entry);
@@ -60,8 +60,8 @@
 			jBlog_set_config_var("default_css", $css['name']);
 		} else if (isset($_POST['DELETE'])) {
 			if (is_numeric($_POST['jBlog']['cssid'])) {
-				$id = mysql_escape_string($_POST['jBlog']['cssid']);
-				mysql_db_query($jBlog['dbName'], "delete from $jBlog[dbPrefix]css where cssid='$id'");
+				$id = jBlog_db_escape_string($_POST['jBlog']['cssid']);
+				jBlog_db_query("delete from $jBlog[dbPrefix]css where cssid='$id'");
 			}
 			jBlog_printCSSForm("?", "choose", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "css"), $entry);
 		} else {

Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jBlog_admin_entries.inc.php	11 Mar 2003 19:16:53 -0000	1.9
+++ jBlog_admin_entries.inc.php	13 Mar 2003 12:44:39 -0000	1.10
@@ -72,9 +72,11 @@
   						              "title"=>$jBlog["POST"]["title"],
                                       "timestamp" => $jBlog["POST"]["timestamp"],
         		  		              "body" =>$jBlog["POST"]["body"],
-                                      "extended" => $jBlog["POST"]["extended"]);
+                                      "extended" => $jBlog["POST"]["extended"],
+									  "categoryid" => $jBlog['POST']['categoryid']
+									  );
 		$res = jBlog_updertEntry($entry);
-        if ($res !== true)
+        if (is_string($res))
 			jBlog_printEntryForm("?", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "entries",
                              	 "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
         else

Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_admin_plugins.inc.php	11 Mar 2003 03:24:53 -0000	1.4
+++ jBlog_admin_plugins.inc.php	13 Mar 2003 12:44:39 -0000	1.5
@@ -156,9 +156,13 @@
 	return $x . "</select>";
 }
 
+$sort_order = 0;
+
 foreach ($plugins as $plugin_data) {
 	$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
 
+	$key = urlencode($plugin_data['name']);
+
 	/* query for its name, description and configuration data */
 	$bag = new jBlog_property_bag;
 	$plugin->introspect($bag);
@@ -176,7 +180,7 @@
 	}
 
 	if ($bag->is_set('configuration')) {
-		$url = "?jBlog[adminModule]=plugins&jBlog[plugin_to_conf]=" . urlencode($plugin_data['name']);
+		$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>";

Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_config.inc.php	11 Mar 2003 19:23:21 -0000	1.3
+++ jBlog_config.inc.php	13 Mar 2003 12:44:39 -0000	1.4
@@ -56,13 +56,9 @@
 
 
 // Connect to database
-$jBlog["dbConn"] = mysql_connect($jBlog["dbHost"], $jBlog["dbUser"], $jBlog["dbPass"]);
-if (!is_resource($jBlog["dbConn"]))
+if (!is_resource(jBlog_db_connect())) {
 	die ("jBlog error: unable to connect to database - exiting");
-
-/* $jBlog["db"]     = mysql_select_db($jBlog["dbName"]);
-if (!is_resource($jBlog["db"]))
-	die ("jBlog error: unable to select database - exiting"); */
+}
 
 // Merge get and post into the jBlog array
 $jBlog["GET"] = &$_GET["jBlog"];

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- jBlog_functions.inc.php	13 Mar 2003 06:58:27 -0000	1.60
+++ jBlog_functions.inc.php	13 Mar 2003 12:44:39 -0000	1.61
@@ -11,6 +11,8 @@
 
 if (IN_JBLOG !== true) die ("Don't hack!");
 
+include_once "jBlog_db_mysql.inc.php";
+
 $jBlog["imageList"] = array();
 function jBlog_displayCommentForm($id) {
     global $jBlog;
@@ -93,11 +95,11 @@
             $nextYear  = $year+1;}
 
         // Find out about diary entries
-        $querystring = "SELECT FROM_UNIXTIME(timestamp, '%e'),timestamp FROM ".$jBlog["dbPrefix"]."entries WHERE FROM_UNIXTIME(timestamp,'%c') LIKE $month AND FROM_UNIXTIME(timestamp,'%Y') LIKE $year";
-        $query = mysql_query($querystring);
+        $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";
+        $rows = jBlog_db_query($querystring);
         $activeDays = array();
-        while($row = @mysql_fetch_row($query)) {
-            $activeDays[$row[0]] = $row[1];
+		foreach ($rows as $row) {
+            $activeDays[$row["day"]] = $row["timestamp"];
         }
 
         // Prepare the table
@@ -192,8 +194,8 @@
     $query = "SELECT e.*, a.*, 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 e.authorid = c.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
-    if (!$ret) {
-        die("Query failed: " . mysql_error() . "\n");
+    if (is_string($ret)) {
+        die("Query failed: $ret");
     }
 
     return $ret;
@@ -208,24 +210,24 @@
 	if ($full === true) $body = ", body, extended";
     $querystring = "SELECT * FROM ".$jBlog["dbPrefix"]."entries e, $jBlog[dbPrefix]authors a
                     WHERE  a.authorid = e.authorid AND $key LIKE $val  LIMIT 1";
-    $query       = mysql_db_query($jBlog["dbName"], $querystring);
 
-    return mysql_fetch_assoc($query);
+	return jBlog_db_query($querystring, true);
 }
 
 /**
 * Fetches a users categories
 **/
-function jBlog_fetchCategories($authorid) {
+function jBlog_fetchCategories($authorid = null) {
 	global $jBlog;
+
+	if ($authorid === null) {
+		$authorid = $_SESSION['jBlogAuthorid'];
+	}
+	
     $querystring = "SELECT * FROM ".$jBlog['dbPrefix']."category 
                     WHERE authorid = $authorid";
-    $query       = mysql_db_query($jBlog["dbName"], $querystring);
-    $retval = array();
-    while( $row = mysql_fetch_assoc($query)) {
-        $retval[] = $row;
-    }
-    return $retval;
+
+	return jBlog_db_query($querystring);
 }
 
 
@@ -237,11 +239,8 @@
 
     $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
                     WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
-    $query       = mysql_db_query($jBlog["dbName"], $querystring);
-    while($row = mysql_fetch_assoc($query)) {
-		$ret[] = $row;
-    }
-    return $ret;
+
+	return jBlog_db_query($query);
 }
 
 
@@ -350,14 +349,10 @@
         $query .= " LIMIT $limit";
     }
 
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-
-    $results = array();
-    while ($row = @mysql_fetch_array($cursor)) {
-       array_push($results, $row);
-    }
-
-    return $results;
+	$comments = jBlog_db_query($query);
+	if (!is_array($comments))
+		return array();
+	return $comments;
 }
 
 function jBlog_printComments($comments)
@@ -392,27 +387,26 @@
 function jBlog_saveComment($id, $commentInfo, $type='NORMAL') {
     global $jBlog;
 
-    $title = mysql_escape_string($commentInfo['title']);
-    $comments = mysql_escape_string($commentInfo['comment']);
-    $name = mysql_escape_string($commentInfo['name']);
-    $url = mysql_escape_string($commentInfo['url']);
-    $email = mysql_escape_string($commentInfo['email']);   
+    $title = jBlog_db_escape_string($commentInfo['title']);
+    $comments = jBlog_db_escape_string($commentInfo['comment']);
+    $name = jBlog_db_escape_string($commentInfo['name']);
+    $url = jBlog_db_escape_string($commentInfo['url']);
+    $email = jBlog_db_escape_string($commentInfo['email']);   
 
     $t = time();
     $query = "INSERT INTO {$jBlog['dbPrefix']}comments (entry_id, author, email, url, body, type, timestamp, title)"; 
     $query .= " VALUES ('$id', '$name', '$email', '$url', '$comments', '$type', '$t', '$title')";
 
-    mysql_db_query($jBlog['dbName'], $query);
+    jBlog_db_query($query);
 
     $query = "UPDATE {$jBlog['dbPrefix']}entries SET comments=comments+1 WHERE id='$id'";
-    mysql_db_query($jBlog['dbName'], $query);
+    jBlog_db_query($query);
 
     $query = "SELECT email, title, mail_comments 
               FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a
               WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-    $row = mysql_fetch_assoc($cursor);
+    $row = jBlog_db_query($query, true);
     if($row['mail_comments']) {
         jBlog_sendComment($row['email'], $name, $email, $url, $id, 
                           $row['title'], $comments);
@@ -447,15 +441,9 @@
 {
     global $jBlog;
 
-    $query = "SELECT name,link FROM {$jBlog['dbPrefix']}references WHERE entry_id='" . mysql_escape_string($id) . "'";
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-
-    $rows = array();
-    while (($row = mysql_fetch_assoc($cursor))) {
-        array_push($rows, $row);
-    }
+    $query = "SELECT name,link FROM {$jBlog['dbPrefix']}references WHERE entry_id='" . jBlog_db_escape_string($id) . "'";
 
-    return $rows;
+	return jBlog_db_query($query);
 }
 
 
@@ -789,30 +777,29 @@
     // Add URL references
     $locations = $matches[0];
     $names = $matches[1];
-    $tmpid = mysql_escape_string($id);
+    $tmpid = jBlog_db_escape_string($id);
 
     for ($i = 0, $j = count($locations); $i < $j; ++$i) {
         if($locations[$i][0] == '/') {
             $locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
         }
         $query = "SELECT COUNT(id) FROM {$jBlog['dbPrefix']}references WHERE ";
-        $query .= "entry_id=$tmpid AND link='" . mysql_escape_string($locations[$i]) . "'";
+        $query .= "entry_id=$tmpid AND link='" . jBlog_db_escape_string($locations[$i]) . "'";
 
-        $cursor = mysql_db_query($jBlog['dbName'], $query);
-        $row = mysql_fetch_row($cursor);
+        $row = jBlog_db_query($query, true, 'num');
         if ($row[0] > 0) {
             continue;
         }
         jBlog_reference_autodiscover($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
     }
-    mysql_db_query($jBlog['dbName'], "DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");
+    jBlog_db_query("DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$tmpid'");
 
     for ($i = 0; $i < $j; ++$i) {
         $query = "INSERT INTO {$jBlog['dbPrefix']}references (entry_id, name, link) VALUES(";
-        $query .= "'$tmpid', '" . mysql_escape_string($names[$i]) . "', '";
-        $query .= mysql_escape_string($locations[$i]) . "')";
+        $query .= "'$tmpid', '" . jBlog_db_escape_string($names[$i]) . "', '";
+        $query .= jBlog_db_escape_string($locations[$i]) . "')";
 
-        mysql_db_query($jBlog['dbName'], $query);
+        jBlog_db_query($query);
     }
 
     // Add citations
@@ -820,9 +807,9 @@
 
     foreach ($matches[1] as $citation) {
         $query = "INSERT INTO {$jBlog['dbPrefix']}references (en)try_id, name) VALUES(";
-        $query .= "'$tmpid', '" . mysql_escape_string($citation) . "')";
+        $query .= "'$tmpid', '" . jBlog_db_escape_string($citation) . "')";
 
-        mysql_db_query($jBlog['dbName'], $query);
+        jBlog_db_query($query);
     }
 }
 
@@ -841,20 +828,27 @@
         $exflag = 1;
     }
     $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
-                    (id, title, timestamp, body, extended, comments, exflag, author, authorid)
+                    (id, title, timestamp, body, extended, comments, exflag, author, authorid, categoryid)
                     VALUES (
                     ".$entry["id"].",
-                    '".mysql_escape_string($entry["title"])."',
+                    '".jBlog_db_escape_string($entry["title"])."',
                     ".$entry["timestamp"].",
-					'".mysql_escape_string($entry["body"])."', 
-					'".mysql_escape_string($entry["extended"])."', 
+					'".jBlog_db_escape_string($entry["body"])."', 
+					'".jBlog_db_escape_string($entry["extended"])."', 
                     '0', '$exflag',
-                    '".mysql_escape_string($jBlog["user"])."',
-                    '".$jBlog["authorid"]."')";
-    $query = mysql_db_query($jBlog["dbName"], $querystring);
+                    '".jBlog_db_escape_string($jBlog["user"])."',
+                    '".$jBlog["authorid"]."'," .
+					(int)$entry['categoryid'] . 
+					")";
+    $query = jBlog_db_query($querystring);
+
+	if (is_string($query)) {
+		return $query;
+	}
+	
     if ($entry['id'] == "NULL") {
         $newEntry = 1;
-        $entry['id'] = mysql_insert_id();
+        $entry['id'] = jBlog_db_insert_id();
     }
     if($exflag) {
         jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
@@ -865,7 +859,7 @@
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
    
-    return mysql_error()?mysql_error():$entry['id'];
+    return (int)$entry['id'];
 }
 
 function jBlog_updateEntry($entry) {
@@ -881,11 +875,14 @@
         $exflag = 1;
     }
     $querystring = "UPDATE ".$jBlog["dbPrefix"]."entries 
-                    SET title = '".mysql_escape_string($entry["title"])."',
-                        body = '".mysql_escape_string($entry["body"])."',
-                        extended = '".mysql_escape_string($entry["extended"])."',
+                    SET title = '".jBlog_db_escape_string($entry["title"])."',
+                        body = '".jBlog_db_escape_string($entry["body"])."',
+                        extended = '".jBlog_db_escape_string($entry["extended"])."',
                         exflag = '$exflag' WHERE id = ".$entry["id"];
-    $query = mysql_db_query($jBlog["dbName"], $querystring);
+    $query = jBlog_db_query($querystring);
+	if (is_string($query)) {
+		return $query;
+	}
     if($exflag) {
         jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
     }
@@ -893,7 +890,7 @@
         jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['body'], $newEntry);
     }
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
-    return mysql_error()?mysql_error():$entry['id'];
+    return $entry['id'];
 }
 
 /**
@@ -906,17 +903,14 @@
 	if (!is_numeric($id)) return false;
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $query = mysql_db_query($jBlog["dbName"], "SELECT timestamp FROM {$jBlog['dbPrefix']}entries WHERE id=$id");
-    $result = mysql_fetch_row($query);
+    $result = jBlog_db_query("SELECT timestamp FROM {$jBlog['dbPrefix']}entries WHERE id=$id", true);
     jBlog_purgeEntry($id, $result[0]);
 
-    $query = mysql_db_query($jBlog["dbName"], "DELETE FROM ".$jBlog["dbPrefix"].
-                            "entries WHERE id=$id");
+    jBlog_db_query("DELETE FROM ".$jBlog["dbPrefix"].  "entries WHERE id=$id");
 
-    $query = mysql_db_query($jBlog["dbName"], "DELETE FROM ".$jBlog["dbPrefix"].
-                            "comments WHERE entry_id=$id");
+    jBlog_db_query("DELETE FROM ".$jBlog["dbPrefix"].  "comments WHERE entry_id=$id");
 
-    mysql_db_query($jBlog['dbName'], "DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$id'");
+    jBlog_db_query("DELETE FROM {$jBlog['dbPrefix']}references WHERE entry_id='$id'");
 }
 
 function jBlog_updateCSS($css) {
@@ -930,14 +924,17 @@
                     (cssid, name, data)
                     VALUES (
                     ".$css["cssid"].",
-                    '".mysql_escape_string($css["name"])."',
-					'".mysql_escape_string($css["data"])."')";
-    $query = mysql_db_query($jBlog["dbName"], $querystring);
+                    '".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'] == "NULL") {
         $newEntry = 1;
-        $css['cssid'] = mysql_insert_id();
+        $css['cssid'] = jBlog_db_insert_id();
     }
-    return mysql_error();
+    return $css['cssid'];
 }
 
 /**
@@ -1102,8 +1099,8 @@
                    "VALUES (NULL, $id, ".time().", '".strip_tags($entry["author"])."', ".
                    "'".strip_tags($entry["email"])."', '".strip_tags($entry["url"])."', '$REMOTE_ADDR', ".
                    "'".strip_tags($entry["body"])."')";
-    mysql_db_query($jBlog["dbName"], $querystring);
-    mysql_db_query("UPDATE ".$jBlog["dbPrefix"]." SET comments=comments+1 WHERE id LIKE $id");
+    jBlog_db_query($querystring);
+    jBlog_db_query("UPDATE ".$jBlog["dbPrefix"]." SET comments=comments+1 WHERE id LIKE $id");
 }
 
 
@@ -1113,10 +1110,21 @@
 function jBlog_printEntryForm($targetURL, $hiddens = array(), $entry = array(), $errMsg = "") {
 	global $jBlog;
 
-	// Determine whether we should WYSIWYG editor
+	$cats = jBlog_fetchCategories();
+
+	$cat_list = "<select name=\"jBlog[categoryid]\">";
+	foreach ($cats as $cat_data) {
+		$selected = $cat_data['categoryid'] == $entry['categoryid'] ? " selected" : "";
+		$cat_list .= "<option value=\"$cat_data[categoryid]\"$selected>" .
+			htmlentities($cat_data['category_name']) .
+			" - " .
+			htmlentities($cat_data['category_description']) .
+			"</option>\n";
+	}
+	$cat_list .= "</select>";
 
 
-	if ($jBlog["wysiwyg"])
+	if (false && $jBlog["wysiwyg"])
 	{
     ?>
     	<font color="#ff0000"><?=$errMsg?></font>
@@ -1133,6 +1141,7 @@
 				<td align="left">
                 	<input type="text" name="jBlog[title]" value="<?=$entry["title"]?>" size=30>
                 </td>
+				<td>Category: <?= $cat_list ?></td>
     		</tr>
             <tr>
                 <td colspan="2">Entry Body</td>
@@ -1179,7 +1188,8 @@
 				<td align="left">
                 	<input type="text" name="jBlog[title]" value="<?=htmlentities($entry["title"])?>" size=30>
                 </td>
-                <td align="right">
+                <td nowrap="nowrap" align="right">
+					Category: <?= $cat_list ?>
                 	<input type="button" value=" B " onClick="jBlog_insBasic(document.forms['jBlogEntry']['jBlog[body]'], 'b')">
                     <input type="button" value=" U " onClick="jBlog_insBasic(document.forms['jBlogEntry']['jBlog[body]'], 'u')">
                     <input type="button" value=" I " onClick="jBlog_insBasic(document.forms['jBlogEntry']['jBlog[body]'], 'i')">
@@ -1316,43 +1326,6 @@
     <?php
 }
 
-/* Issues a query to the underlying database;
- * returns:
- *   false if there was an error,
- *   true if the query succeeded but did not generate any rows
- *   array of field values if it returned a single row and $single is true
- *   array of array of field values if it returned row(s)
- */
-function jBlog_db_query($sql, $single = false)
-{
-	global $jBlog;
-	$c = mysql_db_query($jBlog['dbName'], $sql);
-	if (!$c) {
-		print mysql_error();
-		return false;
-	}
-	if ($c === true) {
-		return true;
-	}
-	switch(mysql_num_rows($c)) {
-		case 0:
-			if ($single) {
-				return false;
-			}
-			return true;
-		case 1:
-			if ($single) {
-				return mysql_fetch_assoc($c);
-			}
-		default:
-			$rows = array();
-			while (($row = mysql_fetch_assoc($c))) {
-				$rows[] = $row;
-			}
-			return $rows;
-	}
-}
-
 function jBlog_authenticate_author($username, $password) {
     global $jBlog;
 
@@ -1369,11 +1342,10 @@
               WHERE
                 username = '$username'
               AND password = PASSWORD('$password')";
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-    if(!$cursor) {
-        print mysql_error();
+    $row = jBlog_db_query($query);
+    if(is_string($row)) {
+        print $row;
     }
-    $row = mysql_fetch_assoc($cursor);
     if($row) {
         $_SESSION['jBlogUser'] = $jBlog['jBlogUser'] = $username;
         $_SESSION['jBlogEmail'] = $jBlog['jBlogEmail'] = $row['email'];
@@ -1409,16 +1381,15 @@
     $insert = "INSERT into $jBlog[dbPrefix]referrers
               (url, day, count)
               VALUES ('$_SERVER[HTTP_REFERER]', now(), 1)";
-    $rs = mysql_db_query($jBlog['dbName'], $suppressq);
-    $count = mysql_fetch_row($rs);
+    $count = jBlog_db_query($suppressq, true);
     if($count[0] > 0) {
-        mysql_db_query($jBlog['dbName'], $suppressu);
+        jBlog_db_query($suppressu);
         return;
     } 
-    mysql_db_query($jBlog['dbName'], $suppressu);
-    $rs = mysql_db_query($jBlog['dbName'], $update);
-    if(mysql_affected_rows() == 0) {
-        mysql_db_query($jBlog['dbName'], $insert);
+    jBlog_db_query($suppressu);
+    jBlog_db_query($update);
+    if (jBlog_db_affected_rows() == 0) {
+        jBlog_db_query($insert);
     }
 }    
 
@@ -1426,7 +1397,7 @@
     global $jBlog;
     
     $gc = "DELETE FROM $jBlog[dbPrefix]suppress where last < now() - 900";
-    mysql_db_query($jBlog['dbName'], $gc);
+    jBlog_db_query($gc);
 }
 
 function jBlog_displayTopReferrers($limit=10) {
@@ -1436,29 +1407,32 @@
               GROUP BY url
               ORDER BY total desc
               LIMIT $limit";
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-    if($num_rows = mysql_num_rows($cursor)) {
-        while($row = mysql_fetch_assoc($cursor)) {
-            preg_match("#//([^/]+)#", $row[url], $matches);
+
+	$rows = jBlog_db_query($query);
+	if (is_array($rows)) {
+		foreach ($rows as $row) {
+			preg_match("#//([^/]+)#", $row[url], $matches);
 			$row['url'] = htmlentities($row['url']);
-            echo "<a href=\"$row[url]\">$matches[1] ($row[total])</a><br/>";
-        }     
-    }
+			echo "<a href=\"$row[url]\">$matches[1] ($row[total])</a><br/>";
+		}
+	}
 }
 
 function jBlog_set_config_var($name, $val) {
     global $jBlog;
-	$val = mysql_escape_string($val);
-	mysql_db_query($jBlog['dbName'], "REPLACE INTO $jBlog[dbPrefix]config (name,value) values('$name','$val')");
-	echo mysql_error();
+	$val = jBlog_db_escape_string($val);
+	$r = jBlog_db_query("REPLACE INTO $jBlog[dbPrefix]config (name,value) values('$name','$val')");
+	if (is_string($r)) {
+		echo $r;
+	}
 }
 
 function jBlog_get_config_var($name, $defval = false) {
     global $jBlog;
-	$name = mysql_escape_string($name);
-	$c = mysql_db_query($jBlog['dbName'], "SELECT value from $jBlog[dbPrefix]config where name='$name'");
-	if ($c && $row = mysql_fetch_row($c)) {
-		return $row[0];
+	$name = jBlog_db_escape_string($name);
+	$c = jBlog_db_query("SELECT value from $jBlog[dbPrefix]config where name='$name'", true);
+	if (is_array($c)) {
+		return $c[0];
 	}
 	return $defval;
 }
@@ -1469,8 +1443,8 @@
 	$names = array();
 		
 	$query = "SELECT cssid, name from $jBlog[dbPrefix]css order by name";
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-	while (($row = mysql_fetch_assoc($cursor))) {
+    $rows = jBlog_db_query($query);
+	foreach ($rows as $row) {
 		$names[$row['cssid']] = $row['name'];
 	}
     return $names;
@@ -1489,9 +1463,7 @@
     	$query = "SELECT * from $jBlog[dbPrefix]css where name = '$name'";
 	}
 
-    $cursor = mysql_db_query($jBlog['dbName'], $query);
-    $row = mysql_fetch_assoc($cursor);
-    return $row;
+    return jBlog_db_query($query, true);
 }
 
 function jBlog_emit_htmlarea_code($item)
@@ -1522,11 +1494,13 @@
         return;
     }
     $query = "UPDATE $jBlog[dbPrefix]entries set categoryid = $categories[0] where id = $postid";
-    mysql_db_query($jBlog['dbName'], $query);
+    $err = jBlog_db_query($query);
+
+	/* TODO: nuke this */
     $fp = fopen("/tmp/a", "w");
     fwrite($fp,$query);
-    if(mysql_error()) {
-        fwrite($fp, mysql_error());
+    if(is_string($err)) {
+        fwrite($fp, $err);
     }
     fclose($fp);
 }

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.59,1.60

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
remove wierd entry formatting... hopefully display problems will go away


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- jBlog_functions.inc.php	13 Mar 2003 06:27:35 -0000	1.59
+++ jBlog_functions.inc.php	13 Mar 2003 06:58:27 -0000	1.60
@@ -277,9 +277,8 @@
 			echo "<div class='jBlog_entry'>";
             echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
 			if ($extended && strlen($entry['extended'])) {
-                echo '<a name="#extended">';
+                echo '<a name="#extended"></a>';
                 echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['extended'])));
-                echo '</a>';
 			} 
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='jBlog_time'><a href=\""

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.58,1.59

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fixed for disapeering authors


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- jBlog_functions.inc.php	13 Mar 2003 04:18:26 -0000	1.58
+++ jBlog_functions.inc.php	13 Mar 2003 06:27:35 -0000	1.59
@@ -189,7 +189,7 @@
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT e.*, 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.*, 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 e.authorid = c.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
     if (!$ret) {

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

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
sterling points outt this is much better


Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog-xmlrpc.php	13 Mar 2003 05:50:12 -0000	1.7
+++ jBlog-xmlrpc.php	13 Mar 2003 06:03:50 -0000	1.8
@@ -290,10 +290,10 @@
     if(!jBlog_authenticate_author($username, $password)) {
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
-    $fp = fopen($struct['name'], "w");
+    $fp = fopen($jBlog["jBlogPath"].$jBlog['uploadPath'].$struct['name'], "w");
     fwrite($fp, $struct['bits']);
     fclose($fp);
-    $path = $jBlog["baseURL"].$struct['name'];
+    $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'));
 }
 /*

[php-blog-cvs] jBlog jBlog-xmlrpc.php,1.6,1.7

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
added support for metaweblog.newMediaObject



Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog-xmlrpc.php	13 Mar 2003 03:35:59 -0000	1.6
+++ jBlog-xmlrpc.php	13 Mar 2003 05:50:12 -0000	1.7
@@ -25,6 +25,8 @@
                         array('function' => 'metaWeblog_setPostCategories'),
                     'metaWeblog.getPostCategories' =>
                         array('function' => 'metaWeblog_getPostCategories'),
+                    'metaWeblog.newMediaObject' =>
+                        array('function' => 'metaWeblog_newMediaObject'),
                     'mt.supportedTextFilters' =>
                         array('function' => 'mt_supportedTextFilters'));
 
@@ -272,6 +274,27 @@
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
+}
+
+function metaWeblog_newMediaObject($message)
+{
+    global $jBlog;
+    $val = $message->params[0];
+    $postid = $val->getval(); 
+    $val = $message->params[1];
+    $username = $val->getval();
+    $val = $message->params[2];
+    $password = $val->getval();
+    $val = $message->params[3];
+    $struct = $val->getval();
+    if(!jBlog_authenticate_author($username, $password)) {
+        return new XML_RPC_Response('', 4, "Authentication Failed");
+    }
+    $fp = fopen($struct['name'], "w");
+    fwrite($fp, $struct['bits']);
+    fclose($fp);
+    $path = $jBlog["baseURL"].$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");

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.57,1.58

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
small query fix


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- jBlog_functions.inc.php	13 Mar 2003 03:35:59 -0000	1.57
+++ jBlog_functions.inc.php	13 Mar 2003 04:18:26 -0000	1.58
@@ -189,7 +189,7 @@
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT * 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.*, 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 .
              "ORDER BY timestamp DESC $limit";
     $ret = jBlog_db_query($query);
     if (!$ret) {