php-blog-cvs — Serendipity commit list

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

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

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

Added Files:
	TODO 
Log Message:
This is my todo, what's yours?


--- NEW FILE: TODO ---
* Split up the administration and entry editing sections into two 
separate areas.
* Unify the configuration system
* XHTML 1.0 Strict Compliance
* Finalize the database schema
* Add the ability to import and export RSS feeds
* Generate RSS 1.0 Feeds
* Implement wiki style comments
* Finalize the plugin api
* Add an OPML plugin for easy blogroll inclusion
* Add a citation extractor plugin
* Add categories
* Add support for multiple weblogs
* Add the ability to have a printer friendly format for the weblog
* Add a set of css templates that are distributed with jBlog.  choose
a reasonable default
* Change the name, somebody came before us with a weblogging package that 
they also call jBlog

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

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

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

Modified Files:
	index.php 
Log Message:
add a shortcut for the administration section


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.php	7 Mar 2003 03:40:11 -0000	1.6
+++ index.php	11 Mar 2003 19:05:18 -0000	1.7
@@ -82,6 +82,8 @@
         
         print $data;
     }
+} else if (preg_match('@/admin$@', $uri)) {
+    header("Location: {$jBlog['jBlogHTTPPath']}jBlog_admin.php");
 } else if (preg_match('@/(index\.(php|html))?@', $uri)) {
     if (count($jBlog['GET']) == 2) {
         ob_start();
@@ -106,6 +108,4 @@
 The document, <?=$uri?> was not found.
 <?php
 }
-
-
 ?>

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

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

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

Modified Files:
	jBlog_admin_entries.inc.php 
Log Message:
ugly little hack for when entries have no title. 


Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_admin_entries.inc.php	11 Mar 2003 03:08:20 -0000	1.7
+++ jBlog_admin_entries.inc.php	11 Mar 2003 19:00:34 -0000	1.8
@@ -45,7 +45,11 @@
         ?>
 		<tr>
 		<td class="jBlog_admin_list_item">
+        <?php if (empty($entries[$x]['title'])) { ?>
+        <a href='?jBlog[action]=admin&jBlog[adminModule]=entries&jBlog[adminAction]=<?= $action ?>&jBlog[id]=<?= $entries[$x]["id"] ?>'>
+        <?php } ?>
         <?= date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ?>
+        <?php if (empty($entries[$x]['title'])) { echo "</a>\n"; } ?>
 		<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>

[php-blog-cvs] jBlog db.sql,1.14,1.15

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

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

Modified Files:
	db.sql 
Log Message:
comment type defaults to regular, update schemas accordingly.


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- db.sql	11 Mar 2003 03:04:16 -0000	1.14
+++ db.sql	11 Mar 2003 18:55:23 -0000	1.15
@@ -26,7 +26,7 @@
   url varchar(200) default null,
   ip varchar(15) default null,
   body text,
-  type enum('trackback','regular') default null,
+  type enum('trackback','regular') default 'regular',
   primary key  (id),
   fulltext key body (body)
 ) type=myisam;

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.54,1.55

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
suppress error message when the open failed


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- jBlog_functions.inc.php	11 Mar 2003 18:22:06 -0000	1.54
+++ jBlog_functions.inc.php	11 Mar 2003 18:53:15 -0000	1.55
@@ -356,7 +356,7 @@
     foreach ($comments as $comment) {
         $link = empty($comment['url']) ? $comment['email'] : $comment['url'];
         $name = empty($comment['author']) ? 'Anonymous' : $comment['author'];
-        $type = $comment['type'] == 'TRACKBACK' ? 'Trackback from' : 'Posted by';
+        $type = $comment['type'] == 'trackback' ? 'Trackback from' : 'Posted by';
 ?>
     <tr>
     <td class="jBlog_comment">
@@ -650,8 +650,10 @@
 }
 
 function jBlog_reference_autodiscover($loc, $url, $author, $title, $text) {
-    $fp = fopen($loc, "r");
-    if(!$fp) { return; }
+    $fp = @fopen($loc, "r");
+    if(!$fp) { 
+        return; 
+    }
     while(!feof($fp)) {
         $res .= fgets($fp, 1024);
     }

[php-blog-cvs] jBlog jBlog_admin.php,1.18,1.19 jBlog_layout.php,1.14,1.15

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

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

Modified Files:
	jBlog_admin.php jBlog_layout.php 
Log Message:
class="jBlog_banner" --> id="jBlog_banner"

Update your CSS :)




Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- jBlog_admin.php	11 Mar 2003 06:06:24 -0000	1.18
+++ jBlog_admin.php	11 Mar 2003 18:49:06 -0000	1.19
@@ -17,18 +17,17 @@
         <link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php">
     </head>
       <body>
