php-blog-cvs — Serendipity commit list

[php-blog-cvs] jBlog jBlog_layout.php,1.12,1.13 jBlog_plugin_api.php,1.3,1.4

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

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

Modified Files:
	jBlog_layout.php jBlog_plugin_api.php 
Log Message:
Fix html for side bars


Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jBlog_layout.php	10 Mar 2003 19:45:38 -0000	1.12
+++ jBlog_layout.php	10 Mar 2003 20:50:16 -0000	1.13
@@ -31,13 +31,9 @@
     }
 ?>
 </div>
-<div id="jBlogLeftNav">
-	<tr>
-
 <?php
 	jblog_plugin_api::generate_plugins('left');
 ?>
-</div>
 <div id="content">
 			<?php
                	if (!is_numeric($jBlog["GET"]["range"]))
@@ -69,10 +65,8 @@
                 }
             ?>
 </div>
-<div id="jBlogRightNav">
 <?php
 	/* Find any plugins for the RHS */
 	jblog_plugin_api::generate_plugins('right');
 
 ?>
-</div>

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_plugin_api.php	10 Mar 2003 20:38:19 -0000	1.3
+++ jBlog_plugin_api.php	10 Mar 2003 20:50:17 -0000	1.4
@@ -140,7 +140,7 @@
 		$plugins = jblog_plugin_api::enum_plugins($side);
 		if (!is_array($plugins))
 			return;
-		echo "<td class=\"jBlog" . ucfirst($side) . "SideBar\" valign=\"top\">\n";
+		echo "<div id=\"jBlog" . ucfirst($side) . "SideBar\">\n";
 		foreach ($plugins as $plugin_data) {
 			$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
 			$title = get_class($plugin);
@@ -150,7 +150,7 @@
 			ob_end_clean();
 			echo "<div class=\"jBlogSideBarItem\"><div class=\"jBlogSideBarTitle\">$title</div><div class=\"jBlogSideBarContent\">$content</div></div>\n";
 		}
-		echo "</td>\n";
+		echo "</div>\n";
 	}
 
 }

[php-blog-cvs] jBlog jBlog_admin_plugins.inc.php,1.1,1.2 jBlog_plugin_api.php,1.2,1.3

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

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

Modified Files:
	jBlog_admin_plugins.inc.php jBlog_plugin_api.php 
Log Message:
You can now add/remove instances of registered plugins.
Just visit your "Configure Plugins" admin section.
Nice and easy, and no more overhead than how it was before.


Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_admin_plugins.inc.php	10 Mar 2003 02:13:38 -0000	1.1
+++ jBlog_admin_plugins.inc.php	10 Mar 2003 20:38:17 -0000	1.2
@@ -5,27 +5,61 @@
 include_once "jBlog_plugin_api.php";
 include_once "jBlog_sidebar_items.php";
 
-/* Temporary hack to ease dev's lives:
- * Force registration of the built-in plugins for now */
-jblog_plugin_api::register_default_plugins();
-
-if (isset($_POST['jBlog']['placement'])) {
+if (isset($_POST['SAVE']) && isset($_POST['jBlog']['placement'])) {
 	foreach ($_POST['jBlog']['placement'] as $plugin_name => $placement) {
 		jblog_plugin_api::update_plugin_placement(
 			addslashes($plugin_name),
 			addslashes($placement)
 			);
 	}
-
+}
+if (isset($_POST['NEW']) && $_POST['jBlog']['plugin_to_add'] != '0') {
+	$inst = jblog_plugin_api::create_plugin_instance($_POST['jBlog']['plugin_to_add']);
+	/* TODO: redirect to configuration for that instance */
+}
+if (isset($_POST['REMOVE'])) {
+	foreach ($_POST['jBlog']['plugin_to_remove'] as $key) {
+		jblog_plugin_api::remove_plugin_instance($key);
+	}
 }
 
 /* very simple configuration for the moment; just change the placement */
 $plugins = jblog_plugin_api::enum_plugins();
+/* list of classes for creating instances */
+$classes = jblog_plugin_api::enum_plugin_classes();
+
 
 ?>
 <form action="?jBlog[adminModule]=plugins" method="post">
+
+<select name="jBlog[plugin_to_add]">
+<option value="0">[ Select a plugin to add ]</option>
+<?php
+foreach ($classes as $class_name) {
+	$plugin =& jblog_plugin_api::load_plugin($class_name);
+
+	/* query for its name, description and configuration data */
+	$bag = new jBlog_property_bag;
+	$plugin->introspect($bag);
+
+	$name = htmlentities($bag->get('name'));
+	$desc = htmlentities($bag->get('description'));
+
+	echo "<option value=\"$class_name\">$name - $desc</option>\n";
+}
+
+
+?>
+</select>
+
+<input name="NEW" value="Add plugin" type="submit">
+
+<br />
+<br />
+
 <table border="1" cellpadding="5">
 <tr>
+<th>&nbsp;</th>
 <th>Plugin</th>
 <th>Description</th>
 <th>Placement</th>
@@ -66,9 +100,12 @@
 		$name = "<a href=\"$url\">$name</a>";
 	}
 
-	echo "<tr><td>$name</td><td>$desc</td><td>$place</td></tr>\n";
+	echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$name</td><td>$desc</td><td>$place</td></tr>\n";
 }
 ?>
 </table>
+<br />
+
+<input type="submit" name="REMOVE" value="Remove Ticked Plugins">
 <input type="submit" name="SAVE" value="Save">
 </form>

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_plugin_api.php	10 Mar 2003 02:20:53 -0000	1.2
+++ jBlog_plugin_api.php	10 Mar 2003 20:38:19 -0000	1.3
@@ -1,49 +1,100 @@
 <?php
 if (IN_JBLOG !== true) die ("Don't hack!");
 
+include_once "jBlog_sidebar_items.php";
+
 /* This file defines the plugin API for jBlog.
  * By extending these classes, you can add your own code
  * to appear in the sidebar(s) of jBlog.
  */
 
