php-blog-cvs — Serendipity commit list

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.9,1.10 jBlog_layout.php,1.3,1.4

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

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

Modified Files:
	jBlog_functions.inc.php jBlog_layout.php 
Log Message:
dont store extended entries if we dont use them


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jBlog_functions.inc.php	4 Mar 2003 22:37:25 -0000	1.9
+++ jBlog_functions.inc.php	4 Mar 2003 22:49:50 -0000	1.10
@@ -259,7 +259,7 @@
 			echo $entries[$x]["title"];
 			echo "</span>";
 			echo "<div class='jBlog_entry'>";
-            if($extended) {
+            if($extended && strlen($entries[$x]["extended"])) {
                 echo nl2br(jBlog_emoticate(jBlog_markup_text($entries[$x]["extended"])));
             } else {
                 echo nl2br(jBlog_emoticate(jBlog_markup_text($entries[$x]["body"])));
@@ -683,12 +683,8 @@
 
 	if (!is_numeric($entry["id"])) $entry["id"] = "NULL";
     if (!is_numeric($entry["timestamp"])) $entry["timestamp"] = time();
-    if(!preg_match("/\S/", $entry["extended"])) {
-        $entry["extended"] = $entry["body"];
-    } else {
-        if($entry["extended"] !== $entry["body"]) {
-            $exflag = 1;
-        }
+    if(strlen($entry["extended"])) {
+        $exflag = 1;
     }
     $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
                     (id, title, timestamp, body, extended, comments, exflag, author, authorid)

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_layout.php	4 Mar 2003 00:43:58 -0000	1.3
+++ jBlog_layout.php	4 Mar 2003 22:49:51 -0000	1.4
@@ -107,7 +107,8 @@
             ?>
             <a href='?jBlog[action]=archives'>Older...</a><p>
             <b>Superuser:</b><br>
-            <a href="<?=$jBlog['jBlogHTTPPath']?>jBlog_admin.php">$ su -</a>
+            <a href="<?=$jBlog['jBlogHTTPPath']?>jBlog_admin.php">$ su -</a><p>
+            This blog powered by <a href="http://sourceforge.net/projects/php-blog">jBlog</a>!
         </td>
     </tr>
 </table>

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.3,1.4 jBlog_functions.inc.php,1.8,1.9

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

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_functions.inc.php 
Log Message:
don't store passwords in plain text.


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_admin_installer.inc.php	4 Mar 2003 22:19:30 -0000	1.3
+++ jBlog_admin_installer.inc.php	4 Mar 2003 22:37:25 -0000	1.4
@@ -240,6 +240,7 @@
                     }
                     echo "<p>Welcome to jBlog!</b><p>";
                     echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["jBlogHTTPPath"]."'>check out your blog</a>";
+                    session_destroy();
                 }
             }
         }

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog_functions.inc.php	4 Mar 2003 22:26:45 -0000	1.8
+++ jBlog_functions.inc.php	4 Mar 2003 22:37:25 -0000	1.9
@@ -925,7 +925,7 @@
                 $jBlog[dbPrefix]authors
               WHERE
                 username = '$username'
-              AND password = '$password'";
+              AND password = PASSWORD('$password')";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     if(!$cursor) {
         print mysql_error();

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

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fix entry insertion..


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_functions.inc.php	4 Mar 2003 22:18:21 -0000	1.7
+++ jBlog_functions.inc.php	4 Mar 2003 22:26:45 -0000	1.8
@@ -698,9 +698,9 @@
                     ".$entry["timestamp"].",
 					'".mysql_escape_string($entry["body"])."', 
 					'".mysql_escape_string($entry["extended"])."', 
-                    0, $exflag,
+                    '0', '$exflag',
                     '".mysql_escape_string($jBlog["user"])."',
-                    $jBlog[authorid])";
+                    '$jBlog[authorid]')";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
     if ($entry['id'] == "NULL") {
         $newEntry = 1;

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.2,1.3

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

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

Modified Files:
	jBlog_admin_installer.inc.php 
Log Message:
remove var_dumps


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_admin_installer.inc.php	4 Mar 2003 22:18:21 -0000	1.2
+++ jBlog_admin_installer.inc.php	4 Mar 2003 22:19:30 -0000	1.3
@@ -234,10 +234,8 @@
                 	echo "Attempting to setup Database...<br>";
                     @mysql_select_db($_POST["dbName"]);
                     $queries = jBlog_parse_sql_tables('./db.sql');
-                    var_dump($queries);
                     $queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
                     foreach ($queries as $query) {
-                        var_dump($query);
                         mysql_query($query);
                     }
                     echo "<p>Welcome to jBlog!</b><p>";

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.6,1.7

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

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_functions.inc.php 
Log Message:
make the sql parser more robust.


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_admin_installer.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_admin_installer.inc.php	4 Mar 2003 22:18:21 -0000	1.2
@@ -118,6 +118,33 @@
     echo "</form>";
 }
 