-	<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>
-
+<div id="jBlog_banner">
+	<h1><?= $jBlog['blogTitle'] ?></h1>
+<?php
+	$sub = isset($jBlog['blogSubTitle']) ? $jBlog['blogSubTitle'] : $jBlog['blogDescription'];
+	if (strlen($sub)) {
+?>
+	<h2><?= $sub ?></h2>
+<?php
+	}
+?>
+</div>
 <?php
 	// User has to log in
 	if ($_SESSION["jBlogAuthedUser"] !== true

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jBlog_layout.php	10 Mar 2003 22:11:18 -0000	1.14
+++ jBlog_layout.php	11 Mar 2003 18:49:06 -0000	1.15
@@ -17,7 +17,7 @@
 // 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...)
 ?>
-<div class="jBlog_banner">
+<div id="jBlog_banner">
 <h1><?= $jBlog['blogTitle'] ?></h1>
 <?php
     if($jBlog['blogSubTitle']) {

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.53,1.54

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Fix the homepage url in notification mails
# although the site appears to be misconfigured atm


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- jBlog_functions.inc.php	11 Mar 2003 05:36:45 -0000	1.53
+++ jBlog_functions.inc.php	11 Mar 2003 18:22:06 -0000	1.54
@@ -421,7 +421,7 @@
 --
 Powered by jBlog.
 My blog runs on PHP.  Yours can too.
-http://jblog.sourceforge.net to find out how.";
+http://php-blog.sourceforge.net to find out how.";
 mail($to, "[$jBlog[blogTitle]] New comment posted to $title",  $text,
      "From: $fromName <$fromEmail>\r\n");
      

[php-blog-cvs] jBlog jBlog_admin.php,1.17,1.18

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

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

Modified Files:
	jBlog_admin.php 
Log Message:
nothing is absolute, everything must be a relative absolute ;-)


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- jBlog_admin.php	11 Mar 2003 03:08:19 -0000	1.17
+++ jBlog_admin.php	11 Mar 2003 06:06:24 -0000	1.18
@@ -14,7 +14,7 @@
 <html>
 	<head>
     	<title>jBlog Administration Suite</title>
-        <link rel="stylesheet" type="text/css" href="jBlog.css.php">
+        <link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php">
     </head>
       <body>
 	<table class="jBlog_banner">

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.52,1.53

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
fix to display extended entry

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- jBlog_functions.inc.php	11 Mar 2003 03:24:53 -0000	1.52
+++ jBlog_functions.inc.php	11 Mar 2003 05:36:45 -0000	1.53
@@ -262,7 +262,7 @@
             echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
 			if ($extended && strlen($entry['extended'])) {
                 echo '<a name="#extended">';
-                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['body'])));
+                echo nl2br(jBlog_emoticate(jBlog_markup_text($entry['extended'])));
                 echo '</a>';
 			} 
 			if ($entry['exflag'] && !$extended) {
@@ -651,6 +651,7 @@
 
 function jBlog_reference_autodiscover($loc, $url, $author, $title, $text) {
     $fp = fopen($loc, "r");
+    if(!$fp) { return; }
     while(!feof($fp)) {
         $res .= fgets($fp, 1024);
     }

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

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

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

Modified Files:
	jBlog_admin_plugins.inc.php jBlog_functions.inc.php 
Log Message:
Juggle htmlarea stuff so it actually works for people with slow connections.


Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- jBlog_admin_plugins.inc.php	11 Mar 2003 03:08:20 -0000	1.3
+++ jBlog_admin_plugins.inc.php	11 Mar 2003 03:24:53 -0000	1.4
@@ -29,7 +29,7 @@
 	}
 
 ?>
-<form method="POST">
+<form method="POST" name="jBlogPluginConfigure">
 
 <table cellpadding="5">
 <tr>
@@ -60,8 +60,8 @@
 				echo "<tr><td>$cname</td><td><input type=\"text\" name=\"jBlog[plugin][$config_item]\" value=\"$hvalue\">&nbsp;<font color='#bbbbbb'>//$cdesc</font></td></tr>\n";
 				break;
 			case 'html':
-				jBlog_emit_htmlarea_code();
 				echo "<tr><td colspan=\"2\">$cname&nbsp;<font color='#bbbbbb'>//$cdesc</font></td></tr>\n<tr><td colspan=\"2\"><textarea name=\"jBlog[plugin][$config_item]\" rows=\"20\" cols=\"80\">$hvalue</textarea></td></tr>";
+				jBlog_emit_htmlarea_code("document.forms['jBlogPluginConfigure']['jBlog[plugin][$config_item]']");
 				break;
 		}
 	

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- jBlog_functions.inc.php	11 Mar 2003 03:08:20 -0000	1.51
+++ jBlog_functions.inc.php	11 Mar 2003 03:24:53 -0000	1.52
@@ -1068,7 +1068,6 @@
 
 	// Determine whether we should WYSIWYG editor
 
-	jBlog_emit_htmlarea_code();
 
 	if ($jBlog["wysiwyg"])
 	{
@@ -1112,6 +1111,8 @@
             </form>
     	</table>
     <?php
+		jBlog_emit_htmlarea_code("document.forms['jBlogEntry']['jBlog[body]']");
+		jBlog_emit_htmlarea_code("document.forms['jBlogEntry']['jBlog[extended]']");
 	}
 	else
 	{
@@ -1445,24 +1446,24 @@
     return $row;
 }
 
-function jBlog_emit_htmlarea_code()
+function jBlog_emit_htmlarea_code($item)
 {
 	static $init = false;
 	global $jBlog;
-
-	if ($init)
-		return;
-    
+	
 	if (isset ($jBlog["wysiwyg"]) && $jBlog["wysiwyg"]) {
+
+		if (!$init) {
 ?>
-      <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
-      <script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>
-      <script type="text/javascript" src="htmlarea/dialog.js"></script>
-      <style type="text/css">
-      @import url(htmlarea/htmlarea.css);
+  	<script type="text/javascript" src="htmlarea/htmlarea.js"></script>
+	<script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>
+	<script type="text/javascript" src="htmlarea/dialog.js"></script>
+	<style type="text/css">
+	@import url(htmlarea/htmlarea.css);
 	</style>
-	<script defer='defer'>HTMLArea.replaceAll();</script>
 <?php
+		}
+		echo "<script defer='defer'>(new HTMLArea($item)).generate();</script>";
 	}
 	$init = true;
 }

[php-blog-cvs] jBlog jBlog_admin.php,1.16,1.17 jBlog_admin_entries.inc.php,1.6,1.7 jBlog_admin_plugins.inc.php,1.2,1.3 jBlog_functions.inc.php,1.50,1.51 jBlog_plugin_api.php,1.10,1.11 jBlog_sidebar_items.php,1.1,1.2

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

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

Modified Files:
	jBlog_admin.php jBlog_admin_entries.inc.php 
	jBlog_admin_plugins.inc.php jBlog_functions.inc.php 
	jBlog_plugin_api.php jBlog_sidebar_items.php 