-
+/*
+ * The system defines a number of built-in plugins; these are
+ * identified by @class_name.
+ *
+ * Third-party plugins are identified by the name of the folder into
+ * which they were uploaded (so there is no @ sign at the start of
+ * their class name.
+ *
+ * The user creates instances of plugins; an instance is assigned
+ * an identifier like this:
+ *   classname:uniqid()
+ *
+ * The user can configure instances of plugins.
+ */
 
 class jblog_plugin_api {
 
 	function register_default_plugins()
 	{
-		jblog_plugin_api::register_plugin(array(
-					'jBlog_calendar_plugin',
-					'jBlog_quicksearch_plugin',
-					'jBlog_archives_plugin',
-					'jBlog_topreferrers_plugin',
-					'jBlog_syndication_plugin',
-					'jBlog_superuser_plugin',
-					'jBlog_plug_plugin',
-					));
+		$classes = jblog_plugin_api::enum_plugin_classes();
+		foreach ($classes as $class_name) {
+			if ($class_name{0} == '@') {
+				jblog_plugin_api::create_plugin_instance($class_name);
+			}
+		}
 	}
 
-	/* This should be used for built-in plugins only.
-	 * run-time registration of an existing class as a plugin */
-	function register_plugin($class_names)
+	/* Create an instance of a plugin.
+	 * $plugin_class_id is of the form:
+	 *    @class_name        for a built-in plugin
+	 * or
+	 *    plugin_dir_name    for a third-party plugin
+	 * returns the instance identifier for the newly created plugin.
+	 *
+	 * TO BE IMPLEMENTED:
+	 * If $copy_from_instance is not null, and identifies another plugin
+	 * of the same class, then the persistent state will be copied.
+	 * This allows the user to clone a plugin.
+	 */
+	function create_plugin_instance($plugin_class_id, $copy_from_instance=null)
 	{
 		global $jBlog;
 	
-		if (!is_array($class_names)) {
-			$class_names = array($class_names);
-		}
+		$id = md5(uniqid(""));
+		
+		$key = $plugin_class_id . ":" . $id;
 
-		foreach ($class_names as $class_name) {
-			/* is it already registered ? */
-			$reg = jBlog_db_query("SELECT * from $jBlog[dbPrefix]plugins where name='@$class_name'", true);
-			if ($reg === false) {
-				/* no, so register it */
-				jBlog_db_query("INSERT INTO $jBlog[dbPrefix]plugins (name) values ('@$class_name')");
+		jBlog_db_query("INSERT INTO $jBlog[dbPrefix]plugins (name) values ('$key')");
+
+		return $key;
+	}
+	
+	function remove_plugin_instance($plugin_instance_id)
+	{
+		global $jBlog;
+		jBlog_db_query("DELETE FROM $jBlog[dbPrefix]plugins where name='$plugin_instance_id'");
+	}
+
+	/* Retrieves a list of available plugins */
+	function enum_plugin_classes()
+	{
+		global $jBlog;
+
+		$classes = array();
+
+		/* built-in classes first */
+		$cls = get_declared_classes();
+		foreach ($cls as $class_name) {
+			$p = get_parent_class($class_name);
+			while ($p != 'jblog_plugin' && $p !== false) {
+				$p = get_parent_class($p);
+			}
+			if ($p == 'jblog_plugin') {
+				$classes[] = '@' . $class_name;
 			}
 		}
+		/* third-party classes next */
+		$d = opendir($jBlog['jBlogPath'] . "plugins");
+		while (($f = readdir($d)) !== false) {
+			if ($f{0} == '.' || $f == 'CVS')
+				continue;
+			$classes[] = $f;
+		}
+		return $classes;
 	}
-	
-	/* Retrieves a list of plugin records */
+
+	/* Retrieves a list of plugin instances */
 	function enum_plugins($filter = '*')
 	{
 		global $jBlog;
@@ -57,8 +108,10 @@
 	}
 
 	/* Creates an instance of a named plugin */
-	function &load_plugin($name)
+	function &load_plugin($instance_id)
 	{
+		list($name, $uniq) = explode(":", $instance_id);
+
 		if ($name{0} == '@') {
 			$class_name = substr($name, 1);
 		} else {
@@ -67,7 +120,8 @@
 			return false;
 		}
 
-		$p =& new $class_name;
+		$p =& new $class_name($instance_id);
+		
 		return $p;
 	}
 
@@ -138,6 +192,14 @@
 }
 
 class jBlog_plugin {
+	var $instance = null;
+	
+	/* Be sure to call this method from your derived classes constructors,
+	 * otherwise your config data will not be stored or retrieved correctly */
+	function jBlog_plugin($instance)
+	{
+		$this->instance = $instance;
+	}
 	
 	/* Called by jBlog when it wants to display information
 	 * about your plugin.
@@ -186,7 +248,7 @@
 	/* Fetches a configuration value for this plugin */
 	function get_config($name, $defaultvalue = null)
 	{
-		$name = get_class($this) . ":" . $name;
+		$name = $this->instance . "/" . $name;
 		return jBlog_get_config_var($name, $defaultvalue);
 	}
 

[php-blog-cvs] jBlog jBlog_layout.php,1.11,1.12

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

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

Modified Files:
	jBlog_layout.php 
Log Message:
changed many tables to divs

This is for the best.  Trust me 


Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jBlog_layout.php	10 Mar 2003 02:13:38 -0000	1.11
+++ jBlog_layout.php	10 Mar 2003 19:45:38 -0000	1.12
@@ -17,38 +17,28 @@
 // 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>
+<div class="jBlog_banner">
+<h1><?= $jBlog['blogTitle'] ?></h1>
 <?php
     if($jBlog['blogSubTitle']) {
 ?>
-        <td class="jBlog_subbanner">
-            <?= $jBlog['blogSubTitle'] ?>
-        </td> 
+<h2><?= $jBlog['blogSubTitle'] ?></h2>
 <?php 
     } else {
 ?>
-        <td class="jBlog_subbanner">
-            <?= $jBlog['blogDescription'] ?>
-        </td> 
-    </tr>
+            <h2><?= $jBlog['blogDescription'] ?></h2>
 <?php
     }
 ?>
-</table>
-<table class="jBlog">
+</div>
+<div id="jBlogLeftNav">
 	<tr>
 
 <?php
 	jblog_plugin_api::generate_plugins('left');
 ?>
-		
-    	<td class="jBlogEntriesBox" valign="top">
+</div>
+<div id="content">
 			<?php
                	if (!is_numeric($jBlog["GET"]["range"]))
 	               	$jBlog["GET"]["range"] = date("Ymd");
@@ -78,11 +68,11 @@
                     	jBlog_printEntries(jBlog_fetchEntries(null, true, 15));
                 }
             ?>
-        </td>
+</div>
+<div id="jBlogRightNav">
 <?php
 	/* Find any plugins for the RHS */
 	jblog_plugin_api::generate_plugins('right');
 
 ?>
-    </tr>
-</table>
+</div>

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

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

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

Modified Files:
	jBlog_lang_en_gb.inc.php 
Log Message:
_real_ *real* english


Index: jBlog_lang_en_gb.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_lang_en_gb.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_lang_en_gb.inc.php	10 Mar 2003 13:50:55 -0000	1.1
+++ jBlog_lang_en_gb.inc.php	10 Mar 2003 15:18:02 -0000	1.2
@@ -11,7 +11,7 @@
 
 // English language file
 $jBlog["months"]  = array("J...@ha...", "January", "February", "March",
-                    "April", "Mai", "June", "July", "August", "September",
+                    "April", "May", "June", "July", "August", "September",
                     "October", "November", "December");
 
 $jBlog["weekDayAbb"] = array("M", "T", "W", "T", "F", "S", "S");

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

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

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

Added Files:
	jBlog_lang_en_gb.inc.php 
Log Message:
*real* english


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

##########################################################################
# jBlog - another blogger...                                             #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/jBlog.html                            #
#                                                                        #
##########################################################################

// English language file
$jBlog["months"]  = array("J...@ha...", "January", "February", "March",
                    "April", "Mai", "June", "July", "August", "September",
                    "October", "November", "December");

$jBlog["weekDayAbb"] = array("M", "T", "W", "T", "F", "S", "S");

define("JBLOG_LANG_LOADED", true);

?>

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

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
pure blogger support for Sterling (typo)

Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog-xmlrpc.php	10 Mar 2003 06:03:26 -0000	1.4
+++ jBlog-xmlrpc.php	10 Mar 2003 06:04:28 -0000	1.5
@@ -138,7 +138,7 @@
     return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
-function blogger_newPost($message)
+function blogger_editPost($message)
 {
     $val = $message->params[1];
     $entry['id'] = $val->getval();

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

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
pure blogger support for Sterling

Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog-xmlrpc.php	10 Mar 2003 05:55:08 -0000	1.3
+++ jBlog-xmlrpc.php	10 Mar 2003 06:03:26 -0000	1.4
@@ -7,6 +7,10 @@
                         array('function' => 'blogger_getUsersBlogs'),
                     'blogger.getUserInfo' =>
                         array('function' => 'blogger_getUserInfo'),
+                    'blogger.newPost' =>
+                        array('function' => 'blogger_newPost'),
+                    'blogger.editPost' =>
+                        array('function' => 'blogger_editPost'),
                     'metaWeblog.newPost' =>
                         array('function' => 'metaWeblog_newPost'),
                     'metaWeblog.editPost' =>
@@ -116,6 +120,40 @@
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
+}
+
+function blogger_newPost($message)
+{
+    $val = $message->params[2];
+    $username = $val->getval();
+    $val = $message->params[3];
+    $password = $val->getval();
+    if(!jBlog_authenticate_author($username, $password)) {
+        return new XML_RPC_Response('', 4, "Authentication Failed");
+    }
+    $val = $message->params[4];
+    $entry['body']  = $val->getval();
+    $entry['user'] = $username;
+    $id = jBlog_updertEntry($entry);
+    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
+}
+
+function blogger_newPost($message)
+{
+    $val = $message->params[1];
+    $entry['id'] = $val->getval();
+    $val = $message->params[2];
+    $username = $val->getval();
+    $val = $message->params[3];
+    $password = $val->getval();
+    if(!jBlog_authenticate_author($username, $password)) {
+        return new XML_RPC_Response('', 4, "Authentication Failed");
+    }
+    $val = $message->params[4];
+    $entry['body']  = $val->getval();
+    $entry['user'] = $username;
+    $id = jBlog_updertEntry($entry);
+    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
 }
 
 function metaWeblog_newPost($message)

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

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
fix for mt.getRecentEntries


Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog-xmlrpc.php	10 Mar 2003 04:07:06 -0000	1.2
+++ jBlog-xmlrpc.php	10 Mar 2003 05:55:08 -0000	1.3
@@ -56,8 +56,8 @@
         return new XML_RPC_Response('', 4, "Authentication Failed");
     }
     $userdata = new XML_RPC_Value(
-        array('nickname'  => new XML_RPC_Value($jBlog['user']),
-              'userid' => new XML_RPC_Value($jBlog['jBlogEmail']), 
+        array('nickname'  => new XML_RPC_Value($jBlog['jBlogUser']),
+              'userid' => new XML_RPC_Value($jBlog['authorid'], 'string'), 
               'url' => new XML_RPC_Value($jBlog['baseURL']), 
               'email' => new XML_RPC_Value($jBlog['jBlogEmail']), 
               'lastname' => new XML_RPC_Value(''), 
@@ -95,10 +95,12 @@
     $xml_entries_vals = array();
     foreach ( $entries as $entry ) {
         $xml_entries_vals[] = new XML_RPC_Value(
-            array('postid' => new XML_RPC_Value($entry['id'], 'string'),
+            array(
+                  'postid' => new XML_RPC_Value($entry['id'], 'string'),
+                  'title' => new XML_RPC_Value($entry['title'], 'string'),
+                  'userid' => new XML_RPC_Value($entry['authorid'], 'string'),
                   'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
-                  'userid' => new XML_RPC_Value($entry['authorid'], 'string'), 
-                  'title' => new XML_RPC_Value($entry['title'], 'string')), 'struct');
+                  'postid' => new XML_RPC_Value($entry['id'], 'string')), 'struct');
     }
     $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array');
     return new XML_RPC_Response($xml_entries); 
@@ -211,13 +213,13 @@
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
 }
-/* IF DEBUG
+/*
 $fp = fopen("/tmp/kung-log", "a");
 fwrite($fp, $HTTP_RAW_POST_DATA);
 ob_start();
 */
 $server = new XML_RPC_Server($dispatches,1);
-/* IF DEBUG
+/*
 fwrite($fp, ob_get_contents());
 fclose($fp);
 */

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.43,1.44

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
handcode comment form,  that logic was essentially worthless


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- jBlog_functions.inc.php	10 Mar 2003 04:33:34 -0000	1.43
+++ jBlog_functions.inc.php	10 Mar 2003 04:39:02 -0000	1.44
@@ -12,30 +12,29 @@
 if (IN_JBLOG !== true) die ("Don't hack!");
 
 $jBlog["imageList"] = array();
-$commentsFields = array(
-    "Name" => "<input type=\"text\" name=\"jBlog[name]\" value=\"\" size=\"30\" />",
-    "Email" => "<input type=\"text\" name=\"jBlog[email]\" value=\"\" />",
-    "Homepage" => "<input type=\"text\" name=\"jBlog[url]\" value=\"\" />",
-    "Comment" => '<textarea rows="10" cols="40" name="jBlog[comment]"></textarea>'
-);
-
 function jBlog_displayCommentForm($id) {
-    global $jBlog, $commentsFields;
+    global $jBlog;
 ?>
 <div class="jBlogCommentForm">
 <form name="jBlog_comment" action="<?=$jBlog['jBlogHTTPPath']?>comment.php" method="post" onsubmit="if (this.jBlog_remember.checked) rememberMe(this, '<?=$_SERVER['HTTP_HOST']?>')">
 <input type="hidden" name="jBlog[entry_id]" value="<?=$id?>" />
 <table border="0" width="100%" cellpadding="3">
-<?php
-foreach ($commentsFields as $label => $field) {
-?>
 <tr>
-<td class="jBlog_commentsLabel"><?=$label?></td>
-<td class="jBlog_commentsValue"><?=$field?></td>
+<td class="jBlog_commentsLabel">Name</td>
+<td class="jBlog_commentsValue"><input type="text" name="jBlog[name]" value="" size="30" /></td>
+</tr>
+<tr>
+<td class="jBlog_commentsLabel">Email</td>
+<td class="jBlog_commentsValue"><input type="text" name="jBlog[email]" value="" /></td>
+</tr>
+<tr>
+<td class="jBlog_commentsLabel">Homepage</td>
+<td class="jBlog_commentsValue"><input type="text" name="jBlog[url]" value="" /></td>
+</tr>
+<tr>
+<td class="jBlog_commentsLabel">Comment</td>
+<td class="jBlog_commentsValue"><textarea rows="10" cols="40" name="jBlog[comment]"></textarea></td>
 </tr>
-<?php
-}
-?>
 </table>
 Remember Information? 
 <input type="checkbox" name="jBlog_remember" /><br />

[php-blog-cvs] jBlog comment.php,1.8,1.9 jBlog.css.php,1.5,1.6 jBlog.js,1.1.1.1,1.2 jBlog_functions.inc.php,1.42,1.43 jBlog_genpage.php,1.4,1.5

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

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

Modified Files:
	comment.php jBlog.css.php jBlog.js jBlog_functions.inc.php 
	jBlog_genpage.php 
Log Message:
add support for comments/remembering comments on statically pregenerated 
pages.


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- comment.php	8 Mar 2003 01:54:05 -0000	1.8
+++ comment.php	10 Mar 2003 04:33:34 -0000	1.9
@@ -45,14 +45,6 @@
 <?php jBlog_displayCommentForm($id);
 } else {
     $remember = 0;
-    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'];
     $comment['comment'] = $jBlog['POST']['comment'];
     $comment['name'] = $jBlog['POST']['name'];

Index: jBlog.css.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.css.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog.css.php	7 Mar 2003 03:40:11 -0000	1.5
+++ jBlog.css.php	10 Mar 2003 04:33:34 -0000	1.6
@@ -1,4 +1,5 @@
 <?php
+header("Content-type: text/css");
 session_start();
 include_once("jBlog_config.inc.php");
 $css = jBlog_getCSS($_REQUEST['style']);

Index: jBlog.js
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- jBlog.js	27 Feb 2003 16:55:34 -0000	1.1.1.1
+++ jBlog.js	10 Mar 2003 04:33:34 -0000	1.2
@@ -1,6 +1,59 @@
 <!-- // Hide from older browsers
-function openWin(url, width, height) 
-{
-    window.open(url, 'width=' + width + ',height=' + height);
+// Copyright (c) 1996-1997 Athenia Associates.
+// http://www.webreference.com/js/
+// License is granted if and only if this entire
+// copyright notice is included. By Tomer Shiran.
+
+function setCookie (name, value, expires, path, domain, secure) {
+    var curCookie = name + "=" + escape(value) + ((expires) ? "; expires=" + 
+                    expires.toGMTString() : "") + ((path) ? "; path=" + path : "") + 
+                    ((domain) ? "; domain=" + domain : "") + ((secure) ? "; secure" : "");
+    document.cookie = curCookie;
+}
+
+function getCookie (name) {
+    var prefix = name + '=';
+    var c = document.cookie;
+    var nullstring = '';
+    var cookieStartIndex = c.indexOf(prefix);
+    if (cookieStartIndex == -1)
+        return nullstring;
+    var cookieEndIndex = c.indexOf(";", cookieStartIndex + prefix.length);
+    if (cookieEndIndex == -1)
+        cookieEndIndex = c.length;
+    return unescape(c.substring(cookieStartIndex + prefix.length, cookieEndIndex));
+}
+
+function deleteCookie (name, path, domain) {
+    if (getCookie(name))
+        document.cookie = name + "=" + ((path) ? "; path=" + path : "") + ((domain) ? "; domain=" + domain : "") + "; expires=Thu, 01-Jan-70 00:00:01 GMT";
+}
+
+function fixDate (date) {
+    var base = new Date(0);
+    var skew = base.getTime();
+    if (skew > 0)
+        date.setTime(date.getTime() - skew);
+}
+
+// make this function except a host - Sterling Hughes <ste...@ph...>
+function rememberMe (f, host) {
+    var now = new Date();
+    fixDate(now);
+    now.setTime(now.getTime() + 365 * 24 * 60 * 60 * 1000);
+    setCookie('jBlog_cmt_name', f['jBlog[name]'].value, now, '', host, '');
+    setCookie('jBlog_cmt_email', f['jBlog[email]'].value, now, '', host, '');
+    setCookie('jBlog_cmt_url', f['jBlog[url]'].value, now, '', host, '');
+}
+
+// make this function except a host - Sterling Hughes <ste...@ph...>
+function forgetMe (f, host) {
+    deleteCookie('jBlog_cmt_name', '', host);
+    deleteCookie('jBlog_cmt_email', '', host);
+    deleteCookie('jBlog_cmt_url', '', host);
+    f['jBlog[name]'].value = '';
+    f['jBlog[email]'].value = '';
+    f['jBlog[url]'].value = '';
+    f.jBlog_remember.checked = 0;
 }
 // -->

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- jBlog_functions.inc.php	10 Mar 2003 04:02:36 -0000	1.42
+++ jBlog_functions.inc.php	10 Mar 2003 04:33:34 -0000	1.43
@@ -13,9 +13,9 @@
 
 $jBlog["imageList"] = array();
 $commentsFields = array(
-    "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']}\" />",
+    "Name" => "<input type=\"text\" name=\"jBlog[name]\" value=\"\" size=\"30\" />",
+    "Email" => "<input type=\"text\" name=\"jBlog[email]\" value=\"\" />",
+    "Homepage" => "<input type=\"text\" name=\"jBlog[url]\" value=\"\" />",
     "Comment" => '<textarea rows="10" cols="40" name="jBlog[comment]"></textarea>'
 );
 
@@ -23,7 +23,7 @@
     global $jBlog, $commentsFields;
 ?>
 <div class="jBlogCommentForm">
-<form name="comment" action="<?=$jBlog['jBlogHTTPPath']?>comment.php" method="post">
+<form name="jBlog_comment" action="<?=$jBlog['jBlogHTTPPath']?>comment.php" method="post" onsubmit="if (this.jBlog_remember.checked) rememberMe(this, '<?=$_SERVER['HTTP_HOST']?>')">
 <input type="hidden" name="jBlog[entry_id]" value="<?=$id?>" />
 <table border="0" width="100%" cellpadding="3">
 <?php
@@ -38,9 +38,24 @@
 ?>
 </table>
 Remember Information? 
-<input type="checkbox" name="jBlog[remember]" <?=$_SESSION['jBlog_remember']?> /><br />
+<input type="checkbox" name="jBlog_remember" /><br />
 <input type="submit" value="Submit Comment" />
 </form>
+<script type="text/javascript" language="javascript">
+<!--
+if (!document.jBlog_comment['jBlog[name]'].value)
+    document.jBlog_comment['jBlog[name]'].value = getCookie("jBlog_cmt_name");
+
+if (!document.jBlog_comment['jBlog[email]'].value)
+    document.jBlog_comment['jBlog[email]'].value = getCookie("jBlog_cmt_email");
+
+if (!document.jBlog_comment['jBlog[url]'].value)
+    document.jBlog_comment['jBlog[url]'].value = getCookie("jBlog_cmt_url");
+
+if (getCookie("jBlog_cmt_name"))
+    document.jBlog_comment.jBlog_remember.checked = 1;
+// -->
+</script>
 </div>
 <?php
 }

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_genpage.php	6 Mar 2003 12:12:01 -0000	1.4
+++ jBlog_genpage.php	10 Mar 2003 04:33:34 -0000	1.5
@@ -1,8 +1,9 @@
 <?php
 
 ?><html><head><title><?=htmlentities($jBlog['blogTitle'])?></title>
-<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php" >
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$jBlog['baseURL']?>feeds/index.rss" >
+<link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php" />
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$jBlog['baseURL']?>feeds/index.rss" />
+<script language="Javascript" src="<?=$jBlog['jBlogHTTPPath']?>jBlog.js"></script>
 </head>
 <body>
 <?php

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

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

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

Modified Files:
	jBlog-xmlrpc.php 
Log Message:
remove debug code

Index: jBlog-xmlrpc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog-xmlrpc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog-xmlrpc.php	10 Mar 2003 04:02:35 -0000	1.1
+++ jBlog-xmlrpc.php	10 Mar 2003 04:07:06 -0000	1.2
@@ -211,11 +211,14 @@
     }
     return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
 }
-
+/* IF DEBUG
 $fp = fopen("/tmp/kung-log", "a");
 fwrite($fp, $HTTP_RAW_POST_DATA);
 ob_start();
+*/
 $server = new XML_RPC_Server($dispatches,1);
+/* IF DEBUG
 fwrite($fp, ob_get_contents());
 fclose($fp);
+*/
 ?>

[php-blog-cvs] jBlog jBlog-xmlrpc.php,NONE,1.1 jBlog_functions.inc.php,1.41,1.42

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

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

Modified Files:
	jBlog_functions.inc.php 
Added Files:
	jBlog-xmlrpc.php 
Log Message:
metaWebLog/Blogger/MT XML-RPC support (kung-log works, mostly). 

--- NEW FILE: jBlog-xmlrpc.php ---
<?php
session_start();
require_once 'jBlog_config.inc.php';
require_once 'bundled-libs/XML/RPC/Server.php';

$dispatches = array('blogger.getUsersBlogs' => 
                        array('function' => 'blogger_getUsersBlogs'),
                    'blogger.getUserInfo' =>
                        array('function' => 'blogger_getUserInfo'),
                    'metaWeblog.newPost' =>
                        array('function' => 'metaWeblog_newPost'),
                    'metaWeblog.editPost' =>
                        array('function' => 'metaWeblog_editPost'),
                    'metaWeblog.getPost' =>
                        array('function' => 'metaWeblog_getPost'),
                    'mt.getRecentPostTitles' =>
                        array('function' => 'mt_getRecentPostTitles'),
                    'mt.getCategoryList' =>
                        array('function' => 'mt_getCategoryList'),
                    'metaWeblog.setPostCategories' =>
                        array('function' => 'metaWeblog_setPostCategories'),
                    'metaWeblog.getPostCategories' =>
                        array('function' => 'metaWeblog_getPostCategories'),
                    'mt.supportedTextFilters' =>
                        array('function' => 'mt_supportedTextFilters'));

function blogger_getUsersBlogs($message) 
{
    global $jBlog;

    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $blog1 = new XML_RPC_Value(
        array('url'  => new XML_RPC_Value($jBlog['baseURL']), 
              'blogid' => new XML_RPC_Value('1'), 
              'blogName' => new XML_RPC_Value($jBlog['blogTitle'])),
        'struct');
    $blogs = new XML_RPC_Value( array($blog1), 'array');
    $r = new XML_RPC_Response($blogs);
    return($r);
}

function blogger_getUserInfo($message) 
{
    global $jBlog;
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $userdata = new XML_RPC_Value(
        array('nickname'  => new XML_RPC_Value($jBlog['user']),
              'userid' => new XML_RPC_Value($jBlog['jBlogEmail']), 
              'url' => new XML_RPC_Value($jBlog['baseURL']), 
              'email' => new XML_RPC_Value($jBlog['jBlogEmail']), 
              'lastname' => new XML_RPC_Value(''), 
              'firstname' => new XML_RPC_Value('')),
        'struct');
    $r = new XML_RPC_Response($userdata);
    return($r);
}

function mt_getCategoryList($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
//    return  new XML_RPC_Response( new XML_RPC_Value(array(new XML_RPC_Value(array( 'categoryId' => new XML_RPC_Value('1'), 'categoryName' => new XML_RPC_Value('default')), 'struct')), 'array'));
}

function mt_getRecentPostTitles($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    $val = $message->params[3];
    $numposts = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $entries = jBlog_fetchEntries('', false, $numposts);
    $xml_entries_vals = array();
    foreach ( $entries as $entry ) {
        $xml_entries_vals[] = new XML_RPC_Value(
            array('postid' => new XML_RPC_Value($entry['id'], 'string'),
                  'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
                  'userid' => new XML_RPC_Value($entry['authorid'], 'string'), 
                  'title' => new XML_RPC_Value($entry['title'], 'string')), 'struct');
    }
    $xml_entries = new XML_RPC_Value($xml_entries_vals, 'array');
    return new XML_RPC_Response($xml_entries); 
}

function mt_supportedTextFilters($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
}

function metaWeblog_newPost($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $val = $message->params[3];
    $post_array = $val->getval();
    $entry['title'] = $post_array['title'];
    $entry['body'] = $post_array['description'];
    $entry['extended'] = $post_array['mt_text_more'];
    $entry['user'] = $username;
    $id = jBlog_updertEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id, 'string'));
}