+function jBlog_parse_sql_tables($filename) {
+    $in_table = 0;
+    $queries = array();
+
+    $fp = fopen($filename, 'r');
+    while (!@feof($fp)) {
+        $line = trim(fgets($fp));
+        var_dump($line);
+        if ($in_table) {
+            $def .= $line;
+            if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
+                $in_table = 0;
+                array_push($queries, $def);
+            }
+        } else {
+            if (preg_match('#^create table \{PREFIX\}\S+\s*\(#i', $line)) {
+                $in_table = 1;
+                $def = $line;
+            }
+        }
+    }
+    fclose($fp);
+
+    return $queries;
+}
+
+
 switch ($_POST["installAction"]) {
 
 	case "check":
@@ -206,21 +233,12 @@
                 	// Create tables
                 	echo "Attempting to setup Database...<br>";
                     @mysql_select_db($_POST["dbName"]);
-                    $q = file("./db.sql");
-					for ($x=0; $x<count($q); $x++) {
-						$q[$x] = str_replace("{PREFIX}", $_POST["dbPrefix"], $q[$x]);
-						$query = @mysql_query($q[$x]);
-                        $e = @mysql_error();
-                        if ($e!="") $errs[] = $e;
-                        echo "Running <i>".$q[$x]."</i>$e<br>";
-                    }
-                    if (is_array($errs)) {
-						echo "<font color='#ff0000'>Error!<br>";
-						echo "The following errors occured trying to set up the tables:<br>";
-                        echo implode("<br>", $errs);
-                        echo "<p>Set up the queries manually by running the following queries:<br><i>";
-                        echo implode("<br>", $q);
-                        echo "<i></font>";
+                    $queries = jBlog_parse_sql_tables('./db.sql');
+                    var_dump($queries);
+                    $queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
+                    foreach ($queries as $query) {
+                        var_dump($query);
+                        mysql_query($query);
                     }
                     echo "<p>Welcome to jBlog!</b><p>";
                     echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["jBlogHTTPPath"]."'>check out your blog</a>";

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_functions.inc.php	4 Mar 2003 21:09:22 -0000	1.6
+++ jBlog_functions.inc.php	4 Mar 2003 22:18:21 -0000	1.7
@@ -940,6 +940,6 @@
     return 0;
 }
 
-    define("JBLOG_FUNCTIONS_LOADED", true);
+define("JBLOG_FUNCTIONS_LOADED", true);
 ?>
 

[php-blog-cvs] jBlog jBlog_admin.php,1.5,1.6

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

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

Modified Files:
	jBlog_admin.php 
Log Message:
fix installer


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_admin.php	4 Mar 2003 21:09:22 -0000	1.5
+++ jBlog_admin.php	4 Mar 2003 21:41:42 -0000	1.6
@@ -1,11 +1,13 @@
 <?php
 
 session_start();
-if (file_exists("./jBlog_config_local.inc.php"))
- include("jBlog_config.inc.php");
-
+if (file_exists("./jBlog_config_local.inc.php")) {
+    include("jBlog_config.inc.php");
+} else {
+    $_SESSION['jBlogAuthedUser'] = true;
+}
 // User logs in?
-if(jBlog_authenticate_author($jBlog["POST"]["user"], $jBlog["POST"]["pass"])) {
+if($_SESSION['jBlogAuthedUser'] || jBlog_authenticate_author($jBlog["POST"]["user"], $jBlog["POST"]["pass"])) {
 	$_SESSION["jBlogAuthedUser"] = true;
 }
 ?>

[php-blog-cvs] jBlog comment.php,1.2,1.3 db.sql,1.3,1.4 jBlog_admin.php,1.4,1.5 jBlog_config.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.5,1.6

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

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

Modified Files:
	comment.php db.sql jBlog_admin.php jBlog_config.inc.php 
	jBlog_functions.inc.php 
Log Message:
fixed remembering authors to my liking :)
added mailing of comments



Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- comment.php	1 Mar 2003 20:49:29 -0000	1.2
+++ comment.php	4 Mar 2003 21:09:20 -0000	1.3
@@ -95,8 +95,12 @@
 <?php jBlog_displayCommentForm($id);
 } else {
     $remember = 0;
-    if ($jBlog['POST']['remember'] == "on") {
+    if ($jBlog['POST']['remember']) {
         $remember = 1;
+        $_SESSION['jBlogName'] = $jBlog['POST']['name'];
+        $_SESSION['jBlogEmail'] = $jBlog['POST']['email'];
+        $_SESSION['jBlogUrl']  = $jBlog['POST']['url'];
+        $_SESSION['jBlog_remember'] = "checked";
     }
 
     $comment['url'] = $jBlog['POST']['url'];
@@ -104,7 +108,7 @@
     $comment['name'] = $jBlog['POST']['name'];
     $comment['email'] = $jBlog['POST']['email'];
 
-    jBlog_saveComment($jBlog['POST']['entry_id'], $comment, 'NORMAL', $remember);
+    jBlog_saveComment($jBlog['POST']['entry_id'], $comment, 'NORMAL');
 ?>
 Your comment was successfully added.  Click <a href="<?=$PHP_SELF?>?jBlog[entry_id]=<?=$jBlog['POST']['entry_id']?>">here</a> to return to
 the comments, and <a href="#" onClick="self.close()">here</a> to close this window.

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db.sql	4 Mar 2003 01:41:25 -0000	1.3
+++ db.sql	4 Mar 2003 21:09:21 -0000	1.4
@@ -1,4 +1,62 @@
-CREATE TABLE {PREFIX}entries (id int(10) unsigned NOT NULL auto_increment, title varchar(200) default NULL, timestamp int(10) unsigned default NULL, body text, comments int (4) unsigned default 0, extended text, exflag int(1), PRIMARY KEY  (id), FULLTEXT (title,body,extended)) TYPE=MyISAM
-CREATE TABLE {PREFIX}comments (id int(10) unsigned NOT NULL auto_increment,  entry_id int(10) unsigned NOT NULL,  timestamp int(10) unsigned default NULL,  title VARCHAR(150),  author VARCHAR(80),  email VARCHAR(200),  url VARCHAR(200),  ip VARCHAR(15),   body text,  type enum ('TRACKBACK', 'REGULAR'),  PRIMARY KEY (id),   FULLTEXT (body))
-CREATE TABLE {PREFIX}references (    id int(10) unsigned not null auto_increment,    entry_id int(10) unsigned not null,    link text,    name text,    PRIMARY KEY(id))
-CREATE TABLE {PREFIX}authors ( name varchar(20), password varchar(20))
+#
+# Table structure for table '{PREFIX}authors'
+#
+
+create table {PREFIX}authors (
+  username varchar(20) default null,
+  password varchar(20) default null,
+  authorid int(11) not null auto_increment,
+  mail_comments int(1) default '1',
+  mail_trackbacks int(1) default '1',
+  email varchar(128) not null default '',
+  primary key  (authorid)
+) type=myisam;
+
+#
+# table structure for table '{PREFIX}comments'
+#
+
+create table {PREFIX}comments (
+  id int(10) unsigned not null auto_increment,
+  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 enum('trackback','regular') default null,
+  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,
+  title varchar(200) default null,
+  timestamp int(10) unsigned default null,
+  body text,
+  comments int(4) unsigned default '0',
+  extended text,
+  exflag int(1) default null,
+  author varchar(20) default null,
+  authorid int(11) default null,
+  primary key  (id),
+  fulltext key title (title,body)
+) type=myisam;
+
+#
+# table structure for table '{PREFIX}references'
+#
+
+create table {PREFIX}references (
+  id int(10) unsigned not null auto_increment,
+  entry_id int(10) unsigned not null default '0',
+  link text,
+  name text,
+  primary key  (id)
+) type=myisam;

Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_admin.php	4 Mar 2003 01:41:25 -0000	1.4
+++ jBlog_admin.php	4 Mar 2003 21:09:22 -0000	1.5
@@ -1,17 +1,12 @@
 <?php
 
 session_start();
-
 if (file_exists("./jBlog_config_local.inc.php"))
  include("jBlog_config.inc.php");
 
 // User logs in?
-if ($_SESSION["jBlogAuthedUser"] == true) {
-    $jBlog["user"] = $_SESSION["jBlogUser"];
-}
-else if(jBlog_authenticate_author($jBlog["POST"]["user"],$jBlog["POST"]["pass"])) {
+if(jBlog_authenticate_author($jBlog["POST"]["user"], $jBlog["POST"]["pass"])) {
 	$_SESSION["jBlogAuthedUser"] = true;
-	$jBlog["user"] = $_SESSION["jBlogUser"] = $jBlog["POST"]["user"];
 }
 ?>
 <html>

Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_config.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_config.inc.php	4 Mar 2003 21:09:22 -0000	1.2
@@ -69,5 +69,6 @@
 
 // Some stuff...
 if (!$_SESSION["jBlogAuthedUser"]) $_SESSION["jBlogAuthedUser"] = false;
-
+$jBlog["user"] = $_SESSION["jBlogUser"];
+$jBlog["email"] = $_SESSION["jBlogEmail"];
 ?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_functions.inc.php	4 Mar 2003 01:41:25 -0000	1.5
+++ jBlog_functions.inc.php	4 Mar 2003 21:09:22 -0000	1.6
@@ -13,14 +13,15 @@
 
 $jBlog["imageList"] = array();
 $commentsFields = array(
-    "Name" => "<input type=\"text\" name=\"jBlog[name]\" value=\"{$_SESSION['jBlog_name']}\" size=\"30\" />",
-    "Email" => "<input type=\"text\" name=\"jBlog[email]\" value=\"{$_SESSION['jBlog_email']}\" />",
-    "Homepage" => "<input type=\"text\" name=\"jBlog[url]\" value=\"{$_SESSION['jBlog_url']}\" />",
+    "Name" => "<input type=\"text\" name=\"jBlog[name]\" value=\"{$_SESSION['jBlogName']}\" size=\"30\" />",
+    "Email" => "<input type=\"text\" name=\"jBlog[email]\" value=\"{$_SESSION['jBlogEmail']}\" />",
+    "Homepage" => "<input type=\"text\" name=\"jBlog[url]\" value=\"{$_SESSION['jBlogUrl']}\" />",
     "Comment" => '<textarea rows="10" cols="40" name="jBlog[comment]"></textarea>'
 );
 
 function jBlog_displayCommentForm($id) {
     global $jBlog, $commentsFields;
+    global $_SESSION;
 ?>
 <form name="comment" action="<?=$jBlog['jBlogHTTPPath']?>comment.php" method="post">
 <input type="hidden" name="jBlog[entry_id]" value="<?=$id?>" />
@@ -314,7 +315,7 @@
 {
     global $jBlog;
 
-    $query = "SELECT id,type,timestamp,author,email,url,body FROM {$jBlog['dbPrefix']}comments WHERE entry_id=$id";
+    $query = "SELECT * FROM {$jBlog['dbPrefix']}comments WHERE entry_id=$id";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }
@@ -357,7 +358,7 @@
     print '</table>';
 }
 
-function jBlog_saveComment($id, $commentInfo, $type='NORMAL', $remember=1) {
+function jBlog_saveComment($id, $commentInfo, $type='NORMAL') {
     global $jBlog;
 
     $title = mysql_escape_string($commentInfo['title']);
@@ -366,18 +367,6 @@
     $url = mysql_escape_string($commentInfo['url']);
     $email = mysql_escape_string($commentInfo['email']);   
 
-    if ($remember) {
-        $_SESSION['jBlog_name'] = $name;
-        $_SESSION['jBlog_url'] = $url;
-        $_SESSION['jBlog_email'] = $email;
-        $_SESSION['jBlog_remember'] = "checked";
-    } else {
-        $_SESSION['jBlog_name'] = null;
-        $_SESSION['jBlog_url'] = null;
-        $_SESSION['jBlog_email'] = null;
-        $_SESSION['jBlog_remember'] = null;
-    }
-
     $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')";
@@ -387,9 +376,42 @@
     $query = "UPDATE {$jBlog['dbPrefix']}entries SET comments=comments+1 WHERE id=$id";
     mysql_db_query($jBlog['dbName'], $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);
+    if($row['mail_comments']) {
+        jBlog_sendComment($row['email'], $name, $email, $url, $id, 
+                          $row['title'], $comments);
+    }
     jBlog_purgeEntry($id, $t);
 }
 
+function jBlog_sendComment($to, $fromName, $fromEmail, $fromUrl, $id, $title, $comment) {
+    global $jBlog;
+    $text = "
+A new comment has been posted on your blog $jBlog[blogTitle], on entry #$id.
+
+IP Address: $_SERVER[REMOTE_ADDR]
+Name: $fromName
+Email Address: $fromEmail
+URL: $fromUrl
+
+Comments:
+
+$comment
+
+--
+Powered by jBlog.
+My blog runs on PHP.  Yours can too.
+http://jblog.sourceforge.net to find out how.";
+mail($to, "[$jBlog[blogTitle]] New comment posted to $title",  $text,
+     "From: $fromName <$fromEmail>\r\n");
+     
+}
+
 function jBlog_fetchReferences($id)
 {
     global $jBlog;
@@ -669,7 +691,7 @@
         }
     }
     $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
-                    (id, title, timestamp, body, extended, comments, exflag, author)
+                    (id, title, timestamp, body, extended, comments, exflag, author, authorid)
                     VALUES (
                     ".$entry["id"].",
                     '".mysql_escape_string($entry["title"])."',
@@ -677,7 +699,8 @@
 					'".mysql_escape_string($entry["body"])."', 
 					'".mysql_escape_string($entry["extended"])."', 
                     0, $exflag,
-                    '".mysql_escape_string($jBlog["user"])."')";
+                    '".mysql_escape_string($jBlog["user"])."',
+                    $jBlog[authorid])";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
     if ($entry['id'] == "NULL") {
         $newEntry = 1;
@@ -888,8 +911,16 @@
 
 function jBlog_authenticate_author($username, $password) {
     global $jBlog;
+    global $_SESSION;
+
+    if($_SESSION['jBlogAuthedUser'] == true) {
+        $jBlog['jBlogUser'] = $_SESSION['jBlogUser'];
+        $jBlog['jBlogEmail'] = $_SESSION['jBlogEmail'];
+        $jBlog['authorid'] = $_SESSION['jBlogAuthorid'];
+        return 1;
+    }
     $query = "SELECT 
-                count(1)
+                *
               FROM
                 $jBlog[dbPrefix]authors
               WHERE
@@ -899,8 +930,14 @@
     if(!$cursor) {
         print mysql_error();
     }
-    $row = mysql_fetch_row($cursor);
-    return $row[0];
+    $row = mysql_fetch_assoc($cursor);
+    if($row) {
+        $_SESSION['jBlogUser'] = $jBlog['jBlogUser'] = $username;
+        $_SESSION['jBlogEmail'] = $jBlog['jBlogEmail'] = $row['email'];
+        $_SESSION['jBlogAuthorid'] = $jBlog['authorid']  = $row['authorid'];
+        return 1;
+    }
+    return 0;
 }
 
     define("JBLOG_FUNCTIONS_LOADED", true);

[php-blog-cvs] jBlog db.sql,1.2,1.3 jBlog_admin.php,1.3,1.4 jBlog_admin_overview.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.4,1.5

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

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

Modified Files:
	db.sql jBlog_admin.php jBlog_admin_overview.inc.php 
	jBlog_functions.inc.php 
Log Message:
added multiple author support

This is currently not supported by the install script.  To add authors 
(including the original author) you need to

insert into {PREFIX}authors VALUES('name', 'pass');

This is all done through sessions currently.  Probably could be better.


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db.sql	4 Mar 2003 00:43:58 -0000	1.2
+++ db.sql	4 Mar 2003 01:41:25 -0000	1.3
@@ -1,3 +1,4 @@
 CREATE TABLE {PREFIX}entries (id int(10) unsigned NOT NULL auto_increment, title varchar(200) default NULL, timestamp int(10) unsigned default NULL, body text, comments int (4) unsigned default 0, extended text, exflag int(1), PRIMARY KEY  (id), FULLTEXT (title,body,extended)) TYPE=MyISAM
 CREATE TABLE {PREFIX}comments (id int(10) unsigned NOT NULL auto_increment,  entry_id int(10) unsigned NOT NULL,  timestamp int(10) unsigned default NULL,  title VARCHAR(150),  author VARCHAR(80),  email VARCHAR(200),  url VARCHAR(200),  ip VARCHAR(15),   body text,  type enum ('TRACKBACK', 'REGULAR'),  PRIMARY KEY (id),   FULLTEXT (body))
 CREATE TABLE {PREFIX}references (    id int(10) unsigned not null auto_increment,    entry_id int(10) unsigned not null,    link text,    name text,    PRIMARY KEY(id))
+CREATE TABLE {PREFIX}authors ( name varchar(20), password varchar(20))

Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_admin.php	3 Mar 2003 19:41:49 -0000	1.3
+++ jBlog_admin.php	4 Mar 2003 01:41:25 -0000	1.4
@@ -6,21 +6,13 @@
  include("jBlog_config.inc.php");
 
 // User logs in?
-if (strtolower($jBlog["POST"]["user"]) == strtolower($jBlog["user"])
- && $jBlog["POST"]["pass"] == $jBlog["pass"]) {
+if ($_SESSION["jBlogAuthedUser"] == true) {
+    $jBlog["user"] = $_SESSION["jBlogUser"];
+}
+else if(jBlog_authenticate_author($jBlog["POST"]["user"],$jBlog["POST"]["pass"])) {
 	$_SESSION["jBlogAuthedUser"] = true;
-
+	$jBlog["user"] = $_SESSION["jBlogUser"] = $jBlog["POST"]["user"];
 }
-
-// Does user want to set a cookie?
-/* $cookie = @explode("22121979", base64_decode($_COOKIES["jBlogUser"])); */
-/*if ($jBlog["POST"]["user"]==$jBlog["user"]
-  &&$jBlog["POST"]["pass"]==$jBlog["pass"]) {
-  $_COOKIES["jBlogUser"] = base64_encode($jBlog["POST"]["user"]."22121979".$jBlog["POST"]["pass"]);
-  @setCookie("jBlogUser",   base64_encode($jBlog["POST"]["user"]."22121979".$jBlog["POST"]["pass"]),
-            time()+86400*9999);
-
-}*/
 ?>
 <html>
 	<head>

Index: jBlog_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_overview.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_admin_overview.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_admin_overview.inc.php	4 Mar 2003 01:41:25 -0000	1.2
@@ -10,6 +10,6 @@
 ##########################################################################
 
 if (IN_JBLOG !== true) die ("Don't hack!");
-
+session_start();
 ?>
-This is just raw functionality, no design yet. Don't be scared :)
+Welcome back, <?= $_SESSION['jBlogUser'] ?>.  Would you like to play a game?

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_functions.inc.php	4 Mar 2003 01:22:21 -0000	1.4
+++ jBlog_functions.inc.php	4 Mar 2003 01:41:25 -0000	1.5
@@ -182,13 +182,17 @@
     }
 
     while($row = mysql_fetch_assoc($cursor)) {
-		$ret[] = array("id"        => $row['id'],
+		$ret[] = $row;
+/*
+                 array("id"        => $row['id'],
         			   "timestamp" => $row['timestamp'],
                        "comments"  => $row['comments'],
                        "title"     => $row['title'],
                        "body"     => $row['body'],
                        "extended"      => $row['extended'],
+                       "author"      => $row['author'],
                        "exflag"      => $row['exflag']);
+*/
     }
 
     return $ret;
@@ -220,13 +224,16 @@
     $querystring = "SELECT id, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
                     WHERE MATCH (title, extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
-    while($row = mysql_fetch_row($query)) {
-		$ret[] = array("id"        => $row[0],
+    while($row = mysql_fetch_assoc($query)) {
+		$ret[] = $row;
+/*
+                 array("id"        => $row[0],
         			   "timestamp" => $row[1],
                        "comments"  => $row[2],
                        "title"     => $row[3],
                        "body"      => $row[4],
                        "extended"  => $row[5]);
+*/
     }
 
     return $ret;
@@ -264,7 +271,7 @@
             <?php        
             }
             echo "<div class='jBlog_time'><br>";
-            echo "<a href=\"{$jBlog['jBlogHTTPPath']}archives/e_{$entries[$x]['id']}.html\">Posted by ".$jBlog["user"]." at ";
+            echo "<a href=\"{$jBlog['jBlogHTTPPath']}archives/e_{$entries[$x]['id']}.html\">Posted by ".$entries[$x]["author"]." at ";
             echo date("H:i", $entries[$x]["timestamp"]);
             echo "</a>";
             if ($j != 1) {
@@ -662,14 +669,15 @@
         }
     }
     $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
-                    (id, title, timestamp, body, extended, comments, exflag)
+                    (id, title, timestamp, body, extended, comments, exflag, author)
                     VALUES (
                     ".$entry["id"].",
                     '".mysql_escape_string($entry["title"])."',
                     ".$entry["timestamp"].",
 					'".mysql_escape_string($entry["body"])."', 
 					'".mysql_escape_string($entry["extended"])."', 
-                    0, $exflag)";
+                    0, $exflag,
+                    '".mysql_escape_string($jBlog["user"])."')";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
     if ($entry['id'] == "NULL") {
         $newEntry = 1;
@@ -876,6 +884,23 @@
             </form>
     	</table>
     <?php
+}
+
+function jBlog_authenticate_author($username, $password) {
+    global $jBlog;
+    $query = "SELECT 
+                count(1)
+              FROM
+                $jBlog[dbPrefix]authors
+              WHERE
+                username = '$username'
+              AND password = '$password'";
+    $cursor = mysql_db_query($jBlog['dbName'], $query);
+    if(!$cursor) {
+        print mysql_error();
+    }
+    $row = mysql_fetch_row($cursor);
+    return $row[0];
 }
 
     define("JBLOG_FUNCTIONS_LOADED", true);

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

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
calendar fix, no slash required


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_functions.inc.php	4 Mar 2003 00:43:58 -0000	1.3
+++ jBlog_functions.inc.php	4 Mar 2003 01:22:21 -0000	1.4
@@ -101,7 +101,7 @@
 <a href='<?= $link ?>'><?= $jBlog["months"][$month]." '".substr($year, 2) ?></a>
 </nobr></B></TD>
 <TD ALIGN='right'>
-    <A HREF='<?= $jBlog['jBlogHTTPPath'] ?>/index.php?jBlog[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
+    <A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
         <IMG SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/forward.png' BORDER='0'>
     </A>
 </TD>

[php-blog-cvs] jBlog db.sql,1.1.1.1,1.2 htaccess.tpl,1.1.1.1,1.2 index.php,1.3,1.4 jBlog.css,1.1.1.1,1.2 jBlog_admin_entries.inc.php,1.1.1.1,1.2 jBlog_functions.inc.php,1.2,1.3 jBlog_genpage.php,1.1.1.1,1.2 jBlog_layout.php,1.2,1.3

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

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

Modified Files:
	db.sql htaccess.tpl index.php jBlog.css 
	jBlog_admin_entries.inc.php jBlog_functions.inc.php 
	jBlog_genpage.php jBlog_layout.php 
Log Message:
added support for 'extended entries'
some code cleanup
some aesthetic changes to titles


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- db.sql	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ db.sql	4 Mar 2003 00:43:58 -0000	1.2
@@ -1,3 +1,3 @@
-CREATE TABLE {PREFIX}entries (id int(10) unsigned NOT NULL auto_increment, title varchar(200) default NULL, timestamp int(10) unsigned default NULL, body text, comments int (4) unsigned default 0, PRIMARY KEY  (id), FULLTEXT (title,body)) TYPE=MyISAM
+CREATE TABLE {PREFIX}entries (id int(10) unsigned NOT NULL auto_increment, title varchar(200) default NULL, timestamp int(10) unsigned default NULL, body text, comments int (4) unsigned default 0, extended text, exflag int(1), PRIMARY KEY  (id), FULLTEXT (title,body,extended)) TYPE=MyISAM
 CREATE TABLE {PREFIX}comments (id int(10) unsigned NOT NULL auto_increment,  entry_id int(10) unsigned NOT NULL,  timestamp int(10) unsigned default NULL,  title VARCHAR(150),  author VARCHAR(80),  email VARCHAR(200),  url VARCHAR(200),  ip VARCHAR(15),   body text,  type enum ('TRACKBACK', 'REGULAR'),  PRIMARY KEY (id),   FULLTEXT (body))
 CREATE TABLE {PREFIX}references (    id int(10) unsigned not null auto_increment,    entry_id int(10) unsigned not null,    link text,    name text,    PRIMARY KEY(id))

Index: htaccess.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/htaccess.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- htaccess.tpl	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ htaccess.tpl	4 Mar 2003 00:43:58 -0000	1.2
@@ -1 +1 @@
-ErrorDocument 404 {PREFIX}index.php
+ErrorDocument 404 /index.php

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- index.php	1 Mar 2003 20:49:29 -0000	1.3
+++ index.php	4 Mar 2003 00:43:58 -0000	1.4
@@ -15,7 +15,7 @@
             $date = date("d/m/Y", strtotime($range));
         }
 
-        $jBlog['blogTitle'] = $jBlog['blogTitle'] . ": Entries for $date";
+        $jBlog['blogSubTitle'] = "Entries for $date";
         ob_start();
         include_once("jBlog_genpage.php");
         $data = ob_get_contents();
@@ -38,7 +38,7 @@
         $title = mysql_fetch_row($cursor);
         $title = $title[0];
         
-        $jBlog['blogTitle'] = $jBlog['blogTitle'] . ": $title";
+        $jBlog['blogSubTitle'] = $title;
 
         ob_start();
         include_once("jBlog_genpage.php");

Index: jBlog.css
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog.css	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ jBlog.css	4 Mar 2003 00:43:58 -0000	1.2
@@ -2,6 +2,20 @@
 	background: #d4dce8;
 }
 
+.jBlog_banner {
+	font-size: 30px;
+	color: #1a3c5a;
+	border: 0px;
+	padding-left: 5px;
+}
+
+.jBlog_subbanner {
+	font-size: 20px;
+	color: #1a3c5a;
+	border: 0px;
+	padding-left: 5px;
+}
+
 .jBlog_title {
 	font-size: 20px;
 	color: #1a3c5a;

Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_admin_entries.inc.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_admin_entries.inc.php	4 Mar 2003 00:43:58 -0000	1.2
@@ -39,23 +39,23 @@
 
     // Print the entries
 	for ($x=0; $x<$half; $x++) {
-		echo "<tr>";
-		echo "<td>";
-        echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": ";
-		echo "<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=$action";
-        echo "&jBlog[id]=".$entries[$x]["id"]."'>";
-        echo htmlentities(substr($entries[$x]["title"],0,40))."</a>";
-        echo "</a>";
-		echo "</td>";
-        echo "<td>".str_repeat("&nbsp;", 7)."</td>";
-		echo "<td>";
-        echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": ";
-		echo "<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=$action";
-        echo "&jBlog[id]=".$entries[$x+$half]["id"]."'>";
-        echo htmlentities(substr($entries[$x+$half]["title"],0,40))."</a>";
-        echo "</a>";
-		echo "</td>";
-        echo "</tr>";
+        ?>
+		<tr>
+		<td>
+        <?= date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ?>
+		<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=<?= $action ?>&jBlog[id]=<?= $entries[$x]["id"] ?>'>
+        <?= htmlentities(substr($entries[$x]["title"],0,40)) ?></a>
+        </a>
+		</td>
+        <td><?= str_repeat("&nbsp;", 7)?></td>
+		<td>
+        <?= date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "?>
+		<br><a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=<?= $action ?>&jBlog[id]=<?= $entries[$x+$half]["id"] ?>'>
+        <?= htmlentities(substr($entries[$x+$half]["title"],0,40)) ?></a>
+        </a>
+		</td>
+        </tr>
+<?php         
     }
     echo "</table>";
 }
@@ -67,7 +67,8 @@
     	$entry = array("id" => $jBlog["POST"]["id"],
   						              "title"=>$jBlog["POST"]["title"],
                                       "timestamp" => $jBlog["POST"]["timestamp"],
-        		  		              "body" =>$jBlog["POST"]["body"]);
+        		  		              "body" =>$jBlog["POST"]["body"],
+                                      "extended" => $jBlog["POST"]["extended"]);
 		$res = jBlog_updertEntry($entry);
         if ($res != "")
 			jBlog_printEntryForm("?", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "entries",

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_functions.inc.php	1 Mar 2003 19:34:35 -0000	1.2
+++ jBlog_functions.inc.php	4 Mar 2003 00:43:58 -0000	1.3
@@ -85,19 +85,30 @@
         }
 
         // Prepare the table
-        print ("<TABLE CLASS='jBlog_calendar' CELLSPACING=0>");
-        print ("<TR>");
-        print ("<TD ALIGN='left'><A HREF='{$jBlog['jBlogHTTPPath']}index.php?jBlog[calendarZoom]=$previousYear".sprintf("%02d",$previousMonth)."'><IMG SRC='".$jBlog["jBlogHTTPPath"]."pixel/back.png' BORDER='0'></A></TD>");
-        print ("<TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='calendarHeader'><B><nobr>");
-		if ($jBlog["rewrite"]==true)
+?>
+<TABLE CLASS='jBlog_calendar' CELLSPACING=0>
+<TR>
+<TD ALIGN='left'><A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
+<TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='calendarHeader'><B><nobr>
+<?php
+		if ($jBlog["rewrite"]==true) {
         	$link = $jBlog["jBlogHTTPPath"]."archives/d_".$year.sprintf("%02d",$month).".html";
-        else
+        }
+        else {
         	$link = "fixme";
-        print ("<a href='$link'>".$jBlog["months"][$month]." '".substr($year, 2)."</a>");
-        print ("</nobr></B></TD>");
-        print ("<TD ALIGN='right'><A HREF='{$jBlog['jBlogHTTPPath']}/index.php?jBlog[calendarZoom]=$nextYear".sprintf("%02d",$nextMonth)."'><IMG SRC='".$jBlog["jBlogHTTPPath"]."pixel/forward.png' BORDER='0'></a></TD>");
-        print ("</TR>");
-        print ("<TR><TD CLASS='jBlog_weekDayName' ALIGN='center'>".implode("</TD><TD CLASS='jBlog_weekDayName' ALIGN='center'>", $jBlog["weekDayAbb"])."</TD>");
+        }
+?>
+<a href='<?= $link ?>'><?= $jBlog["months"][$month]." '".substr($year, 2) ?></a>
+</nobr></B></TD>
+<TD ALIGN='right'>
+    <A HREF='<?= $jBlog['jBlogHTTPPath'] ?>/index.php?jBlog[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
+        <IMG SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/forward.png' BORDER='0'>
+    </A>
+</TD>
+</TR>
+<TR><TD CLASS='jBlog_weekDayName' ALIGN='center'><?= implode("</TD><TD CLASS='jBlog_weekDayName' ALIGN='center'>", $jBlog["weekDayAbb"])?>
+</TD>
+<?php
 
         // Print the calendar
         $currDay = 1;
@@ -152,7 +163,7 @@
     $where = "";
 
     if ($full === true)
-        $body = ',body';
+        $body = ',body, extended';
 
     if (is_numeric($range)) {
         $where = "WHERE FROM_UNIXTIME(timestamp, '%Y%m%d') LIKE '$range%' ";
@@ -162,7 +173,7 @@
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT id,timestamp,comments,title{$body} FROM {$jBlog['dbPrefix']}entries " . $where .
+    $query = "SELECT * FROM {$jBlog['dbPrefix']}entries " . $where .
              "ORDER BY timestamp DESC $limit";
 
     $cursor = mysql_db_query($jBlog["dbName"], $query);
@@ -170,12 +181,14 @@
         die("Query failed: " . mysql_error() . "\n");
     }
 
-    while($row = mysql_fetch_row($cursor)) {
-		$ret[] = array("id"        => $row[0],
-        			   "timestamp" => $row[1],
-                       "comments"  => $row[2],
-                       "title"     => $row[3],
-                       "body"      => $row[4]);
+    while($row = mysql_fetch_assoc($cursor)) {
+		$ret[] = array("id"        => $row['id'],
+        			   "timestamp" => $row['timestamp'],
+                       "comments"  => $row['comments'],
+                       "title"     => $row['title'],
+                       "body"     => $row['body'],
+                       "extended"      => $row['extended'],
+                       "exflag"      => $row['exflag']);
     }
 
     return $ret;
@@ -187,12 +200,12 @@
 function jBlog_fetchEntry($key, $val, $full = true) {
 	global $jBlog;
 
-	if ($full === true) $body = ", body";
-    $querystring = "SELECT id, timestamp, comments, title$body FROM ".$jBlog["dbPrefix"]."entries
+	if ($full === true) $body = ", body, extended";
+    $querystring = "SELECT * FROM ".$jBlog["dbPrefix"]."entries
                     WHERE  $key LIKE $val  LIMIT 1";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
 
-    return mysql_fetch_array($query);
+    return mysql_fetch_assoc($query);
 }
 
 /**
@@ -204,15 +217,16 @@
 	if (strlen($term)<4)
     	return false;
 
-    $querystring = "SELECT id, timestamp, comments, title, body FROM ".$jBlog["dbPrefix"]."entries
-                    WHERE MATCH (title, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
+    $querystring = "SELECT id, timestamp, comments, title, body, extended FROM ".$jBlog["dbPrefix"]."entries
+                    WHERE MATCH (title, extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
     while($row = mysql_fetch_row($query)) {
 		$ret[] = array("id"        => $row[0],
         			   "timestamp" => $row[1],
                        "comments"  => $row[2],
                        "title"     => $row[3],
-                       "body"      => $row[4]);
+                       "body"      => $row[4],
+                       "extended"  => $row[5]);
     }
 
     return $ret;
@@ -222,7 +236,7 @@
 /**
 * Prints the entries you fetched with jBlog_fetchEntries/searchEntries in HTML.
 **/
-function jBlog_printEntries($entries) {
+function jBlog_printEntries($entries, $extended=0) {
 	global $jBlog;
 
 	if ($entries !== false) {
@@ -237,7 +251,18 @@
 			echo $entries[$x]["title"];
 			echo "</span>";
 			echo "<div class='jBlog_entry'>";
-            echo nl2br(jBlog_emoticate(jBlog_markup_text($entries[$x]["body"])));
+            if($extended) {
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entries[$x]["extended"])));
+            } else {
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entries[$x]["body"])));
+            }
+            if($entries[$x]["exflag"] && !$extended) {
+            ?>
+                <div class='jBlog_time'><br>
+                <a href="<?= $jBlog['jBlogHTTPPath'] ?>archives/e_<?= $entries[$x]['id'] ?>.html">View Extended Entry</a>
+                </div><br>               
+            <?php        
+            }
             echo "<div class='jBlog_time'><br>";
             echo "<a href=\"{$jBlog['jBlogHTTPPath']}archives/e_{$entries[$x]['id']}.html\">Posted by ".$jBlog["user"]." at ";
             echo date("H:i", $entries[$x]["timestamp"]);