Log Message:
Make the htmlarea easily accessible to other parts of the admin section that
need to use it.

Implement plugin configuration (via introspection).

Add "HTML Nugget" plugin that allows user to add little bytes of html to their
sidebar(s).



Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- jBlog_admin.php	11 Mar 2003 02:23:02 -0000	1.16
+++ jBlog_admin.php	11 Mar 2003 03:08:19 -0000	1.17
@@ -16,15 +16,7 @@
     	<title>jBlog Administration Suite</title>
         <link rel="stylesheet" type="text/css" href="jBlog.css.php">
     </head>
-    <? if (isset ($jBlog["wysiwyg"]) && $jBlog["wysiwyg"] && $jBlog["GET"]["adminModule"] == "entries") { ?>
-      <body onload="HTMLArea.replaceAll()">
-      <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
-      <script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>
-      <script type="text/javascript" src="htmlarea/dialog.js"></script>
-      <style type="text/css">
-      @import url(htmlarea/htmlarea.css);
-	</style>
-    <? } else echo "<body>"; ?>
+      <body>
 	<table class="jBlog_banner">
 		<tr>
 			<td><?= htmlentities($jBlog['blogTitle']) ?></td>

Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_admin_entries.inc.php	10 Mar 2003 22:11:17 -0000	1.6
+++ jBlog_admin_entries.inc.php	11 Mar 2003 03:08:20 -0000	1.7
@@ -83,6 +83,7 @@
 
 	case "edit":
     		$entry = jBlog_fetchEntry("id", $jBlog["GET"]["id"]);
+			
 			jBlog_printEntryForm("?", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "entries",
                              	 "jBlog[adminAction]" => "save"), $entry);
     break;

Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jBlog_admin_plugins.inc.php	10 Mar 2003 20:38:17 -0000	1.2
+++ jBlog_admin_plugins.inc.php	11 Mar 2003 03:08:20 -0000	1.3
@@ -5,6 +5,77 @@
 include_once "jBlog_plugin_api.php";
 include_once "jBlog_sidebar_items.php";
 
+if (isset($_GET['jBlog']['plugin_to_conf'])) {
+	/* configure a specific instance */
+
+	$plugin =& jblog_plugin_api::load_plugin($_GET['jBlog']['plugin_to_conf']);
+
+	$bag = new jBlog_property_bag;
+	$plugin->introspect($bag);
+	$name = htmlentities($bag->get('name'));
+	$desc = htmlentities($bag->get('description'));
+	
+	$config_names = $bag->get('configuration');
+
+	if (isset($_POST['SAVECONF'])) {
+		/* enum properties and set their values */
+
+		foreach ($config_names as $config_item) {
+			$cbag = new jBlog_property_bag;
+			if ($plugin->introspect_config_item($config_item, $cbag)) {
+				$plugin->set_config($config_item, $_POST['jBlog']['plugin'][$config_item]);
+			}
+		}
+	}
+
+?>
+<form method="POST">
+
+<table cellpadding="5">
+<tr>
+<th>Name</th>
+<td><?= $name ?></td>
+</tr>
+<tr>
+<th>Description</th>
+<td><?= $desc ?></td>
+</tr>
+</table>
+
+<table border="0" cellspacing="5" cellpadding="5">
+<?php
+
+
+	foreach ($config_names as $config_item) {
+		$cbag = new jBlog_property_bag;
+		$plugin->introspect_config_item($config_item, $cbag);
+	
+		$cname = htmlentities($cbag->get('name'));
+		$cdesc = htmlentities($cbag->get('description'));
+		$value = $plugin->get_config($config_item);
+		$hvalue = htmlentities($value);
+		
+		switch ($cbag->get('type')) {
+			case 'string':
+				echo "<tr><td>$cname</td><td><input type=\"text\" name=\"jBlog[plugin][$config_item]\" value=\"$hvalue\">&nbsp;<font color='#bbbbbb'>//$cdesc</font></td></tr>\n";
+				break;
+			case 'html':
+				jBlog_emit_htmlarea_code();
+				echo "<tr><td colspan=\"2\">$cname&nbsp;<font color='#bbbbbb'>//$cdesc</font></td></tr>\n<tr><td colspan=\"2\"><textarea name=\"jBlog[plugin][$config_item]\" rows=\"20\" cols=\"80\">$hvalue</textarea></td></tr>";
+				break;
+		}
+	
+	}
+?>
+</table>
+<input type="submit" name="SAVECONF" value="Save">
+</form>
+<?php
+
+
+} else {
+	/* show general plugin list */
+
 if (isset($_POST['SAVE']) && isset($_POST['jBlog']['placement'])) {
 	foreach ($_POST['jBlog']['placement'] as $plugin_name => $placement) {
 		jblog_plugin_api::update_plugin_placement(
@@ -60,6 +131,7 @@
 <table border="1" cellpadding="5">
 <tr>
 <th>&nbsp;</th>
+<th>Title</th>
 <th>Plugin</th>
 <th>Description</th>
 <th>Placement</th>
@@ -94,18 +166,31 @@
 	$name = htmlentities($bag->get('name'));
 	$desc = htmlentities($bag->get('description'));
 	$place = placement_box("jBlog[placement][" . $plugin_data['name'] . "]", $plugin_data['placement']);
+
+	$title = "";
+	ob_start();
+	$plugin->generate_content($title);
+	ob_end_clean();
+	if (strlen(trim($title)) == 0) {
+		$title = "&nbsp;";
+	}
+
 	if ($bag->is_set('configuration')) {
-		$url = "#fixme";
+		$url = "?jBlog[adminModule]=plugins&jBlog[plugin_to_conf]=" . urlencode($plugin_data['name']);
 		$desc = "<a href=\"$url\">$desc</a>";
 		$name = "<a href=\"$url\">$name</a>";
+		$title = "<a href=\"$url\">$title</a>";
 	}
 
-	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";
+	echo "<tr><td><input type=\"checkbox\" name=\"jBlog[plugin_to_remove][]\" value=\"$plugin_data[name]\"></td><td>$title</td><td>$name</td><td>$desc</td><td>$place</td></tr>\n";
 }
 ?>
 </table>
 <br />
 
-<input type="submit" name="REMOVE" value="Remove Ticked Plugins">
-<input type="submit" name="SAVE" value="Save">
+<input type="submit" name="REMOVE" title="Remove Ticked Plugins" value="Delete">
+<input type="submit" name="SAVE" title="Save changes to layout" value="Save">
 </form>
+<?php
+}
+?>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- jBlog_functions.inc.php	11 Mar 2003 01:58:54 -0000	1.50
+++ jBlog_functions.inc.php	11 Mar 2003 03:08:20 -0000	1.51
@@ -1068,6 +1068,8 @@
 
 	// Determine whether we should WYSIWYG editor
 
+	jBlog_emit_htmlarea_code();
+
 	if ($jBlog["wysiwyg"])
 	{
     ?>
@@ -1441,6 +1443,28 @@
     $cursor = mysql_db_query($jBlog['dbName'], $query);
     $row = mysql_fetch_assoc($cursor);
     return $row;
+}
+
+function jBlog_emit_htmlarea_code()
+{
+	static $init = false;
+	global $jBlog;
+
+	if ($init)
+		return;
+    
+	if (isset ($jBlog["wysiwyg"]) && $jBlog["wysiwyg"]) {
+?>
+      <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
+      <script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>
+      <script type="text/javascript" src="htmlarea/dialog.js"></script>
+      <style type="text/css">
+      @import url(htmlarea/htmlarea.css);
+	</style>
+	<script defer='defer'>HTMLArea.replaceAll();</script>
+<?php
+	}
+	$init = true;
 }
 
 define("JBLOG_FUNCTIONS_LOADED", true);

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_plugin_api.php	11 Mar 2003 01:59:23 -0000	1.10
+++ jBlog_plugin_api.php	11 Mar 2003 03:08:20 -0000	1.11
@@ -189,6 +189,9 @@
 				$v[] = $data['value'];
 			}
 		}