function metaWeblog_editPost($message)
{
    $val = $message->params[0];
    $postid = $val->getval();
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $val = $message->params[3];
    $post_array = $val->getval();
    $entry['title'] = $post_array['title'];
    $entry['body'] = $post_array['description'];
    $entry['extended'] = $post_array['mt_text_more'];
    $entry['user'] = $username;
    $entry['id'] = $postid;
    $id = jBlog_updertEntry($entry);
    return  new XML_RPC_Response( new XML_RPC_Value($id));
}

function metaWeblog_getPost($message)
{
    global $jBlog;
    $val = $message->params[0];
    $postid = $val->getval();
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    $entry = jBlog_fetchEntry("id", $postid);

    $tmp = array(
          'dateCreated' => new XML_RPC_Value(XML_RPC_iso8601_encode($entry['timestamp']), 'dateTime.iso8601'),
          'postid'      => new XML_RPC_Value($postid, 'string'),
          'userid'      => new XML_RPC_Value($entry['authorid'], 'string'),
          'description' => new XML_RPC_Value($entry['body'], 'string'),  
          'mt_text_more'=> new XML_RPC_Value($entry['extended'], 'string'),  
          'mt_excerpt'=> new XML_RPC_Value('', 'string'),  
          'mt_allow_comments' => new XML_RPC_Value(1, 'boolean'),
          'mt_allow_pings' => new XML_RPC_Value(1, 'boolean'),
          'mt_convert_breaks' => new XML_RPC_Value(0, 'boolean'),
          'title' => new XML_RPC_Value($entry['title'],'string'),
          'permalink' => new XML_RPC_Value($jBlog['baseURL']."/archives/e_$postid.html", 'string'),
          'link' => new XML_RPC_Value($jBlog['baseURL']."/archives/e_$postid.html", 'string'));
    $entry = new XML_RPC_Value($tmp, 'struct');
    return  new XML_RPC_Response($entry); 
}