@@ -625,22 +650,33 @@
 	global $jBlog;
 
     $newEntry = 0;
+    $exflag = 0;
 
 	if (!is_numeric($entry["id"])) $entry["id"] = "NULL";
     if (!is_numeric($entry["timestamp"])) $entry["timestamp"] = time();
-
-    $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries VALUES (
+    if(!preg_match("/\S/", $entry["extended"])) {
+        $entry["extended"] = $entry["body"];
+    } else {
+        if($entry["extended"] !== $entry["body"]) {
+            $exflag = 1;
+        }
+    }
+    $querystring = "REPLACE INTO ".$jBlog["dbPrefix"]."entries 
+                    (id, title, timestamp, body, extended, comments, exflag)
+                    VALUES (
                     ".$entry["id"].",
                     '".mysql_escape_string($entry["title"])."',
                     ".$entry["timestamp"].",
-					'".mysql_escape_string($entry["body"])."', 0)";
+					'".mysql_escape_string($entry["body"])."', 
+					'".mysql_escape_string($entry["extended"])."', 
+                    0, $exflag)";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
     if ($entry['id'] == "NULL") {
         $newEntry = 1;
         $entry['id'] = mysql_insert_id();
     }
 
-    jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['body'], $newEntry);
+    jBlog_handle_references($entry['id'], $jBlog['blogTitle'], $entry['title'], $entry['extended'], $newEntry);
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
     