+		if (count($v) == 1)
+			return $v[0];
+
 		return implode(", ", $v);
 	}
 
@@ -264,6 +267,12 @@
 	{
 		$name = $this->instance . "/" . $name;
 		return jBlog_get_config_var($name, $defaultvalue);
+	}
+
+	function set_config($name, $value)
+	{
+		$name = $this->instance . "/" . $name;
+		return jBlog_set_config_var($name, $value);	
 	}
 
 }

Index: jBlog_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_sidebar_items.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_sidebar_items.php	10 Mar 2003 02:13:38 -0000	1.1
+++ jBlog_sidebar_items.php	11 Mar 2003 03:08:20 -0000	1.2
@@ -144,6 +144,44 @@
 	}
 }
 
+class jBlog_html_nugget_plugin extends jBlog_plugin {
+	function introspect(&$propbag)
+	{
+		$propbag->add('name',			'HTML Nugget');
+		$propbag->add('description',	'Holds a nugget of HTML in your sidebar');
+		$propbag->add('configuration',	array(
+			'title',
+			'content',
+			));
+	}
+	
+	function introspect_config_item($name, &$propbag)
+	{
+		switch($name) {
+			case 'title':
+				$propbag->add('type',			'string');
+				$propbag->add('name',			'Title');
+				$propbag->add('description',	'Title for the nugget');
+				break;
+				
+			case 'content':
+				$propbag->add('type',			'html');
+				$propbag->add('name',			'Content');
+				$propbag->add('description',	'The Nugget of HTML!');
+				break;
+			default:
+				return false;
+		}
+		return true;
+	}
+
+	function generate_content(&$title)
+	{
+		$title = $this->get_config('title', $title);
+		echo $this->get_config('content');
+	}
+
+}
 
 
 ?>

[php-blog-cvs] jBlog db.sql,1.13,1.14

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

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

Modified Files:
	db.sql 
Log Message:
**** DO THIS! ***
(or die!)

alter table jBlog_config change value value text not null;



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- db.sql	11 Mar 2003 02:44:32 -0000	1.13
+++ db.sql	11 Mar 2003 03:04:16 -0000	1.14
@@ -85,7 +85,7 @@
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,
-	value varchar(255) not null
+	value text not null
 );
 
 CREATE TABLE {PREFIX}suppress (

Re: [php-blog-cvs] jBlog db.sql,1.12,1.13

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

> Update of /cvsroot/php-blog/jBlog
> In directory sc8-pr-cvs1:/tmp/cvs-serv28285
> 
> Modified Files:
> 	db.sql 
> Log Message:
> **** UPDATE YOUR SCHEMA AS FOLLOWS ****
> alter table jBlog_config change name name varchar(255) not null;
>

value should probably be a 'text' field too.

-Sterling

> 
> 
> Index: db.sql
> ===================================================================
> RCS file: /cvsroot/php-blog/jBlog/db.sql,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -d -r1.12 -r1.13
> --- db.sql	10 Mar 2003 02:13:37 -0000	1.12
> +++ db.sql	11 Mar 2003 02:44:32 -0000	1.13
> @@ -84,7 +84,7 @@
>  ) TYPE=MyISAM;
>  
>  create table {PREFIX}config (
> -	name varchar(64) not null primary key,
> +	name varchar(255) not null primary key,
>  	value varchar(255) not null
>  );
>  
> 
> 
> 
> 
> -------------------------------------------------------
> This sf.net email is sponsored by:ThinkGeek
> Welcome to geek heaven.
> http://thinkgeek.com/sf
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs

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