function metaWeblog_setPostCategories($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    return  new XML_RPC_Response( new XML_RPC_Value(1, 'boolean'));
}

function metaWeblog_getPostCategories($message)
{
    $val = $message->params[1];
    $username = $val->getval();
    $val = $message->params[2];
    $password = $val->getval();
    if(!jBlog_authenticate_author($username, $password)) {
        return new XML_RPC_Response('', 4, "Authentication Failed");
    }
    return  new XML_RPC_Response( new XML_RPC_Value(array(), 'array'));
}

$fp = fopen("/tmp/kung-log", "a");
fwrite($fp, $HTTP_RAW_POST_DATA);
ob_start();
$server = new XML_RPC_Server($dispatches,1);
fwrite($fp, ob_get_contents());
fclose($fp);
?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- jBlog_functions.inc.php	10 Mar 2003 03:54:47 -0000	1.41
+++ jBlog_functions.inc.php	10 Mar 2003 04:02:36 -0000	1.42
@@ -844,7 +844,7 @@
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
     
-    return mysql_error();
+    return $entry['id'];
 }
 
 /**

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.40,1.41

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
make use of an "extended" <a> introduced by the previous commit.  this way
when you click "view extended entry" you jump straight to the text.


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- jBlog_functions.inc.php	10 Mar 2003 03:47:27 -0000	1.40
+++ jBlog_functions.inc.php	10 Mar 2003 03:54:47 -0000	1.41
@@ -271,7 +271,7 @@
 					. $jBlog['jBlogHTTPPath']
 					. "archives/e_"
 					. $entry['id']
-					. ".html\">View Extended Entry</a></div><br>";
+					. ".html#extended\">View Extended Entry</a></div><br>";
 			}
 		
 			echo "<div class='jBlog_time'><br><a href=\""

[php-blog-cvs] jBlog jBlog_admin.php,1.12,1.13 jBlog_functions.inc.php,1.39,1.40 rss.php,1.2,1.3

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

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

Modified Files:
	jBlog_admin.php jBlog_functions.inc.php rss.php 
Log Message:
rename adminsuite
rss feed improvements.  COmment feeds don't work yet, but they will soon.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- jBlog_admin.php	10 Mar 2003 02:13:37 -0000	1.12
+++ jBlog_admin.php	10 Mar 2003 03:47:26 -0000	1.13
@@ -92,7 +92,7 @@
 					</div>
                 </td>
                 <td class="jBlog_admin">
-                    <div class='jBlog_admin_title'>jBlog adminSuite</div>
+                    <div class="jBlog_admin_title">jBlog Administration Suite</div>
                     <?php
                     	if (!$jBlog["GET"]["adminModule"]) $jBlog["GET"]["adminModule"] = $jBlog["POST"]["adminModule"];
                         switch($jBlog["GET"]["adminModule"]) {

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- jBlog_functions.inc.php	10 Mar 2003 02:13:38 -0000	1.39
+++ jBlog_functions.inc.php	10 Mar 2003 03:47:27 -0000	1.40
@@ -260,12 +260,12 @@
 			echo "</div>";
 			
 			echo "<div class='jBlog_entry'>";
+            echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
 			if ($extended && strlen($entry['extended'])) {
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'] . $entry["extended"])));
-			} else {
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry["body"])));
-			}
-
+                echo '<a name="#extended">';
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
+                echo '</a>';
+			} 
 			if ($entry['exflag'] && !$extended) {
 				echo "<br><div class='jBlog_time'><a href=\""
 					. $jBlog['jBlogHTTPPath']
@@ -361,7 +361,7 @@
 ?>
     <tr>
     <td class="jBlog_comment">
-    <a name="comment<?=$comment['id']?>"></a>
+    <a name="c<?=$comment['id']?>"></a>
     <?=nl2br($comment['body'])?><br />
 	<div class="jBlog_comment_source">
     <?=$type?> <?=($link ? "<a href=\"$link\">$name</a>" : $name)?> on 
@@ -455,22 +455,23 @@
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
-            echo "<link>{$jBlog['baseURL']}e_" . $entry['id'] . ".html</link>\n";
+            echo "<link>{$jBlog['baseURL']}e_{$entry['id']}.html</link>\n";
             if ($version == '2.0') {
                 echo "<content:encoded>\n";
                 echo utf8_encode(htmlspecialchars(jBlog_emoticate(jBlog_markup_text($entry['body']))));
                 echo "\n</content:encoded>\n";
-                echo '<dc:date>' . date("Y-m-d\Th:i:s", $entry['timestamp']) . "</dc:date>\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 "<exo:references>\n";
+                    echo "<robot:references>\n";
                     foreach ($references as $reference) {
                         echo "<reference>\n";
-                        echo "<link>{$reference['link']}</link>\n";
                         echo "<name>{$reference['name']}</name>\n";
+                        echo "<link>{$reference['link']}</link>\n";
                         echo "</reference>\n";
                     }
-                    echo "</exo:references>\n";
+                    echo "</robot:references>\n";
                 }
             } else {
                 echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
@@ -527,7 +528,6 @@
 */
 function jBlog_emoticate($str) {
 	global $jBlog;
-
 
 	foreach ($jBlog["smiles"] as $key => $value) {
 		$str = str_replace($key, "<img src=\"$value\" />", $str);

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/rss.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rss.php	6 Mar 2003 15:31:01 -0000	1.2
+++ rss.php	10 Mar 2003 03:47:27 -0000	1.3
@@ -7,17 +7,32 @@
 if (empty($version)) {
     $version = '0.91';
 }
+
+$description = $jBlog['blogDescription'];
+$title = $jBlog['blogTitle'];
+switch ($type) {
+case 'comments':
+    $entries = jBlog_fetchComments(null, true, 15);
+    $title = $title . ' Comments';
+    $description = 'Comments from ' . $description;
+    break;
+case 'content':
+default:
+    $entries = jBlog_fetchEntries(null, true, 15);
+    break;
+}
+
 echo '<?xml version="1.0" encoding="iso-8859-1" ?>';
 echo "\n";
 switch ($version) {
 case '0.91':
     print <<<HEAD
 <rss version="0.91"
-  xmlns:exo="http://www.edwardbear.org/def/xml/exo">
+  xmlns:robot="http://www.edwardbear.org/def/xml/robot">
 <channel>
-<title>{$jBlog['blogTitle']}</title>
+<title>$title</title>
 <link>{$jBlog['baseURL']}</link>
-<description>{$jBlog['blogDescription']}</description>
+<description>$description</description>
 
 HEAD;
 break;
@@ -29,7 +44,7 @@
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
-   xmlns:exo="http://www.edwardbear.org/def/xml/exo">
+   xmlns:robot="http://www.edwardbear.org/def/xml/robot">
 <channel>
 <title>{$jBlog['blogTitle']}</title>
 <link>{$jBlog['baseURL']}</link>
@@ -42,7 +57,6 @@
     die("Invalid RSS version specified\n");
 }
 
-$entries = jBlog_fetchEntries(null, true, 15);
 jBlog_printEntries_rss($entries, $version);
 
 switch ($version) {

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

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

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

Modified Files:
	jBlog_plugin_api.php 
Log Message:
Fix speling


Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_plugin_api.php	10 Mar 2003 02:13:38 -0000	1.1
+++ jBlog_plugin_api.php	10 Mar 2003 02:20:53 -0000	1.2
@@ -143,7 +143,7 @@
 	 * about your plugin.
 	 * You need to override this method in your child class.
 	 */
-	function instrospect(&$propbag)
+	function introspect(&$propbag)
 	{
 		$propbag->add('copyright',	'MIT License');
 		$propbag->add('name',		get_class($this));
@@ -165,7 +165,7 @@
 	 * You need to override this method in your child class if
 	 * you have configuration options.
 	 */
-	function instrospect_config_item($name, &$propbag)
+	function introspect_config_item($name, &$propbag)
 	{
 		return false;
 	}

[php-blog-cvs] jBlog jBlog_admin_plugins.inc.php,NONE,1.1 jBlog_plugin_api.php,NONE,1.1 jBlog_sidebar_items.php,NONE,1.1 db.sql,1.11,1.12 jBlog_admin.php,1.11,1.12 jBlog_admin_installer.inc.php,1.8,1.9 jBlog_functions.inc.php,1.38,1.39 jBlog_layout.php,1.10,1.11

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

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

Modified Files:
	db.sql jBlog_admin.php jBlog_admin_installer.inc.php 
	jBlog_functions.inc.php jBlog_layout.php 
Added Files:
	jBlog_admin_plugins.inc.php jBlog_plugin_api.php 
	jBlog_sidebar_items.php 
Log Message:
Implement plugin api.
For the moment, only built-in plugins are supported, although adding support
for third-party plugins is not far away.

Upgrade notes: (the installation should cover these anyway):

CREATE TABLE {PREFIX}plugins (
	name varchar(128) not null,
	placement enum ('left', 'right', 'hide') not null default 'right',
	sort_order int(4) not null,
	PRIMARY KEY(name)
);

mkdir plugins
chmod appropriate_perms plugins

visit http://yourblog/jBlog_admin.php, click on "Configure Plugins"
(this will register the built-in plugins; this is done at install time,
but you need to bootstrap if you upgraded with reinstalling from scratch).

What works:
You can change the positioning left, right or hidden of each plugin.

What can be implemented now:
You can also change the order in which the plugins appear within their
side bars; if you can be bothered to hack together one of those sortable
listbox thingies, just update the sort_order field of jBlog_plugins.

What I will implement later this week, unless someone beats me to it:
Upload third party plugin; plugin gets its own dir; the dir name is the
name field in the jBlog_plugins table.
Loading this kind of plugin does an include "plugins/name/name.php" then
does a new $name;

Easy.
You might want to steal my CSS again (updating it shortly).



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

include_once "jBlog_plugin_api.php";
include_once "jBlog_sidebar_items.php";

/* Temporary hack to ease dev's lives:
 * Force registration of the built-in plugins for now */
jblog_plugin_api::register_default_plugins();

if (isset($_POST['jBlog']['placement'])) {
	foreach ($_POST['jBlog']['placement'] as $plugin_name => $placement) {
		jblog_plugin_api::update_plugin_placement(
			addslashes($plugin_name),
			addslashes($placement)
			);
	}

}

/* very simple configuration for the moment; just change the placement */
$plugins = jblog_plugin_api::enum_plugins();

?>
<form action="?jBlog[adminModule]=plugins" method="post">
<table border="1" cellpadding="5">
<tr>
<th>Plugin</th>
<th>Description</th>
<th>Placement</th>
</tr>
<?php

function placement_box($name, $val)
{
	static $opts = array(
		'left' => 'Left',
		'right' => 'Right',
		'hide' => 'Hidden'
		);

	$x = "<select name=\"$name\">";
	foreach ($opts as $k => $v) {
		$x .= "<option value=\"$k\"";
		if ($k == $val)
			$x .= " selected";
		$x .= ">$v</option>";
	}
	return $x . "</select>";
}

foreach ($plugins as $plugin_data) {
	$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);

	/* query for its name, description and configuration data */
	$bag = new jBlog_property_bag;
	$plugin->introspect($bag);

	$name = htmlentities($bag->get('name'));
	$desc = htmlentities($bag->get('description'));
	$place = placement_box("jBlog[placement][" . $plugin_data['name'] . "]", $plugin_data['placement']);
	if ($bag->is_set('configuration')) {
		$url = "#fixme";
		$desc = "<a href=\"$url\">$desc</a>";
		$name = "<a href=\"$url\">$name</a>";
	}

	echo "<tr><td>$name</td><td>$desc</td><td>$place</td></tr>\n";
}
?>
</table>
<input type="submit" name="SAVE" value="Save">
</form>

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

/* This file defines the plugin API for jBlog.
 * By extending these classes, you can add your own code
 * to appear in the sidebar(s) of jBlog.
 */



class jblog_plugin_api {

	function register_default_plugins()
	{
		jblog_plugin_api::register_plugin(array(
					'jBlog_calendar_plugin',
					'jBlog_quicksearch_plugin',
					'jBlog_archives_plugin',
					'jBlog_topreferrers_plugin',
					'jBlog_syndication_plugin',
					'jBlog_superuser_plugin',
					'jBlog_plug_plugin',
					));
	}

	/* This should be used for built-in plugins only.
	 * run-time registration of an existing class as a plugin */
	function register_plugin($class_names)
	{
		global $jBlog;
	
		if (!is_array($class_names)) {
			$class_names = array($class_names);
		}

		foreach ($class_names as $class_name) {
			/* is it already registered ? */
			$reg = jBlog_db_query("SELECT * from $jBlog[dbPrefix]plugins where name='@$class_name'", true);
			if ($reg === false) {
				/* no, so register it */
				jBlog_db_query("INSERT INTO $jBlog[dbPrefix]plugins (name) values ('@$class_name')");
			}
		}
	}
	
	/* Retrieves a list of plugin records */
	function enum_plugins($filter = '*')
	{
		global $jBlog;
		$sql = "SELECT * from $jBlog[dbPrefix]plugins ";
		if ($filter !== '*') {
			$sql .= "WHERE placement='$filter' ";
		}
		$sql .= " ORDER BY placement, sort_order";

		return jBlog_db_query($sql);
	}

	/* Creates an instance of a named plugin */
	function &load_plugin($name)
	{
		if ($name{0} == '@') {
			$class_name = substr($name, 1);
		} else {
			/* plugin from the plugins/ dir */

			return false;
		}

		$p =& new $class_name;
		return $p;
	}

	function update_plugin_placement($name, $placement, $order=null)
	{
		global $jBlog;
		$sql = "UPDATE $jBlog[dbPrefix]plugins set placement='$placement' ";
		if ($order !== null) 
			$sql .= ", sort_order=$order ";
		$sql .= "WHERE name='$name'";
		return jBlog_db_query($sql);
	}

	function generate_plugins($side)
	{
		$plugins = jblog_plugin_api::enum_plugins($side);
		if (!is_array($plugins))
			return;
		echo "<td class=\"jBlog" . ucfirst($side) . "SideBar\" valign=\"top\">\n";
		foreach ($plugins as $plugin_data) {
			$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);
			$title = get_class($plugin);
			ob_start();
			$plugin->generate_content($title);
			$content = ob_get_contents();
			ob_end_clean();
			echo "<div class=\"jBlogSideBarItem\"><div class=\"jBlogSideBarTitle\">$title</div><div class=\"jBlogSideBarContent\">$content</div></div>\n";
		}
		echo "</td>\n";
	}

}

/* holds a bunch of properties; you can have multiple
 * properties with the same name */
class jBlog_property_bag {
	var $properties = array();
	var $name = null;

	function add($name, $value)
	{
		$this->properties[] = array(
			'name' => $name,
			'value' => $value
			);
	}

	function get($name)
	{
		$v = array();
		foreach ($this->properties as $data) {
			if ($data['name'] == $name) {
				$v[] = $data['value'];
			}
		}
		return implode(", ", $v);
	}

	function is_set($name)
	{
		foreach ($this->properties as $data) {
			if ($data['name'] == $name) {
				return true;
			}
		}
		return false;
	}
}

class jBlog_plugin {
	
	/* Called by jBlog when it wants to display information
	 * about your plugin.
	 * You need to override this method in your child class.
	 */
	function instrospect(&$propbag)
	{
		$propbag->add('copyright',	'MIT License');
		$propbag->add('name',		get_class($this));

//		$propbag->add('configuration', array(
//			'text field',
//			'foo bar'
//			));
		return true;
	}

	/* Called by jBlog when it wants to display the configuration
	 * editor for your plugin.
	 * $name is the name of a configuration item you added in
	 * your instrospect method.
	 * You need to fill the property bag with appropriate items
	 * that describe the type and value(s) for that particular
	 * configuration option.
	 * You need to override this method in your child class if
	 * you have configuration options.
	 */
	function instrospect_config_item($name, &$propbag)
	{
		return false;
	}

	/* Called by jBlog when it wants your plugin to display itself.
	 * You need to set $title to be whatever text you want want to
	 * appear in the item caption space.
	 * Simply echo/print your content to the output; jBlog will
	 * capture it and make things work.
	 * You need to override this method in your child class.
	 */
	function generate_content(&$title)
	{
		$title = "Sample!";
		echo "This is a sample!";
	}

	/* Fetches a configuration value for this plugin */
	function get_config($name, $defaultvalue = null)
	{
		$name = get_class($this) . ":" . $name;
		return jBlog_get_config_var($name, $defaultvalue);
	}

}

?>

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

class jBlog_calendar_plugin extends jBlog_plugin {
	
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Calendar');
		$propbag->add('description', 'QuickJump Calendar');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Quickjump:";
		if (!$jBlog["GET"]["calendarZoom"]) {
			if (!$jBlog["GET"]["range"]) {
				$jBlog["GET"]["calendarZoom"] = date("Y").date("m");
			}
			else {
				$jBlog["GET"]["calendarZoom"] = $jBlog["GET"]["range"];
			}
		}
		jBlog_drawCalendar(substr($jBlog["GET"]["calendarZoom"], 4, 2),
				substr($jBlog["GET"]["calendarZoom"], 0,4));

	}
}

class jBlog_quicksearch_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Quicksearch');
		$propbag->add('description', 'Search for an entry');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Quicksearch:";

	    echo "<form action=\"$jBlog[jBlogHTTPPath]search.php\" METHOD=\"GET\">\n"
		.	"<input type=\"hidden\" name=\"jBlog[action]\" value=\"search\">\n"
		.	"<INPUT TYPE=\"TEXT\" name=\"jBlog[searchTerm]\" ONFOCUS=\"value='';\">\n"
		.	"</form>";
	}
}