@@ -816,9 +852,20 @@
                     <input type="button" value="Link" onClick="jBlog_insLink(document.forms['entry']['jBlog[body]'])">
                 </td>
     		</tr>
+            <tr>
+                <td colspan="2">Entry Body</td>
+            </tr>   
     		<tr>
 				<td colspan="2">
                 	<textarea name="jBlog[body]" cols=80 rows=20><?=htmlentities($entry["body"])?></textarea>
+                </td>
+    		</tr>
+            <tr>
+                <td colspan="2">Extended Body</td>
+            </tr>   
+    		<tr>
+				<td colspan="2">
+                	<textarea name="jBlog[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
                 </td>
     		</tr>
             <tr>

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog_genpage.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
+++ jBlog_genpage.php	4 Mar 2003 00:43:58 -0000	1.2
@@ -1,27 +1,8 @@
 <?php
+
 ?><html><head><title><?=$jBlog['blogTitle']?></title>
 <link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css">
 <link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$jBlog['baseURL']?>feeds/index.rss" />
-<style type="text/css">
-<!--
-.body {
-	font-family: Tahoma, Verdana, Arial;
-}
-
-.td {
-	font-family: Tahoma, Verdana, Arial;
-    }
-
-.input {
-	width:100px;
-    font-size:12px;
-    font-family: Tahoma, Verdana, Arial;
-    background: #cdcdcd;
-
-
-}
-//-->
-</style>
 <body>
 <?php
 include ("jBlog_layout.php");

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_layout.php	1 Mar 2003 20:49:29 -0000	1.2
+++ jBlog_layout.php	4 Mar 2003 00:43:58 -0000	1.3
@@ -15,6 +15,30 @@
 // file in your own layout. This is just to demonstrate, how to use the
 // API (e.g. how do I draw the calendar, fetch blog entries, etc...)
 ?>