[php-blog-cvs] jBlog db.sql,1.12,1.13

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

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

Modified Files:
	db.sql 
Log Message:
**** UPDATE YOUR SCHEMA AS FOLLOWS ****
alter table jBlog_config change name name varchar(255) not null;



Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/jBlog/db.sql,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- db.sql	10 Mar 2003 02:13:37 -0000	1.12
+++ db.sql	11 Mar 2003 02:44:32 -0000	1.13
@@ -84,7 +84,7 @@
 ) TYPE=MyISAM;
 
 create table {PREFIX}config (
-	name varchar(64) not null primary key,
+	name varchar(255) not null primary key,
 	value varchar(255) not null
 );
 

[php-blog-cvs] jBlog jBlog_admin.php,1.15,1.16

[<mu...@us...>]

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

Modified Files:
	jBlog_admin.php 
Log Message:
Since $jBlog["authorid"] isn't covered by the sessioning, it has to be reset
every time.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jBlog_admin.php	10 Mar 2003 22:47:34 -0000	1.15
+++ jBlog_admin.php	11 Mar 2003 02:23:02 -0000	1.16
@@ -8,6 +8,7 @@
 // User logs in?
 if($_SESSION['jBlogAuthedUser'] || jBlog_authenticate_author($jBlog["POST"]["user"], $jBlog["POST"]["pass"])) {
 	$_SESSION["jBlogAuthedUser"] = true;
+	$jBlog["authorid"] = $_SESSION["jBlogAuthorid"];
 }
 ?>
 <html>

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

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

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

Modified Files:
	jBlog_plugin_api.php 
Log Message:
global jBlog...


Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jBlog_plugin_api.php	11 Mar 2003 01:52:26 -0000	1.9
+++ jBlog_plugin_api.php	11 Mar 2003 01:59:23 -0000	1.10
@@ -113,6 +113,8 @@
 	/* Creates an instance of a named plugin */
 	function &load_plugin($instance_id)
 	{
+		global $jBlog;
+
 		list($name, $uniq) = explode(":", $instance_id);
 
 		if ($name{0} == '@') {

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.49,1.50

[<mu...@us...>]

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Added missing quoting marks in jBlog_updertEntry(). Jay, may we rename the
function? ;-)


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- jBlog_functions.inc.php	11 Mar 2003 01:41:06 -0000	1.49
+++ jBlog_functions.inc.php	11 Mar 2003 01:58:54 -0000	1.50
@@ -831,7 +831,7 @@
 					'".mysql_escape_string($entry["extended"])."', 
                     '0', '$exflag',
                     '".mysql_escape_string($jBlog["user"])."',
-                    '$jBlog[authorid]')";
+                    '".$jBlog["authorid"]."')";
     $query = mysql_db_query($jBlog["dbName"], $querystring);
     if ($entry['id'] == "NULL") {
         $newEntry = 1;

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

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

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

Modified Files:
	jBlog_plugin_api.php 
Log Message:
Glue to enable third-party plugins.

Third-party plugins are uploaded into a sub-dir of the plugins dir.
Eg: if I have a plugin named chewmyshoe:

% ls jBlog/plugins/chewmyshoe/
chewmyshoe.php    mydatafile.txt   etc.txt   etc.txt
  
chewmyshoe.php MUST include the definition of a class named chewmyshoe
that extends the jblog_plugin class.



Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog_plugin_api.php	11 Mar 2003 01:41:07 -0000	1.8
+++ jBlog_plugin_api.php	11 Mar 2003 01:52:26 -0000	1.9
@@ -76,6 +76,9 @@
 		/* built-in classes first */
 		$cls = get_declared_classes();
 		foreach ($cls as $class_name) {
+			if (strncmp($class_name, 'jblog_', 6)) {
+				continue;
+			}
 			$p = get_parent_class($class_name);
 			while ($p != 'jblog_plugin' && $p !== false) {
 				$p = get_parent_class($p);
@@ -116,8 +119,15 @@
 			$class_name = substr($name, 1);
 		} else {
 			/* plugin from the plugins/ dir */
+			if (!class_exists($name)) {
 
-			return false;
+				include $jBlog['jBlogPath'] . 'plugins/' . $name . '/' . $name . '.php';
+
+				if (!class_exists($name)) {
+					return false;
+				}
+			}
+			$class_name = $name;
 		}
 
 		$p =& new $class_name($instance_id);

[php-blog-cvs] jBlog jBlog_layout_table.php,NONE,1.1 jBlog_functions.inc.php,1.48,1.49 jBlog_genpage.php,1.5,1.6 jBlog_plugin_api.php,1.7,1.8

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

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

Modified Files:
	jBlog_functions.inc.php jBlog_genpage.php jBlog_plugin_api.php 
Added Files:
	jBlog_layout_table.php 
Log Message:
If you want an alternate layout from the default,
$jBlog['layout_mode'] = 'nameoflayout';
in your config file will cause jBlog to look for jBlog_layout_nameoflayout.php
and use that for layout.
Added a table layout alternative.


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

##########################################################################
# jBlog - another blogger...                                             #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/jBlog.html                            #
#                                                                        #
##########################################################################
include_once("jBlog_config.inc.php");
include_once("jBlog_plugin_api.php");
include_once("jBlog_sidebar_items.php");

?>
<div id="jBlog_banner">
	<h1><?= $jBlog['blogTitle'] ?></h1>
<?php
	$sub = isset($jBlog['blogSubTitle']) ? $jBlog['blogSubTitle'] : $jBlog['blogDescription'];
	if (strlen($sub)) {
?>
	<h2><?= $sub ?></h2>
<?php
	}
?>
</div>
<table id="mainpane">
	<tr>
<?php
	jblog_plugin_api::generate_plugins('left', 'td');
?>
<td id="content" valign="top">
			<?php
               	if (!is_numeric($jBlog["GET"]["range"]))
	               	$jBlog["GET"]["range"] = date("Ymd");

                // The main area
				switch ($jBlog["GET"]["action"]) {

                	// User wants to read the diary
                	case "read":
                        if (isset($jBlog['GET']['id'])) {
                            jBlog_printEntries(array(jBlog_fetchEntry("id", $jBlog['GET']['id'])), 1);
                        } else {
                        	jBlog_printEntries(jBlog_fetchEntries($jBlog["GET"]["range"]));
                        }
                    break;

                    // User searches
                    case "search":
						$r = jBlog_searchEntries($jBlog["GET"]["searchTerm"]);
                        echo "Your search for ".$jBlog["GET"]["searchTerm"]." returned ".
							 count($r)." results: ";
                        jBlog_printEntries($r);
                    break;

                    // Welcome screen or whatever
                    default:
                    	jBlog_printEntries(jBlog_fetchEntries(null, true, 15));
                }
            ?>
</td>
<?php
	/* Find any plugins for the RHS */
	jblog_plugin_api::generate_plugins('right', 'td');

?>
</tr>
</table>

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- jBlog_functions.inc.php	11 Mar 2003 01:35:23 -0000	1.48
+++ jBlog_functions.inc.php	11 Mar 2003 01:41:06 -0000	1.49
@@ -191,13 +191,9 @@
 
     $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
-    $cursor = mysql_db_query($jBlog["dbName"], $query);
-    if (!$cursor) {
+    $ret = jBlog_db_query($query);
+    if (!$ret) {
         die("Query failed: " . mysql_error() . "\n");
-    }
-
-    while($row = mysql_fetch_assoc($cursor)) {
-		$ret[] = $row;
     }
 
     return $ret;

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_genpage.php	10 Mar 2003 04:33:34 -0000	1.5
+++ jBlog_genpage.php	11 Mar 2003 01:41:07 -0000	1.6
@@ -7,7 +7,12 @@
 </head>
 <body>
 <?php
-include ("jBlog_layout.php");
+
+if (isset($jBlog['layout_mode']) && file_exists($jBlog['jBlogPath'] . "jBlog_layout_" . $jBlog['layout_mode'] . '.php')) {
+	include "jBlog_layout_" . $jBlog['layout_mode'] . '.php';
+} else {
+	include ("jBlog_layout.php");
+}
 ?>
 </body>
 </html>

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_plugin_api.php	10 Mar 2003 22:33:14 -0000	1.7
+++ jBlog_plugin_api.php	11 Mar 2003 01:41:07 -0000	1.8
@@ -135,12 +135,12 @@
 		return jBlog_db_query($sql);
 	}
 
-	function generate_plugins($side)
+	function generate_plugins($side, $tagname='div')
 	{
 		$plugins = jblog_plugin_api::enum_plugins($side);
 		if (!is_array($plugins))
 			return;
-		echo "<div id=\"jBlog" . ucfirst($side) . "SideBar\">\n";
+		echo "<$tagname 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=\"$plugin->wrap_class\"><div class=\"$plugin->title_class\">$title</div><div class=\"$plugin->content_class\">$content</div></div>\n";
 		}
-		echo "</div>\n";
+		echo "</$tagname>\n";
 	}
 
 }

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.47,1.48

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

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
~ expansion breaks UserDir urls
fixed issue with relative local urls in auto_discovery