class jBlog_archives_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Archives');
		$propbag->add('description', 'Browse archives by month');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Archives:";
		$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
		for($x=0; $x<3; $x++) {
			$ts-=1;
			if ($jBlog["rewrite"] === true)
				$link = $jBlog["jBlogHTTPPath"]."archives/d_".date("Ym", $ts).".html";
			else
				$link = "fixme";
			echo "<a href='$link'>".$jBlog["months"][date("n", $ts)]." ".date("Y", $ts)."</a><br />";
			$ts = mktime(0,0,0,date("m", $ts), 1, date("Y", $ts));

		}
		echo "<a href='?jBlog[action]=archives'>Older...</a>";
	}
}

class jBlog_topreferrers_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Top Referrers');
		$propbag->add('description', 'Shows top sites that linked to your blogs');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Top Referrers";
		echo jBlog_displayTopReferrers();
	}
}

class jBlog_syndication_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Syndication');
		$propbag->add('description', 'Shows RSS syndication links');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Syndicate This Blog";
?>
            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'>RSS 0.91 feed</a> 
            <br/>
            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a> 
<?php
	}
}

class jBlog_superuser_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Superuser');
		$propbag->add('description', 'Allows you to configure and publish your blog');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "Superuser:";
		echo "<a href=\"$jBlog[jBlogHTTPPath]jBlog_admin.php\">\$ su -</a>";
	}
}