+<table class="jBlog_banner" cellpadding="0">
+    <tr>
+        <td>
+            <?= $jBlog['blogTitle'] ?>
+        </td>
+    </tr>
+    <tr>
+<?php
+    if($jBlog['blogSubTitle']) {
+?>
+        <td class="jBlog_subbanner">
+            <?= $jBlog['blogSubTitle'] ?>
+        </td> 
+<?php 
+    } else {
+?>
+        <td class="jBlog_subbanner">
+            <?= $jBlog['blogDescription'] ?>
+        </td> 
+    </tr>
+<?php
+    }
+?>
+</table>
 <table class="jBlog" cellpadding="20">
 	<tr>
     	<td class="jBlogGreyBox" valign="top">
@@ -28,7 +52,7 @@
                 	// User wants to read the diary
                 	case "read":
                         if (isset($jBlog['GET']['id'])) {
-                            jBlog_printEntries(array(jBlog_fetchEntry("id", $jBlog['GET']['id'])));
+                            jBlog_printEntries(array(jBlog_fetchEntry("id", $jBlog['GET']['id'])), 1);
                         } else {
                         	jBlog_printEntries(jBlog_fetchEntries($jBlog["GET"]["range"]));
                         }

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

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

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

Modified Files:
	compat.php 
Log Message:
Be binary safe, just in case :)