VS: ----------------------------------------------------------------------


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- jBlog_functions.inc.php	10 Mar 2003 22:33:13 -0000	1.47
+++ jBlog_functions.inc.php	11 Mar 2003 01:35:23 -0000	1.48
@@ -191,7 +191,6 @@
 
     $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
-
     $cursor = mysql_db_query($jBlog["dbName"], $query);
     if (!$cursor) {
         die("Query failed: " . mysql_error() . "\n");
@@ -510,9 +509,9 @@
     $ret = str_replace(chr(1),'\*',$ret);
 
     // italics
-    $ret = str_replace('\~',chr(1),$ret);
-    $ret = preg_replace('/~([\S ]+?)~/','<i>\1</i>',$ret);
-    $ret = str_replace(chr(1),'\~',$ret);
+//    $ret = str_replace('\~',chr(1),$ret);
+//    $ret = preg_replace('/~([\S ]+?)~/','<i>\1</i>',$ret);
+//    $ret = str_replace(chr(1),'\~',$ret);
 
     // monospace font
     $ret = str_replace('\%',chr(1),$ret);
@@ -778,6 +777,9 @@
     $tmpid = mysql_escape_string($id);
 
     for ($i = 0, $j = count($locations); $i < $j; ++$i) {
+        if($locations[$i][0] == '/') {
+            $locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
+        }
         $query = "SELECT COUNT(id) FROM {$jBlog['dbPrefix']}references WHERE ";
         $query .= "entry_id=$tmpid AND link='" . mysql_escape_string($locations[$i]) . "'";
 

[php-blog-cvs] jBlog jBlog_admin.php,1.14,1.15

[<mt...@us...>]

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

Modified Files:
	jBlog_admin.php 
Log Message:
HTMLArea now only works in entry mode


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- jBlog_admin.php	10 Mar 2003 21:05:27 -0000	1.14
+++ jBlog_admin.php	10 Mar 2003 22:47:34 -0000	1.15
@@ -9,14 +9,13 @@
 if($_SESSION['jBlogAuthedUser'] || jBlog_authenticate_author($jBlog["POST"]["user"], $jBlog["POST"]["pass"])) {
 	$_SESSION["jBlogAuthedUser"] = true;
 }
-
 ?>
 <html>
 	<head>
     	<title>jBlog Administration Suite</title>
         <link rel="stylesheet" type="text/css" href="jBlog.css.php">
     </head>
-    <? if (isset ($jBlog["wysiwyg"]) && $jBlog["wysiwyg"]) { ?>
+    <? if (isset ($jBlog["wysiwyg"]) && $jBlog["wysiwyg"] && $jBlog["GET"]["adminModule"] == "entries") { ?>
       <body onload="HTMLArea.replaceAll()">
       <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
       <script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.46,1.47 jBlog_plugin_api.php,1.6,1.7

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

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

Modified Files:
	jBlog_functions.inc.php jBlog_plugin_api.php 
Log Message:
added ability to customize css classes for indiviual plugins
Fixed author determination in fetch's



Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- jBlog_functions.inc.php	10 Mar 2003 22:11:17 -0000	1.46
+++ jBlog_functions.inc.php	10 Mar 2003 22:33:13 -0000	1.47
@@ -176,20 +176,20 @@
 **/
 function jBlog_fetchEntries($range, $full = true, $limit = "") {
 	global $jBlog;
-    $where = "";
+    $and = "";
 
     if ($full === true)
         $body = ',body, extended';
 
     if (is_numeric($range)) {
-        $where = "WHERE FROM_UNIXTIME(timestamp, '%Y%m%d') LIKE '$range%' ";
+        $and = "AND FROM_UNIXTIME(timestamp, '%Y%m%d') LIKE '$range%' ";
     } 
 
     if (!empty($limit)) {
         $limit = "LIMIT $limit";
     }
 
-    $query = "SELECT * FROM {$jBlog['dbPrefix']}entries " . $where .
+    $query = "SELECT * FROM {$jBlog['dbPrefix']}entries e, {$jBlog['dbPrefix']}authors a WHERE e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
 
     $cursor = mysql_db_query($jBlog["dbName"], $query);
@@ -199,16 +199,6 @@
 
     while($row = mysql_fetch_assoc($cursor)) {
 		$ret[] = $row;
-/*
-                 array("id"        => $row['id'],
-        			   "timestamp" => $row['timestamp'],
-                       "comments"  => $row['comments'],
-                       "title"     => $row['title'],
-                       "body"     => $row['body'],
-                       "extended"      => $row['extended'],
-                       "author"      => $row['author'],
-                       "exflag"      => $row['exflag']);
-*/
     }
 
     return $ret;
@@ -221,8 +211,8 @@
 	global $jBlog;
 
 	if ($full === true) $body = ", body, extended";
-    $querystring = "SELECT * FROM ".$jBlog["dbPrefix"]."entries
-                    WHERE  $key LIKE $val  LIMIT 1";
+    $querystring = "SELECT * FROM ".$jBlog["dbPrefix"]."entries e, $jBlog[dbPrefix]authors a
+                    WHERE  a.authorid = e.authorid AND $key LIKE $val  LIMIT 1";
     $query       = mysql_db_query($jBlog["dbName"], $querystring);
 
     return mysql_fetch_assoc($query);
@@ -293,7 +283,7 @@
 				. "archives/e_"
 				. $entry['id']
 				. ".html\">Posted by "
-				. htmlentities($entry['author'])
+				. htmlentities($entry['username'])
 				. " at "
 				. date("H:i", $entry['timestamp'])
 				. "</a>";

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_plugin_api.php	10 Mar 2003 22:25:52 -0000	1.6
+++ jBlog_plugin_api.php	10 Mar 2003 22:33:14 -0000	1.7
@@ -148,7 +148,7 @@
 			$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 "<div class=\"$plugin->wrap_class\"><div class=\"$plugin->title_class\">$title</div><div class=\"$plugin->content_class\">$content</div></div>\n";
 		}
 		echo "</div>\n";
 	}
@@ -193,7 +193,9 @@
 
 class jBlog_plugin {
 	var $instance = null;
-	
+	var $wrap_class = 'jBlogSideBarItem';
+	var $title_class = 'jBlogSideBarTitle';
+	var $content_class = 'jBlogSideBarContent';
 	/* 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)

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.10,1.11 jBlog_plugin_api.php,1.5,1.6

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

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_plugin_api.php 
Log Message:
Fix installation


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- jBlog_admin_installer.inc.php	10 Mar 2003 21:05:28 -0000	1.10
+++ jBlog_admin_installer.inc.php	10 Mar 2003 22:25:51 -0000	1.11
@@ -231,57 +231,61 @@
                 fwrite($fp, $f);
                 fclose($fp);
 				echo "<b>Done.</b><br>";
-                if (IN_JBLOG!==true) {
+				if (IN_JBLOG!==true) {
+					define('IN_JBLOG', true);
 
-			// Create .htaccess
-			$a = file("./htaccess.tpl");
-			$fp = @fopen("./.htaccess", "w");
-			if (!is_resource($fp)) {
-				echo "<font color='#ff0000'>Error: Could not create .htaccess file, create it yourself:<pre>\n";
-				echo implode("\n", $a);
-			}
-			else {
-				for($x=0; $x<count($a); $x++) {
-					fwrite($fp, str_replace("{PREFIX}", $_POST["jBlogHTTPPath"],$a[$x])."\n");
-				}
-				fclose($fp);
-			}
+					// Create .htaccess
+					$a = file("./htaccess.tpl");
+					$fp = @fopen("./.htaccess", "w");
+					if (!is_resource($fp)) {
+						echo "<font color='#ff0000'>Error: Could not create .htaccess file, create it yourself:<pre>\n";
+						echo implode("\n", $a);
+					}
+					else {
+						for($x=0; $x<count($a); $x++) {
+							fwrite($fp, str_replace("{PREFIX}", $_POST["jBlogHTTPPath"],$a[$x])."\n");
+						}
+						fclose($fp);
+					}
 
-                	// Create tables
-                	echo "Attempting to setup Database...<br>";
-                    @mysql_select_db($_POST["dbName"]);
-                    $queries = jBlog_parse_sql_tables('./db.sql');
-                    $queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
-                    foreach ($queries as $query) {
-                        mysql_query($query);
-                    }
-                    if($_POST['want_mail'] == true) {
-                        $mail_comments = 1;
-                    } else {
-                        $mail_comments = 0;
-                    }
-                    $query = "INSERT INTO $_POST[dbPrefix]authors
-                             (username, password, email, mail_comments) 
-                             VALUES('$_POST[user]',
-                                    password('$_POST[pass]'),
-                                    '$_POST[email]',
-                                    $mail_comments) ";
-                    mysql_query($query);
+					// Create tables
+					echo "Attempting to setup Database...<br>";
+					@mysql_select_db($_POST["dbName"]);
+					$queries = jBlog_parse_sql_tables('./db.sql');
+					$queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
+					foreach ($queries as $query) {
+						mysql_query($query);
+					}
+					if($_POST['want_mail'] == true) {
+						$mail_comments = 1;
+					} else {
+						$mail_comments = 0;
+					}
+					$query = "INSERT INTO $_POST[dbPrefix]authors
+						(username, password, email, mail_comments) 
+						VALUES('$_POST[user]',
+								password('$_POST[pass]'),
+								'$_POST[email]',
+								$mail_comments) ";
+					mysql_query($query);
 
-                    $text = mysql_escape_string(file_get_contents('./jBlog.css'));
-                    $query = "INSERT into $_POST[dbPrefix]css values(NULL, 'default', '$text')";
-                    if (!mysql_query($query)) {
+					$text = mysql_escape_string(file_get_contents('./jBlog.css'));
+					$query = "INSERT into $_POST[dbPrefix]css values(NULL, 'default', '$text')";
+					if (!mysql_query($query)) {
 						echo mysql_error();
 					}
-				
+
 					/* register default plugins */
+					
+					$GLOBALS['jBlog']['dbPrefix'] = $_POST['dbPrefix'];
+					$GLOBALS['jBlog']['dbName'] = $_POST['dbName'];
 					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>";
-                    session_destroy();
-                }
+					echo "<p>Welcome to jBlog!</b><p>";
+					echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["jBlogHTTPPath"]."'>check out your blog</a>";
+					session_destroy();
+				}
             }
         }
     break;