class jBlog_plug_plugin extends jBlog_plugin {
	function introspect(&$propbag)
	{
		$propbag->add('name',	'Plug');
		$propbag->add('description', 'Advertises the origins of your blog');
	}

	function generate_content(&$title)
	{
		global $jBlog;

		$title = "";
		echo "<div class=\"jBlogPlug\">This blog powered by <a href=\"http://sourceforge.net/projects/php-blog\">jBlog</a>!</div>";
	}
}



?>

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- db.sql	6 Mar 2003 20:16:30 -0000	1.11
+++ db.sql	10 Mar 2003 02:13:37 -0000	1.12
@@ -95,4 +95,9 @@
   unique key (url, ip)
 ) TYPE=MyISAM;
 
-
+CREATE TABLE {PREFIX}plugins (
+	name varchar(128) not null,
+	placement enum ('left', 'right', 'hide') not null default 'right',
+	sort_order int(4) not null,
+	PRIMARY KEY(name)
+);

Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- jBlog_admin.php	9 Mar 2003 02:27:55 -0000	1.11
+++ jBlog_admin.php	10 Mar 2003 02:13:37 -0000	1.12
@@ -78,6 +78,7 @@
 					<div class="jBlogSideBarTitle">Appearance:</div>
 					<div class="jBlogSideBarContent">
                     &bull; <a href='?jBlog[adminModule]=css'>Manage css</a><br>
+                    &bull; <a href='?jBlog[adminModule]=plugins'>Configure Plugins</a><br>
 					</div>
 					</div>
 
@@ -111,6 +112,10 @@
 							case "css":
 								include("jBlog_admin_css.inc.php");
                             break;
+
+							case "plugins":
+								include "jBlog_admin_plugins.inc.php";
+								break;
 
 							case "logout":
 								session_destroy();

Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog_admin_installer.inc.php	6 Mar 2003 01:25:59 -0000	1.8
+++ jBlog_admin_installer.inc.php	10 Mar 2003 02:13:37 -0000	1.9
@@ -178,6 +178,14 @@
             $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["jBlogPath"]."archives</i>";
         }
 
+		// Attempt to create the plugins dir
+		if (!is_dir($_POST['jBlogPath'] . "plugins") &&
+			@mkdir($_POST['jBlogPath'] . "plugins", 0770) !== true) {
+			$errs[] = "Couldn't create the plugins directory, you do it.";
+            $errs[] = "&nbsp;-&gt; Run <i>mkdir ".$_POST["jBlogPath"]."</i>";
+            $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["jBlogPath"]."plugins</i>";
+		}
+
 		// Check imagick
         if ($_POST["magick"] == "true" && !is_executable($_POST["convert"])) {
 			$errs[] = "Can't execute convert binary!";
@@ -256,7 +264,10 @@
                     if (!mysql_query($query)) {
 						echo mysql_error();
 					}
-					
+				
+					/* register default plugins */
+					include_once "jBlog_plugin_api.php";
+					jblog_plugin_api::register_default_plugins();
 
                     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.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- jBlog_functions.inc.php	9 Mar 2003 11:45:55 -0000	1.38
+++ jBlog_functions.inc.php	10 Mar 2003 02:13:38 -0000	1.39
@@ -1215,6 +1215,43 @@
     <?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;
 

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_layout.php	7 Mar 2003 23:58:31 -0000	1.10
+++ jBlog_layout.php	10 Mar 2003 02:13:38 -0000	1.11
@@ -9,6 +9,8 @@
 #                                                                        #
 ##########################################################################
 include_once("jBlog_config.inc.php");
+include_once("jBlog_plugin_api.php");
+include_once("jBlog_sidebar_items.php");
 
 // This is a sample layout file for jBlog! You can adjust it to your needs
 // or, if you have a more complex layout, use the functions as seen in this
@@ -39,9 +41,14 @@
     }
 ?>
 </table>
-<table class="jBlog" cellpadding="20">
+<table class="jBlog">
 	<tr>
-    	<td class="jBlogLeftBox" valign="top">
+
+<?php
+	jblog_plugin_api::generate_plugins('left');
+?>
+		
+    	<td class="jBlogEntriesBox" valign="top">
 			<?php
                	if (!is_numeric($jBlog["GET"]["range"]))
 	               	$jBlog["GET"]["range"] = date("Ymd");
@@ -72,85 +79,10 @@
                 }
             ?>
         </td>
-        <td class="jBlogRightBox" valign="top">
-            <div class="jBlogSideBarItem">
-        	<div class="jBlogSideBarTitle">Quickjump:</div>
-			<div class="jBlogQuickJump">
-			<?php
-				// Draw the calendar
-                if (!$jBlog["GET"]["calendarZoom"]) {
-					if (!$jBlog["GET"]["range"]) {
-						$jBlog["GET"]["calendarZoom"] = date("Y").date("m");
-                    }
-                    else {
-						$jBlog["GET"]["calendarZoom"] = $jBlog["GET"]["range"];
-                    }
-                }
-				jBlog_drawCalendar(substr($jBlog["GET"]["calendarZoom"], 4, 2),
-                                   substr($jBlog["GET"]["calendarZoom"], 0,4));
-            ?><br />
-			</div>
-			</div>
-			
-            <div class="jBlogSideBarTitle">Quicksearch:</div>
-            <div class="jBlogSideBarContent">
-            <form action="<?=$jBlog['jBlogHTTPPath'] ?>search.php" METHOD="GET">
-            	<input type="hidden" name="jBlog[action]" value="search">
-				<INPUT TYPE="TEXT" name="jBlog[searchTerm]" ONFOCUS="value='';">
-            </form>
-			</div>
-			</div>
-			
-            <div class="jBlogSideBarItem">
-            <div class="jBlogSideBarTitle">Archives:</div>
-            <div class="jBlogSideBarContent">
-			<?php
-            	$ts = mktime(0,0,0,(date("m")+1), 1, date("Y"));
-				for($x=0; $x<3; $x++) {
-                	$ts-=1;
-                    if ($jBlog["rewrite"] === true)
-                    	$link = $jBlog["jBlogHTTPPath"]."archives/d_".date("Ym", $ts).".html";
-                    else
-                    	$link = "fixme";
-					echo "<a href='$link'>".$jBlog["months"][date("n", $ts)]." ".date("Y", $ts)."</a><br />";
-                    $ts = mktime(0,0,0,date("m", $ts), 1, date("Y", $ts));
-                }
-            ?>
-            <a href='?jBlog[action]=archives'>Older...</a>
-			</div>
-			</div>
-
-            <div class="jBlogSideBarItem">    
-			<div class="jBlogSideBarTitle">Top Referrers</div>
-            <div class="jBlogSideBarContent">
-            <?= jBlog_displayTopReferrers() ?>
-            </div>
-            </div>
-
-            <div class="jBlogSideBarItem">    
-			<div class="jBlogSideBarTitle">Syndicate This Blog</div>
-            <div class="jBlogSide">
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'>RSS 0.91 feed</a> 
-            <br/>
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a> 
-            <br/>
-            </div>
-            </div>
-
-            <div class="jBlogSideBarItem">
-			<div class="jBlogSideBarTitle">Superuser:</div>
-            <div class="jBlogSideBarContent">
-            <a href="<?=$jBlog['jBlogHTTPPath']?>jBlog_admin.php">$ su -</a>
-			<br />
-			<br />
-			</div>
-			</div>
+<?php
+	/* Find any plugins for the RHS */
+	jblog_plugin_api::generate_plugins('right');
 