Index: compat.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/compat.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- compat.php	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ compat.php	3 Mar 2003 21:50:51 -0000	1.2
@@ -1,7 +1,7 @@
 <?php
 if (!function_exists("file_get_contents")) {
     function file_get_contents($file) {
-        $fp = fopen($file, "r");
+        $fp = fopen($file, "rb");
         while (!@feof($fp)) {
             $data .= fread($fp, 4096);
         }

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

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

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

Modified Files:
	jBlog_admin.php 
Log Message:
make nice grammar, test cvs list.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C4 -d -r1.2 -r1.3
*** jBlog_admin.php	3 Mar 2003 19:33:31 -0000	1.2
--- jBlog_admin.php	3 Mar 2003 19:41:49 -0000	1.3
***************
*** 23,31 ****
  }*/
  ?>
  <html>
  	<head>
!     	<title>jBlog adminSuite</title>
          <link rel="stylesheet" type="text/css" href="jBlog.css">
      </head>
      <body>
         <table height="100%" width="100%"><tr><td valign="top" align="left" class="jBlogGreyBox" height="100%" width="100%">
--- 23,31 ----
  }*/
  ?>
  <html>
  	<head>
!     	<title>jBlog Administration Suite</title>
          <link rel="stylesheet" type="text/css" href="jBlog.css">
      </head>
      <body>
         <table height="100%" width="100%"><tr><td valign="top" align="left" class="jBlogGreyBox" height="100%" width="100%">

[php-blog-cvs] jBlog jBlog_admin.php,1.1.1.1,1.2

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

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

Modified Files:
	jBlog_admin.php 
Log Message:
remove old comment, and test commit list.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C4 -d -r1.1.1.1 -r1.2
*** jBlog_admin.php	27 Feb 2003 16:55:35 -0000	1.1.1.1
--- jBlog_admin.php	3 Mar 2003 19:33:31 -0000	1.2
***************
*** 1,14 ****
  <?php
  
- ##########################################################################
- # jBlog - another blogger...                                             #
- ##########################################################################
- #                                                                        #
- # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
- # http://www.jannis.to/programming/jBlog.html                            #
- #                                                                        #
- ##########################################################################
  session_start();
  
  if (file_exists("./jBlog_config_local.inc.php"))
   include("jBlog_config.inc.php");
--- 1,6 ----

[php-blog-cvs] subscribe

[Sterling H. <ste...@bu...>]

-- 
"Reductionists like to take things apart.  The rest of us are
 just trying to get it together."
    - Larry Wall, Programming Perl, 3rd Edition