Index: jBlog_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_plugin_api.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_plugin_api.php	10 Mar 2003 22:11:19 -0000	1.5
+++ jBlog_plugin_api.php	10 Mar 2003 22:25:52 -0000	1.6
@@ -1,6 +1,8 @@
 <?php
 if (IN_JBLOG !== true) die ("Don't hack!");
 
+include_once 'jBlog_functions.inc.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.

[php-blog-cvs] jBlog jBlog_admin_entries.inc.php,1.5,1.6 jBlog_functions.inc.php,1.45,1.46 jBlog_layout.php,1.13,1.14 jBlog_plugin_api.php,1.4,1.5

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

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

Modified Files:
	jBlog_admin_entries.inc.php jBlog_functions.inc.php 
	jBlog_layout.php jBlog_plugin_api.php 
Log Message:
Some layout tweaks.
Fix logic in updertentry so we don't get bogus error messages.



Index: jBlog_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_entries.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_admin_entries.inc.php	9 Mar 2003 02:27:55 -0000	1.5
+++ jBlog_admin_entries.inc.php	10 Mar 2003 22:11:17 -0000	1.6
@@ -74,7 +74,7 @@
         		  		              "body" =>$jBlog["POST"]["body"],
                                       "extended" => $jBlog["POST"]["extended"]);
 		$res = jBlog_updertEntry($entry);