-			<div class="jBlogPlug">
-				This blog powered by <a href="http://sourceforge.net/projects/php-blog">jBlog</a>!
-			</div>
-        </td>
+?>
     </tr>
 </table>

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.37,1.38

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Top referrers at the top...


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- jBlog_functions.inc.php	8 Mar 2003 01:54:06 -0000	1.37
+++ jBlog_functions.inc.php	9 Mar 2003 11:45:55 -0000	1.38
@@ -1296,7 +1296,7 @@
     $query = "SELECT url, sum(count) total
               FROM $jBlog[dbPrefix]referrers
               GROUP BY url
-              ORDER BY total";
+              ORDER BY total desc";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     if($num_rows = mysql_num_rows($cursor)) {
         while($row = mysql_fetch_assoc($cursor)) {

[php-blog-cvs] jBlog jBlog_admin.php,1.10,1.11 jBlog_admin_entries.inc.php,1.4,1.5 jBlog_admin_images.inc.php,1.2,1.3

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

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

Modified Files:
	jBlog_admin.php jBlog_admin_entries.inc.php 
	jBlog_admin_images.inc.php 
Log Message:
CSS-ify the admin section, and rearrange the links slightly.
(See my stylesheet for ideas).



Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_admin.php	6 Mar 2003 01:15:18 -0000	1.10
+++ jBlog_admin.php	9 Mar 2003 02:27:55 -0000	1.11
@@ -17,50 +17,81 @@
         <link rel="stylesheet" type="text/css" href="jBlog.css.php">
     </head>
     <body>
-       <table height="100%" width="100%"><tr><td valign="top" align="left" class="jBlogGreyBox" height="100%" width="100%">
-       <div styles='border:1px solid #cdcdcd;'>
-        <?php
-        // User has to log in
-        if ($_SESSION["jBlogAuthedUser"] !== true && file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
-            ?>
-            You have to be logged on to view this page:
-            <form action="?" method="post">
-                <input type="hidden" name="jBlog[action]" value="admin">
-                <input type="text" value="username" name="jBlog[user]" onfocus="value='';">
-                <input type="password" value="password" name="jBlog[pass]" onfocus="value='';">
-                <input type="submit" value="&gt;">
-            </form>
-            <?php
-        }
+	<table class="jBlog_banner">
+		<tr>
+			<td><?= htmlentities($jBlog['blogTitle']) ?></td>
+		</tr>
+<?php if($jBlog['blogSubTitle']) { ?>
+			<td class="jBlog_subbanner"><?= $jBlog['blogSubTitle'] ?></td> 
+<?php } else { ?>
+			<td class="jBlog_subbanner"><?= $jBlog['blogDescription'] ?></td> 
+		</tr>
+<?php } ?>
+	</table>
 
-        // User just installed jBlog, let him go to configure mode
-        elseif (!file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
-        	echo "<div class='jBlog_date'>jBlog klickibunti Installation</div><p>";
-			//echo "<b>Your jBlog_config_local.inc.php does not exist, please configure jBlog:</b><br>";
+<?php
+	// User has to log in
+	if ($_SESSION["jBlogAuthedUser"] !== true
+		&& file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
+?>
+		<div class='jBlog_auth_required'>
+		You have to be logged on to view this page:
+		<form action="?" method="post">
+			<input type="hidden" name="jBlog[action]" value="admin">
+			<input type="text" value="username" name="jBlog[user]" onfocus="value='';">
+			<input type="password" value="password" name="jBlog[pass]" onfocus="value='';">
+			<input type="submit" value="&gt;">
+		</form>
+		</div>
+<?php
+	} elseif (!file_exists($jBlog["jBlogPath"]."jBlog_config_local.inc.php")) {
+	   	// User just installed jBlog, let him go to configure mode
+   		echo "<div class='jBlog_date'>jBlog klickibunti Installation</div><p>";
             include("./jBlog_admin_installer.inc.php");
-        }
-
+	} else {
         // User is logged in
-        else {
-        ?>
+?>
 
         <table>
-            <tr>
-                <td valign="top" style="width:150px" nowrap='nowrap'>
-                    <b>jBlog Admin:</b><br>
-                    &bull; <a href='?jBlog[adminModule]=installer'>Configuration</a></br>
+            <tr valign="top">
+                <td class="jBlogSideBar">
+
+					<div class="jBlogSideBarItem">
+					<div class="jBlogSideBarTitle">Entries:</div>
+					<div class="jBlogSideBarContent">
                     &bull; <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=new'>New entry</a><br>
                     &bull; <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=editSelect'>Edit entries</a><br>
                     &bull; <a href='?jBlog[adminModule]=entries&jBlog[adminAction]=deleteSelect'>Delete entries</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>
                     &bull; <a href='?jBlog[adminModule]=images'>Manage images</a><br>
+                    &bull; <a href='?jBlog[adminModule]=images&jBlog[adminAction]=genThumbs' onClick="return confirm('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
+					</div>
+					</div>
+
+					<div class="jBlogSideBarItem">
+					<div class="jBlogSideBarTitle">Appearance:</div>
+					<div class="jBlogSideBarContent">
                     &bull; <a href='?jBlog[adminModule]=css'>Manage css</a><br>
-					&bull; <a href='?jBlog[adminModule]=images&jBlog[adminAction]=addSelect'>Add images</a><br>
-                    &bull; <a href='?jBlog[adminModule]=images&jBlog[adminAction]=genThumbs' onClick="alert('WARNING:\nThis may take a long time if there are many images without thumbnails.');">Create Thumbs</a><br>
+					</div>
+					</div>
+
+					<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>
+					</div>
+					</div>
                 </td>
-                <td align="left" valign="top">
-                    <div class='jBlog_date' width='100%'>jBlog adminSuite</div>
+                <td class="jBlog_admin">
+                    <div class='jBlog_admin_title'>jBlog adminSuite</div>
                     <?php
                     	if (!$jBlog["GET"]["adminModule"]) $jBlog["GET"]["adminModule"] = $jBlog["POST"]["adminModule"];
                         switch($jBlog["GET"]["adminModule"]) {
@@ -97,8 +128,6 @@
         <?php
         }
         ?>
-			</div>
-			</td></tr></table>
 
     </body>
 </html>

Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_admin_entries.inc.php	5 Mar 2003 04:22:13 -0000	1.4
+++ jBlog_admin_entries.inc.php	9 Mar 2003 02:27:55 -0000	1.5
@@ -23,17 +23,20 @@
     $entries = jBlog_fetchEntries(false, false, $jBlog["GET"]["offset"].", $perPage");
 
     // Prepare table
-	echo "<b>".ucfirst($action).":</b><br><table width='100%'>";
+	echo "<div class='jBlog_admin_list'>";
+	echo "<div class='jBlog_admin_list_title'>".ucfirst($action)." Entries:</div>";
+	echo "<table width='100%' class='jBlog_admin_list'>";
+	
     $half = (int) ((count($entries) + 1)/2);
 
 	// Print the browse buttons
     echo "<tr><td align='left'>";
     if ($jBlog["GET"]["offset"] > 0) {
-		echo '<input type="button" value="<<<" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.max(0,($jBlog["GET"]["offset"]-$perPage)).'\';">';
+		echo '<input type="button" value="&lt;&lt;&lt;" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.max(0,($jBlog["GET"]["offset"]-$perPage)).'\';">';
     }
-	echo "</td><td></td><td align='right'>";
+	echo "</td><td align='right'>";
     if (count($entries) == $perPage) {
-    	echo '<input type="button" value=">>>" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.($jBlog["GET"]["offset"]+$perPage).'\';">';
+    	echo '<input type="button" value="&gt;&gt;&gt;" onClick="location.href=\'?jBlog[adminModule]=entries&jBlog[adminAction]='.$jBlog["GET"]["adminAction"].'&jBlog[offset]='.($jBlog["GET"]["offset"]+$perPage).'\';">';
     }
 	echo "</td></tr>";
     // Print the entries
@@ -41,14 +44,13 @@
 	for ($x=0; $x<$half; $x++) {
         ?>
 		<tr>
-		<td>
+		<td class="jBlog_admin_list_item">
         <?= 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>
+		<td class="jBlog_admin_list_item">
         <?php if ($x + $half < $count) {  ?>
         <?= 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"] ?>'>
@@ -59,7 +61,7 @@
         </tr>
 <?php         
     }
-    echo "</table>";
+    echo "</table></div>";
 }
 
 

Index: jBlog_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_images.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_admin_images.inc.php	6 Mar 2003 21:11:38 -0000	1.2
+++ jBlog_admin_images.inc.php	9 Mar 2003 02:27:55 -0000	1.3
@@ -27,6 +27,8 @@
         }
     //-->
     </script>
+	<div class="jBlog_admin_list">
+	<div class="jBlog_admin_list_title">Image manager:</div>
     <?php
 
     if ($start > 0) {
@@ -37,7 +39,7 @@
         $right = "<input type='button' value='>>>' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=$end&end=" . ($end + $inc) . "'\">\n";
     }
 
-    echo "<table>";
+    echo "<table class='jBlog_admin_list'>";
 	echo "<tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr><tr>";
     for ($x=0; $x<count($files); $x++) {
 
@@ -45,15 +47,14 @@
     	$f = jBlog_parseFileName($files[$x]);
         $i = getimagesize($jBlog["jBlogPath"].$jBlog["uploadPath"]."/".$files[$x]);
 
+		echo "<td class='jBlog_admin_list_item'>";
+
         // Display a thumbnail?
         if (file_exists($jBlog["jBlogPath"] . $jBlog["uploadPath"] . $f[0] . "." . $jBlog["thumbSuffix"] . "." . $f[1])) {
-        	echo "<td height='".$jBlog["thumbSize"]."' align='center' valign='middle'>";
-			echo "<img src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
-        	echo "</td>";
+			echo "<img align='left' src='".$jBlog['jBlogHTTPPath'] . $jBlog["uploadHTTPPath"].$f[0].".".$jBlog["thumbSuffix"].".".$f[1]."' hspace='15'>";
         }
 
         // Display image name and resolution
-		echo "<td nowrap='nowrap' valign='top'>";
 		echo "<b>".$files[$x]."</b><br>";
         echo $i[0]."x".$i[1]."<br>";
 
@@ -65,10 +66,10 @@
         echo "</td>";
 
         // Linebreak?
-        if (($x+1)%3 == 0) echo "</tr><tr>";
+        if (($x+1)%2 == 0) echo "</tr><tr>";
     }
     echo "</tr><tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr>";
-    echo "</table>";
+    echo "</table></div>";
 
 }
 
@@ -242,7 +243,6 @@
     break;
 
 	default:
-    	echo "<b>Image manager:</b><p>";
         if (isset($_GET['start'])) {
   		    jBlog_displayImageList($_GET['start'], $_GET['end'] ? $_GET['end'] : NULL);
         } else {

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

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

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

Modified Files:
	comment.php jBlog_functions.inc.php 
Log Message:
pingbacks can be recieved now.  largely untested


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- comment.php	7 Mar 2003 19:32:43 -0000	1.7
+++ comment.php	8 Mar 2003 01:54:05 -0000	1.8
@@ -21,6 +21,12 @@
         report_trackback_failure();
     }
 } else if ($type == 'pingback') {
+    if(add_pingback($_POST['entry_id'],$HTTP_RAW_POST_DATA)) {
+        report_pingback_success();
+    }
+    else {
+        report_pingback_failure();
+    }
 } else {
 $id = $jBlog['GET']['entry_id'];
 ?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- jBlog_functions.inc.php	7 Mar 2003 23:55:24 -0000	1.36
+++ jBlog_functions.inc.php	8 Mar 2003 01:54:06 -0000	1.37
@@ -678,6 +678,24 @@
     return 1;
 } 
 
+function
+add_pingback ($id, $postdata)
+{   
+    global $jBlog;
+
+    if(preg_match('@<methodcall>\s*<methodName>\s*pingback.ping\s*</methodName>\s*<params>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*<param>\s*<value>\s*<string>([^<])*</string>\s*</value>\s*</param>\s*</params>\s*</methodCall>@i', $postdata, $matches)) {
+        $remote = $matches[1];
+        $local  = $matches[2];
+        $comment['title'] = '';
+        $comment['url'] = $remote;
+        $comment['comment'] = '';
+        $comment['name'] = ''; 
+        jBlog_saveComment($id, $comment, 'PINGBACK');
+        return 1;
+    }
+    return 0;
+} 
+
 /**
  * Cut text
  */
@@ -708,6 +726,31 @@
 FAILURE;
 }
 
+function report_pingback_success ()
+{   
+print <<<SUCCESS
+<?xml version="1.0"?>
+<methodResponse>
+   <params>
+      <param>
+         <value><string>success</string></value>
+         </param>
+      </params>
+   </methodResponse>
+SUCCESS;
+}
+
+function report_pingback_failure ()
+{
+print <<<FAILURE
+<?xml version="1.0"?>
+<methodResponse>
+    <fault>
+    <value><i4>0</i4></value>
+    </fault>
+</methodResponse>
+FAILURE;
+}
 
 /**
  * search through link body, and automatically send a trackback ping.

[php-blog-cvs] jBlog jBlog_layout.php,1.9,1.10

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

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

Modified Files:
	jBlog_layout.php 
Log Message:
Fix xml images for archive pages


Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jBlog_layout.php	6 Mar 2003 17:38:48 -0000	1.9
+++ jBlog_layout.php	7 Mar 2003 23:58:31 -0000	1.10
@@ -130,10 +130,10 @@
             <div class="jBlogSideBarItem">    
 			<div class="jBlogSideBarTitle">Syndicate This Blog</div>
             <div class="jBlogSide">
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'><img src="xml.gif" border=0></a> 
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
             <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php'>RSS 0.91 feed</a> 
             <br/>
-            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'><img src="xml.gif" border=0></a> 
+            <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $jBlog['jBlogHTTPPath'] ?>xml.gif" border=0></a> 
             <a href='<?= $jBlog['jBlogHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a> 
             <br/>
             </div>

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.35,1.36

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Show body as well as the extended entry when showing the extended entry


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- jBlog_functions.inc.php	7 Mar 2003 19:48:35 -0000	1.35
+++ jBlog_functions.inc.php	7 Mar 2003 23:55:24 -0000	1.36
@@ -261,7 +261,7 @@
 			
 			echo "<div class='jBlog_entry'>";
 			if ($extended && strlen($entry['extended'])) {
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry["extended"])));
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'] . $entry["extended"])));
 			} else {
                 echo nl2br(jBlog_emoticate(jBlog_markup_text($entry["body"])));
 			}

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.34,1.35

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
logix fix for tb/pb auto-discovery


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- jBlog_functions.inc.php	7 Mar 2003 19:36:34 -0000	1.34
+++ jBlog_functions.inc.php	7 Mar 2003 19:48:35 -0000	1.35
@@ -561,7 +561,7 @@
  * validate trackback response
  */
 function
-jBlog_trackback_is_success($resp, $data, $final=0)
+jBlog_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
         if ((int) $matches[1]) {
@@ -575,11 +575,6 @@
             }
         }
     }
-    else if($final == 0) {
-        if(preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $resp, $matches)) {
-            return jBlog_trackback_is_success(_jBlog_send($matches[2], $data), 1);
-        }
-    }
     return 1;
 }
 
@@ -644,16 +639,27 @@
 }
 
 function
-jBlog_trackback_send($loc, $url, $author, $title, $text)
+jBlog_trackback_autodiscover($res, $url, $author, $title, $text)
 {
+    if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $res, $matches)) {
+        return;
+    }
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
-    $res = _jBlog_send($loc, $data);
-    $response = jBlog_trackback_is_success($res, $data);
-    jBlog_pingback_autodiscover($loc, $res);
+    $response = jBlog_trackback_is_success(_jBlog_send($matches[2], $data));
     return $response;
 }
 
+function jBlog_reference_autodiscover($loc, $url, $author, $title, $text) {
+    $fp = fopen($loc, "r");
+    while(!feof($fp)) {
+        $res .= fgets($fp, 1024);
+    }
+    fclose($fp);
+    jBlog_trackback_autodiscover($res, $url, $author, $title, $text);
+    jBlog_pingback_autodiscover($loc, $res);
+}
+
 /**
  *
  */
@@ -733,8 +739,7 @@
         if ($row[0] > 0) {
             continue;
         }
-
-        jBlog_trackback_send($locations[$i], $url, $author, $title, jBlog_trackback_excerpt($text));
+        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'");
 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.33,1.34

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
remove extraeneous var_dump()


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- jBlog_functions.inc.php	7 Mar 2003 19:32:43 -0000	1.33
+++ jBlog_functions.inc.php	7 Mar 2003 19:36:34 -0000	1.34
@@ -397,7 +397,6 @@
               WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
-    var_dump(mysql_error());
     $row = mysql_fetch_assoc($cursor);
     if($row['mail_comments']) {
         jBlog_sendComment($row['email'], $name, $email, $url, $id, 

[php-blog-cvs] jBlog comment.php,1.6,1.7 jBlog_functions.inc.php,1.32,1.33

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

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

Modified Files:
	comment.php jBlog_functions.inc.php 
Log Message:
fix autodiscovery in the comments


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/comment.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- comment.php	7 Mar 2003 04:07:37 -0000	1.6
+++ comment.php	7 Mar 2003 19:32:43 -0000	1.7
@@ -8,7 +8,9 @@
 
 if ($type == 'trackback') {
     $uri = $_SERVER['REQUEST_URI'];
-    if (preg_match('@\/(\d+)$@', $uri, $matches)) {
+    if (isset($_GET['entry_id'])) {
+        $id = $_GET['entry_id'];
+    } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
         $id = $matches[1];
     }
 

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- jBlog_functions.inc.php	7 Mar 2003 18:54:30 -0000	1.32
+++ jBlog_functions.inc.php	7 Mar 2003 19:32:43 -0000	1.33
@@ -389,14 +389,15 @@
 
     mysql_db_query($jBlog['dbName'], $query);
 
-    $query = "UPDATE {$jBlog['dbPrefix']}entries SET comments=comments+1 WHERE id=$id";
+    $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
+              WHERE e.id  = '$id'
               AND e.authorid = a.authorid";
     $cursor = mysql_db_query($jBlog['dbName'], $query);
+    var_dump(mysql_error());
     $row = mysql_fetch_assoc($cursor);
     if($row['mail_comments']) {
         jBlog_sendComment($row['email'], $name, $email, $url, $id, 

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.31,1.32

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
referrer tracking fix


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- jBlog_functions.inc.php	7 Mar 2003 05:11:21 -0000	1.31
+++ jBlog_functions.inc.php	7 Mar 2003 18:54:30 -0000	1.32
@@ -1224,7 +1224,8 @@
               (url, day, count)
               VALUES ('$_SERVER[HTTP_REFERER]', now(), 1)";
     $rs = mysql_db_query($jBlog['dbName'], $suppressq);
-    if(mysql_affected_rows() > 0) {
+    $count = mysql_fetch_row($rs);
+    if($count[0] > 0) {
         mysql_db_query($jBlog['dbName'], $suppressu);
         return;
     }