-        if ($res != "")
+        if ($res !== true)
 			jBlog_printEntryForm("?", array("jBlog[action]" => "admin", "jBlog[adminModule]" => "entries",
                              	 "jBlog[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
         else

Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- jBlog_functions.inc.php	10 Mar 2003 21:05:30 -0000	1.45
+++ jBlog_functions.inc.php	10 Mar 2003 22:11:17 -0000	1.46
@@ -857,8 +857,8 @@
     }
 
     jBlog_purgeEntry($entry['id'], $entry['timestamp']);
-    
-    return $entry['id'];
+   
+    return !$query  ? mysql_error() : true;
 }
 
 /**

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jBlog_layout.php	10 Mar 2003 20:50:16 -0000	1.13
+++ jBlog_layout.php	10 Mar 2003 22:11:18 -0000	1.14
@@ -31,9 +31,14 @@
     }
 ?>
 </div>
+<div id="mainpane">
 <?php
+	/* Find any plugins for the RHS */
 	jblog_plugin_api::generate_plugins('left');
+	jblog_plugin_api::generate_plugins('right');
+
 ?>
+
 <div id="content">
 			<?php
                	if (!is_numeric($jBlog["GET"]["range"]))
@@ -65,8 +70,4 @@
                 }
             ?>
 </div>
-<?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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jBlog_plugin_api.php	10 Mar 2003 20:50:17 -0000	1.4
+++ jBlog_plugin_api.php	10 Mar 2003 22:11:19 -0000	1.5
@@ -1,8 +1,6 @@
 <?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.
@@ -253,5 +251,7 @@
 	}
 
 }
+
+include_once "jBlog_sidebar_items.php";
 
 ?>

[php-blog-cvs] jBlog jBlog_admin.php,1.13,1.14 jBlog_admin_installer.inc.php,1.9,1.10 jBlog_config_local.tpl,1.2,1.3 jBlog_functions.inc.php,1.44,1.45

[<mt...@us...>]

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

Modified Files:
	jBlog_admin.php jBlog_admin_installer.inc.php 
	jBlog_config_local.tpl jBlog_functions.inc.php 
Log Message:
Added new HTMLArea editor to the system (user configurable). This is still
HIGHLY experimental and only works for IE5.5+ right now.

Added a check in the installation page to make sure that the db the user
specifies exists