php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_admin.php,1.3,1.4 serendipity_entries.php,1.2,1.3

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv11085

Modified Files:
	serendipity_admin.php serendipity_entries.php 
Log Message:
Admin interface links to entry editor and other way around...


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin.php	30 Mar 2003 15:58:31 -0000	1.3
+++ serendipity_admin.php	31 Mar 2003 21:17:26 -0000	1.4
@@ -74,6 +74,8 @@
                     &bull; <a href="?serendipity[adminModule]=interop">Import/Export Entries</a><br />
 					</div>
 					</div>
+                    &bull; <a href='<?=$serendipity['serendipityHTTPPath']?>entr
+ies'>Edit entries</a><br />
                     &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'>Back to Weblog</a><br />
                     &bull; <a href='?serendipity[adminModule]=logout'>Logout</a>
                 </td>

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_entries.php	30 Mar 2003 15:58:31 -0000	1.2
+++ serendipity_entries.php	31 Mar 2003 21:17:27 -0000	1.3
@@ -79,7 +79,7 @@
                     &bull; <a href='?serendipity[adminModule]=images&serendipity[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>
-
+                                        &bull; <a href="<?=$serendipity['serendipityHTTPPath']?>serendipity_admin.php">Admin interface</a><br />
 					&bull; <a href="<?=$serendipity['serendipityHTTPPath']?>">Back to Weblog</a><br />
 					&bull; <a href="?serendipity[adminModule]=logout">Logout</a>
                 </td>

[php-blog-cvs] serendipity serendipity_sidebar_items.php,1.1.1.1,1.2

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv1183

Modified Files:
	serendipity_sidebar_items.php 
Log Message:
Add serendipity_topexits_plugin.

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_sidebar_items.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_sidebar_items.php	31 Mar 2003 08:01:59 -0000	1.2
@@ -90,6 +90,22 @@
 	}
 }
 
+class serendipity_topexits_plugin extends serendipity_plugin {
+	function introspect(&$propbag)
+	{
+		$propbag->add('name',	'Top Exits');
+		$propbag->add('description', 'Shows top exit links from your blogs');
+	}
+
+	function generate_content(&$title)
+	{
+		global $serendipity;
+
+		$title = "Top Exits";
+		echo serendipity_displayTopExits();
+	}
+}
+
 class serendipity_syndication_plugin extends serendipity_plugin {
 	function introspect(&$propbag)
 	{

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.6,1.7

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv31105

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add serendipity_displayTopExits() method.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_functions.inc.php	30 Mar 2003 18:05:40 -0000	1.6
+++ serendipity_functions.inc.php	31 Mar 2003 07:55:22 -0000	1.7
@@ -1419,10 +1419,18 @@
     serendipity_db_query($gc);
 }
 
-function serendipity_displayTopReferrers($limit=10) {
+function serendipity_displayTopReferrers($limit = 10) {
+    serendipity_displayTopUrlList('referrers', $limit);
+}
+
+function serendipity_displayTopExits($limit = 10) {
+    serendipity_displayTopUrlList('exits', $limit);
+}
+
+function serendipity_displayTopUrlList($list, $limit) {
     global $serendipity;
     $query = "SELECT url, sum(count) AS total
-              FROM $serendipity[dbPrefix]referrers
+              FROM $serendipity[dbPrefix]$list
               GROUP BY url
               ORDER BY total desc
               LIMIT $limit";

[php-blog-cvs] serendipity db.sql,1.2,1.3

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv30990

Modified Files:
	db.sql 
Log Message:
Add exits table.

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- db.sql	29 Mar 2003 16:44:46 -0000	1.2
+++ db.sql	31 Mar 2003 07:54:55 -0000	1.3
@@ -61,6 +61,17 @@
 );
 
 #
+# Table structure for table '{PREFIX}exits'
+# 
+
+CREATE TABLE {PREFIX}exits (
+  url varchar(128) NOT NULL default '',
+  day date NOT NULL,
+  count int(11) NOT NULL default '0',
+  PRIMARY KEY  (url,day)
+);
+
+#
 # Table structure for table '{PREFIX}referrers'
 # 
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.5,1.6

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv3130

Modified Files:
	serendipity_functions.inc.php 
Log Message:
its archives/e_*


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_functions.inc.php	30 Mar 2003 14:44:07 -0000	1.5
+++ serendipity_functions.inc.php	30 Mar 2003 18:05:40 -0000	1.6
@@ -469,7 +469,7 @@
         foreach ($entries as $entry) {
             echo "<item>\n";
             echo "<title>{$entry['title']}</title>\n";
-            echo "<link>{$serendipity['baseURL']}e_{$entry['id']}.html</link>\n";
+            echo "<link>{$serendipity['baseURL']}archives/e_{$entry['id']}.html</link>\n";
             if ($version == '2.0') {
                 // extract author information
                 $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";

[php-blog-cvs] serendipity htaccess.tpl,1.2,1.3

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10636

Modified Files:
	htaccess.tpl 
Log Message:
restrict a few more types


Index: htaccess.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htaccess.tpl	30 Mar 2003 16:00:41 -0000	1.2
+++ htaccess.tpl	30 Mar 2003 16:01:43 -0000	1.3
@@ -1,5 +1,13 @@
 ErrorDocument 404 {PREFIX}index.php
 
+<Files *.tpl>
+	deny from all
+</Files>
+
+<Files *.sql>
+	deny from all
+</Files>
+
 <Files *.inc.php>
 	deny from all
 </Files>

[php-blog-cvs] serendipity htaccess.tpl,1.1.1.1,1.2

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv10292a

Modified Files:
	htaccess.tpl 
Log Message:
restrict access to .inc files


Index: htaccess.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- htaccess.tpl	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ htaccess.tpl	30 Mar 2003 16:00:41 -0000	1.2
@@ -1,5 +1,9 @@
 ErrorDocument 404 {PREFIX}index.php
 
+<Files *.inc.php>
+	deny from all
+</Files>
+
 <Files sqlite.db>
    deny from all
 </Files>

[php-blog-cvs] serendipity serendipity_admin.php,1.2,1.3 serendipity_entries.php,1.1,1.2

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9279

Modified Files:
	serendipity_admin.php serendipity_entries.php 
Log Message:
unify logout and back to weblog links between the two


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin.php	30 Mar 2003 15:50:05 -0000	1.2
+++ serendipity_admin.php	30 Mar 2003 15:58:31 -0000	1.3
@@ -72,10 +72,10 @@
 					<div class="serendipitySideBarContent">
                     &bull; <a href='?serendipity[adminModule]=installer'>Configuration</a><br />
                     &bull; <a href="?serendipity[adminModule]=interop">Import/Export Entries</a><br />
-                    &bull; <a href='?serendipity[adminModule]=logout'>Log out</a><br />
-                    &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'>Back to Blog...</a><br />
 					</div>
 					</div>
+                    &bull; <a href='<?= $serendipity['serendipityHTTPPath'] ?>'>Back to Weblog</a><br />
+                    &bull; <a href='?serendipity[adminModule]=logout'>Logout</a>
                 </td>
                 <td class="serendipity_admin">
                     <div class="serendipity_admin_title">Serendipity Administration Suite</div>

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_entries.php	30 Mar 2003 15:50:05 -0000	1.1
+++ serendipity_entries.php	30 Mar 2003 15:58:31 -0000	1.2
@@ -79,6 +79,9 @@
                     &bull; <a href='?serendipity[adminModule]=images&serendipity[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>
+
+					&bull; <a href="<?=$serendipity['serendipityHTTPPath']?>">Back to Weblog</a><br />
+					&bull; <a href="?serendipity[adminModule]=logout">Logout</a>
                 </td>
                 <td class="serendipity_admin">
                     <div class="serendipity_admin_title">Serendipity Authoring Suite</div>

[php-blog-cvs] serendipity serendipity_entries.php,NONE,1.1 serendipity_entries_overview.inc.php,NONE,1.1 index.php,1.2,1.3 serendipity_admin.php,1.1.1.1,1.2 serendipity_admin_overview.inc.php,1.1.1.1,1.2

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv5593

Modified Files:
	index.php serendipity_admin.php 
	serendipity_admin_overview.inc.php 
Added Files:
	serendipity_entries.php serendipity_entries_overview.inc.php 
Log Message:
separate the administration and authoring sections of serendipity.

You can access them via the shortcuts
http://serendipity/entries
http://serendipity/admin



--- NEW FILE: serendipity_entries.php ---
<?php
session_start();
if (file_exists("./serendipity_config_local.inc.php")) {
    include("serendipity_config.inc.php");
} else {
    $_SESSION['serendipityAuthedUser'] = true;
}
// User logs in?
if($_SESSION['serendipityAuthedUser'] || serendipity_authenticate_author($serendipity["POST"]["user"], $serendipity["POST"]["pass"])) {
	$_SESSION["serendipityAuthedUser"] = true;
	$serendipity["authorid"] = $_SESSION["serendipityAuthorid"];
}
?>
<html>
	<head>
    	<title>Serendipity Authoring Suite</title>
        <link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php">
<?php
   if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>

    </head>
      <body>
<div id="serendipity_banner">
	<h1><?= $serendipity['blogTitle'] ?></h1>
<?php
	$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
	if (strlen($sub)) {
?>
	<h2><?= $sub ?></h2>
<?php
	}
?>
</div>
<?php
	// User has to log in
	if ($_SESSION["serendipityAuthedUser"] !== true
		&& file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
?>
		<div class='serendipity_auth_required'>
		You have to be logged on to view this page:
		<form action="?" method="post">
			<input type="hidden" name="serendipity[action]" value="admin">
			<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
			<input type="password" value="password" name="serendipity[pass]" onfocus="value='';">
			<input type="submit" value="&gt;">
		</form>
		</div>
<?php
	} else {
        // User is logged in
?>

        <table>
            <tr valign="top">
                <td class="serendipitySideBar">

					<div class="serendipitySideBarItem">
					<div class="serendipitySideBarTitle">Entries:</div>
					<div class="serendipitySideBarContent">
                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'>New entry</a><br>
                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'>Edit entries</a><br>
                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'>Delete entries</a><br>
					</div>
					</div>

					<div class="serendipitySideBarItem">
					<div class="serendipitySideBarTitle">Categories:</div>
					<div class="serendipitySideBarContent">
                    &bull; <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'>Edit Categories</a><br>
					</div>
					</div>

					<div class="serendipitySideBarItem">
					<div class="serendipitySideBarTitle">Images:</div>
					<div class="serendipitySideBarContent">
					&bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'>Add images</a><br>
                    &bull; <a href='?serendipity[adminModule]=images'>Manage images</a><br>
                    &bull; <a href='?serendipity[adminModule]=images&serendipity[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>
                </td>
                <td class="serendipity_admin">
                    <div class="serendipity_admin_title">Serendipity Authoring Suite</div>
                    <?php
                    	if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
                        switch($serendipity["GET"]["adminModule"]) {

                            case "entries":
                                include("serendipity_admin_entries.inc.php");
                            break;

							case "images":
								include("serendipity_admin_images.inc.php");
                            break;

							case "category":
								include "serendipity_admin_category.inc.php";
								break;

							case "logout":
								session_destroy();
                                echo "Logged out.";
                            break;

                            default:
                                include("serendipity_entries_overview.inc.php");

                        }
                    ?>
                </td>
            </tr>
        </table>
        <?php
        }
        ?>

    </body>
</html>

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

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

if (IN_serendipity !== true) die ("Don't hack!");
session_start();
?>
Welcome back, <?= $_SESSION['serendipityUser'] ?>.  

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- index.php	29 Mar 2003 16:13:08 -0000	1.2
+++ index.php	30 Mar 2003 15:50:04 -0000	1.3
@@ -83,6 +83,8 @@
     }
 } else if (preg_match('@/admin$@', $uri)) {
     header("Location: {$serendipity['serendipityHTTPPath']}serendipity_admin.php");
+} else if (preg_match('@/entries$@', $uri)) {
+	header("Location: {$serendipity['serendipityHTTPPath']}serendipity_entries.php");
 } else if (preg_match('@/(index\.(php|html))?@', $uri)) {
     if (count($serendipity['GET']) == 2) {
         ob_start();

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_admin.php	30 Mar 2003 15:50:05 -0000	1.2
@@ -60,31 +60,6 @@
                 <td class="serendipitySideBar">
 
 					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Entries:</div>
-					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'>New entry</a><br>
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'>Edit entries</a><br>
-                    &bull; <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'>Delete entries</a><br>
-					</div>
-					</div>
-
-					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Categories:</div>
-					<div class="serendipitySideBarContent">
-                    &bull; <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'>Edit Categories</a><br>
-					</div>
-					</div>
-
-					<div class="serendipitySideBarItem">
-					<div class="serendipitySideBarTitle">Images:</div>
-					<div class="serendipitySideBarContent">
-					&bull; <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'>Add images</a><br>
-                    &bull; <a href='?serendipity[adminModule]=images'>Manage images</a><br>
-                    &bull; <a href='?serendipity[adminModule]=images&serendipity[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="serendipitySideBarItem">
 					<div class="serendipitySideBarTitle">Appearance:</div>
 					<div class="serendipitySideBarContent">
                     &bull; <a href='?serendipity[adminModule]=css'>Manage css</a><br>
@@ -103,7 +78,7 @@
 					</div>
                 </td>
                 <td class="serendipity_admin">
-                    <div class="serendipity_admin_title">serendipity Administration Suite</div>
+                    <div class="serendipity_admin_title">Serendipity Administration Suite</div>
                     <?php
                     	if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
                         switch($serendipity["GET"]["adminModule"]) {
@@ -112,10 +87,6 @@
                             	include("./serendipity_admin_installer.inc.php");
                             break;
 
-                            case "entries":
-                                include("serendipity_admin_entries.inc.php");
-                            break;
-
 							case "images":
 								include("serendipity_admin_images.inc.php");
                             break;
@@ -123,10 +94,6 @@
 							case "css":
 								include("serendipity_admin_css.inc.php");
                             break;
-
-							case "category":
-								include "serendipity_admin_category.inc.php";
-								break;
 
 							case "plugins":
 								include "serendipity_admin_plugins.inc.php";

Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_overview.inc.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_admin_overview.inc.php	30 Mar 2003 15:50:05 -0000	1.2
@@ -12,4 +12,4 @@
 if (IN_serendipity !== true) die ("Don't hack!");
 session_start();
 ?>
-Welcome back, <?= $_SESSION['serendipityUser'] ?>.  Would you like to play a game?
+Welcome back, <?= $_SESSION['serendipityUser'] ?>. 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.1.1.1,1.2 rss.php,1.1.1.1,1.2

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv1762

Modified Files:
	serendipity_config.inc.php rss.php 
Log Message:
rss support shouldn't use sessions


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_config.inc.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_config.inc.php	30 Mar 2003 15:38:08 -0000	1.2
@@ -42,10 +42,6 @@
 * You shouldn't need to touch anything here.                             *
 *************************************************************************/
 
-// Make sure sessioning is running
-if (strlen(@session_id()) < 5)
-	die ("serendipity error: you _have_ to run session_start() before including serendipity_config.inc.php - exiting");
-
 include($serendipity["serendipityPath"]."/serendipity_functions.inc.php");
 if (serendipity_FUNCTIONS_LOADED!== true)
 	die ("serendipity error: could not include serendipity_functions.inc.php - exiting");

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- rss.php	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ rss.php	30 Mar 2003 15:38:09 -0000	1.2
@@ -1,7 +1,6 @@
 <?php
 
 header("Content-Type: text/xml");
-session_start();
 include_once("serendipity_config.inc.php");
 $version = $_GET['version'];
 if (empty($version)) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.4,1.5

[<jhe...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9783

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Bundled Referers


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_functions.inc.php	29 Mar 2003 16:44:46 -0000	1.4
+++ serendipity_functions.inc.php	30 Mar 2003 14:44:07 -0000	1.5
@@ -1429,11 +1429,13 @@
 
 	$rows = serendipity_db_query($query);
 	if (is_array($rows)) {
-		foreach ($rows as $row) {
-			preg_match("#//([^/]+)#", $row[url], $matches);
-			$row['url'] = htmlentities($row['url']);
-			echo "<a href=\"$row[url]\">$matches[1] ($row[total])</a><br/>";
-		}
+                foreach ($rows as $row) {
+                    $u = parse_url($row['url']);
+                    $ref[$u['scheme']."://".$u['host']] += $row['total']; 
+                }
+                foreach ($ref as $k=>$v) {
+                    echo "<a href='$k'>$k</a> ($v)<br>";
+                }
 	}
 }
 

[php-blog-cvs] serendipity rename.sh,1.1.1.1,NONE

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv9587

Removed Files:
	rename.sh 
Log Message:
no need for this file anymore, and its in the attic


--- rename.sh DELETED ---

[php-blog-cvs] serendipity TODO,1.1.1.1,1.2

[<ber...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv25322

Modified Files:
	TODO 
Log Message:
TODO--

Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- TODO	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ TODO	29 Mar 2003 19:52:58 -0000	1.2
@@ -15,5 +15,3 @@
 * Add the ability to have a printer friendly format for the weblog
 * Add a set of css templates that are distributed with serendipity.  choose
 a reasonable default
-* Change the name, somebody came before us with a weblogging package that 
-they also call serendipity

[php-blog-cvs] serendipity serendipity_layout.inc.php,1.1.1.1,1.2 serendipity_layout_table.inc.php,1.2,1.3

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv5573

Modified Files:
	serendipity_layout.inc.php serendipity_layout_table.inc.php 
Log Message:
fix failed search


Index: serendipity_layout.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_layout.inc.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_layout.inc.php	29 Mar 2003 16:51:30 -0000	1.2
@@ -59,6 +59,10 @@
                     // User searches
                     case "search":
 						$r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
+						if ($r === true) {
+							echo "No Entries Found for Query {$serendipity['GET']['searchTerm']}\n";
+							break;
+						}
                         echo "Your search for ".$serendipity["GET"]["searchTerm"]." returned ".
 							 count($r)." results: ";
                         serendipity_printEntries($r);

Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_layout_table.inc.php	29 Mar 2003 15:28:55 -0000	1.2
+++ serendipity_layout_table.inc.php	29 Mar 2003 16:51:30 -0000	1.3
@@ -49,6 +49,10 @@
                     // User searches
                     case "search":
 						$r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
+						if ($r === true) {
+							echo "No Entries Found for Query {$serendipity['GET']['searchTerm']}\n";
+							break;
+						}
                         echo "Your search for ".$serendipity["GET"]["searchTerm"]." returned ".
 							 count($r)." results: ";
                         serendipity_printEntries($r);

[php-blog-cvs] serendipity db.sql,1.1.1.1,1.2 search.php,1.1.1.1,1.2 serendipity_functions.inc.php,1.3,1.4

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv1963

Modified Files:
	db.sql search.php serendipity_functions.inc.php 
Log Message:
make fulltext work


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- db.sql	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ db.sql	29 Mar 2003 16:44:46 -0000	1.2
@@ -47,7 +47,7 @@
   categoryid int(11) default null
 );
 
-CREATE {FULLTEXT} INDEX title on {PREFIX}entries (title,body,extended);
+CREATE FULLTEXT INDEX entry on {PREFIX}entries (title,body,extended);
 
 #
 # table structure for table '{PREFIX}references'

Index: search.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/search.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- search.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ search.php	29 Mar 2003 16:44:46 -0000	1.2
@@ -1,5 +1,5 @@
 <?php
 session_start();
 include_once("serendipity_config.inc.php");
-include_once("serendipity_genpage.php");
+include_once("serendipity_genpage.inc.php");
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_functions.inc.php	29 Mar 2003 16:13:08 -0000	1.3
+++ serendipity_functions.inc.php	29 Mar 2003 16:44:46 -0000	1.4
@@ -253,7 +253,7 @@
 	global $serendipity;
 
     $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$serendipity["dbPrefix"]."entries
-                    WHERE MATCH (title, extended, body) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
+                    WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
 
 	return serendipity_db_query($querystring);
 }

[php-blog-cvs] serendipity index.php,1.1.1.1,1.2 serendipity_db_mysql.inc.php,1.1.1.1,1.2 serendipity_functions.inc.php,1.2,1.3

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

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv19330

Modified Files:
	index.php serendipity_db_mysql.inc.php 
	serendipity_functions.inc.php 
Log Message:
make month selection work again


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- index.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ index.php	29 Mar 2003 16:13:08 -0000	1.2
@@ -9,6 +9,7 @@
         $range = $matches[2];
         $_GET['serendipity']['action'] = "read";
         $_GET['serendipity']['range'] = $range;
+	
 
         if (strlen($range) == 6) {
             $date = date("m/Y", mktime(0,0,0, substr($range, 4, 6), 2, substr($range, 0, 4)));
@@ -28,7 +29,7 @@
             fclose($fp);
         }
         
-        print $data;
+        echo $data;
     } else if (preg_match('@/(e_(\d+)\.html)@', $uri, $matches)) {
         $id = $matches[2];
     

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_db_mysql.inc.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_db_mysql.inc.php	29 Mar 2003 16:13:08 -0000	1.2
@@ -16,7 +16,7 @@
 		'both'	=> MYSQL_BOTH
 		);
 
-	//highlight_string(var_export($sql, 1));
+//	highlight_string(var_export($sql, 1));
 
 	$c = mysql_db_query($serendipity['dbName'], $sql);
 	if (!$c) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_functions.inc.php	29 Mar 2003 15:28:55 -0000	1.2
+++ serendipity_functions.inc.php	29 Mar 2003 16:13:08 -0000	1.3
@@ -195,7 +195,7 @@
 		$day = (int)substr($range, 6, 2);
 
 		$startts = mktime(0, 0, 0, $month, $day, $year);
-		$endts = mktime(0, 0, 0, $month, $day+1, $year);
+		$endts = mktime(0, 0, 0, $month+1, 0, $year);
 
 		$and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
 	}

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.75,1.76 jBlog_layout.php,1.15,1.16 jBlog_layout_table.php,1.1,1.2

[<jhe...@us...>]

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

Modified Files:
	jBlog_functions.inc.php jBlog_layout.php 
	jBlog_layout_table.php 
Log Message:
A quick and dirty so user's can view the archives.


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- jBlog_functions.inc.php	27 Mar 2003 21:29:49 -0000	1.75
+++ jBlog_functions.inc.php	28 Mar 2003 11:44:04 -0000	1.76
@@ -1525,6 +1525,48 @@
     fclose($fp);
 }
 
+/*
+* Amount of posts for given year & month
+*/
+function jBlog_postAmount($year, $month) {
+    global $jBlog;
+    $s = mktime(0,0,0, $month, 1, $year);
+    $e = mktime(23,59,59, $month, date("t",$s) , $year);
+    $querystring = "SELECT count(id) FROM {$jBlog['dbPrefix']}entries WHERE timestamp>$s AND timestamp<$e";
+    $query = jBlog_db_query($querystring);
+    return $query[0][0];
+}
+
+/*
+* Print the archive
+*/
+function jBlog_printArchives() {
+    global $jBlog;
+
+    echo "<div class='jBlog_title'>The Archive:</div>";
+    $f = jBlog_db_query("SELECT timestamp FROM {$jBlog['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
+    $lastYear = date("Y", $f[0][0]);
+    $lastMonth= date("m", $f[0]);
+    $currYear = date("Y");
+    while($currYear>=$lastYear) {
+         echo "<h2>$currYear</h2><div class='jBlog_entry'>";
+         for($x=1; $x<13; $x++) {
+              $entries = jBlog_postAmount($currYear, $x);
+              if ($entries>0) {
+                  $a = "<a href='{$jBlog['jBlogHTTPPath']}archives/d_$currYear".sprintf("%02s",$x).".html'>";
+                  $b = "($entries entries)</a>";
+              }
+              else {
+                  $a = "<font color='#cdcdcd'>";
+                  $b = "</font>";
+              } 
+              if ($x<=date("m") || $currYear < date("Y"))
+                  echo str_repeat("&nbsp;", 8)."$a{$jBlog['months'][$x]} $b<br>"; 
+         }
+         echo "</div>"; 
+         $currYear--;
+    }
+}
 
 define("JBLOG_FUNCTIONS_LOADED", true);
 ?>

Index: jBlog_layout.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jBlog_layout.php	11 Mar 2003 18:49:06 -0000	1.15
+++ jBlog_layout.php	28 Mar 2003 11:44:05 -0000	1.16
@@ -64,6 +64,11 @@
                         jBlog_printEntries($r);
                     break;
 
+                    // Show the archives
+                    case "archives":
+                        jBlog_printArchives();
+                    break;
+
                     // Welcome screen or whatever
                     default:
                     	jBlog_printEntries(jBlog_fetchEntries(null, true, 15));

Index: jBlog_layout_table.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_layout_table.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_layout_table.php	11 Mar 2003 01:41:07 -0000	1.1
+++ jBlog_layout_table.php	28 Mar 2003 11:44:05 -0000	1.2
@@ -54,6 +54,11 @@
                         jBlog_printEntries($r);
                     break;
 
+                    // Show the archive
+                    case "archives":
+                       jBlog_printArchives();
+                    break;
+
                     // Welcome screen or whatever
                     default:
                     	jBlog_printEntries(jBlog_fetchEntries(null, true, 15));

[php-blog-cvs] jBlog jBlog_functions.inc.php,1.74,1.75

[<jhe...@us...>]

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

Modified Files:
	jBlog_functions.inc.php 
Log Message:
Some CSS fixes. The calendar table's CSS needs to be revised it's pretty messy :)


Index: jBlog_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_functions.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- jBlog_functions.inc.php	14 Mar 2003 22:46:07 -0000	1.74
+++ jBlog_functions.inc.php	27 Mar 2003 21:29:49 -0000	1.75
@@ -112,8 +112,8 @@
 ?>
 <TABLE CLASS='jBlog_calendar' CELLSPACING=0>
 <TR>
-<TD ALIGN='left'><A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="Back" SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
-<TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='calendarHeader'><B><nobr>
+<TD ALIGN='left' class='jBlog_calendarHeader'><A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="Back" SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/back.png' BORDER='0'></A></TD>
+<TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='jBlog_calendarHeader'><B><nobr>
 <?php
 		if ($jBlog["rewrite"]==true) {
         	$link = $jBlog["jBlogHTTPPath"]."archives/d_".$year.sprintf("%02d",$month).".html";
@@ -124,7 +124,7 @@
 ?>
 <a href='<?= $link ?>'><?= $jBlog["months"][$month]." '".substr($year, 2) ?></a>
 </nobr></B></TD>
-<TD ALIGN='right'>
+<TD ALIGN='right' class='jBlog_calendarHeader'>
     <A HREF='<?= $jBlog['jBlogHTTPPath'] ?>index.php?jBlog[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
         <IMG ALT="Forward" SRC='<?= $jBlog["jBlogHTTPPath"] ?>pixel/forward.png' BORDER='0'>
     </A>
@@ -149,9 +149,9 @@
             
                 // Start printing
                 if (($x>0 || $y>=$firstDayWeekDay) && $currDay<=$nrOfDays) {
-
+                    /*
                     if ($activeDays[$currDay] > 1) $bg = "BGCOLOR='#DBECFF'";
-                    else $bg = "";
+                    else $bg = ""; */
                     print("<TD CLASS='jBlog_calendarDay$cellProp' ALIGN='center' $bg VALIGN='middle'>");
 
                     // Print day

[php-blog-cvs] jBlog jBlog_admin.php,1.21,1.22

[<jhe...@us...>]

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

Modified Files:
	jBlog_admin.php 
Log Message:
External stylesheet can now be used optionally.


Index: jBlog_admin.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- jBlog_admin.php	13 Mar 2003 20:20:56 -0000	1.21
+++ jBlog_admin.php	27 Mar 2003 20:33:32 -0000	1.22
@@ -15,6 +15,10 @@
 	<head>
     	<title>jBlog Administration Suite</title>
         <link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php">
+<?php
+   if (strtolower($jBlog['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$jBlog['extCSS']}'>";
+?>
+
     </head>
       <body>
 <div id="jBlog_banner">

[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.15,1.16 jBlog_config_local.tpl,1.8,1.9 jBlog_genpage.php,1.6,1.7

[<jhe...@us...>]

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_config_local.tpl 
	jBlog_genpage.php 
Log Message:
You can now add an external stylesheet optionally.


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- jBlog_admin_installer.inc.php	14 Mar 2003 05:20:16 -0000	1.15
+++ jBlog_admin_installer.inc.php	27 Mar 2003 20:24:00 -0000	1.16
@@ -101,7 +101,7 @@
         	if (@is_array($from)) $value[$x]["default"] = $from[$value[$x]["name"]];
 			echo "<tr>";
 			echo "<td valign='top'>".$value[$x]["name"].":</td>";
-            echo "<td>";
+            echo "<td valign='top'>";
             if ($value[$x]["type"] == "bool") {
 				echo "<input type='radio' name='".$value[$x]["name"]."' value='true'  ".(($value[$x]["default"]==true) ? "CHECKED" : "")."> Yes<br>";
                 echo "<input type='radio' name='".$value[$x]["name"]."' value='false' ".(($value[$x]["default"]==true) ? "" : "CHECKED")."> No<br>";

Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jBlog_config_local.tpl	14 Mar 2003 06:18:30 -0000	1.8
+++ jBlog_config_local.tpl	27 Mar 2003 20:24:01 -0000	1.9
@@ -23,6 +23,7 @@
 $jBlog["pass"]     = "{pass|string|j}";                  // Password for admin login
 $jBlog["email"]     = "{email|string|j}";                  // Email for admin login
 $jBlog["want_mail"] = {want_mail|bool|true};               // Do you want to receive emails when comments are posted to your jBlog?
+$jBlog["extCSS"] = "{extCSS|string|none}";                   // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
 $jBlog["wysiwyg"]	= {wysiwyg|bool|false};									// Do you want to use the WYSIWYG editor?
 $jBlog["layout_mode"] = "{layout_mode|string|table}";     // Layout mode
 

Index: jBlog_genpage.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_genpage.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_genpage.php	11 Mar 2003 01:41:07 -0000	1.6
+++ jBlog_genpage.php	27 Mar 2003 20:24:01 -0000	1.7
@@ -2,6 +2,9 @@
 
 ?><html><head><title><?=htmlentities($jBlog['blogTitle'])?></title>
 <link rel="stylesheet" type="text/css" href="<?=$jBlog['jBlogHTTPPath']?>jBlog.css.php" />
+<?php
+   if (strtolower($jBlog['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$jBlog['extCSS']}'>";
+?>
 <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>

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

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

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

Modified Files:
	jBlog_admin_plugins.inc.php 
Log Message:
fix plugin warning


Index: jBlog_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_plugins.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- jBlog_admin_plugins.inc.php	15 Mar 2003 22:03:28 -0000	1.7
+++ jBlog_admin_plugins.inc.php	26 Mar 2003 21:49:57 -0000	1.8
@@ -192,6 +192,9 @@
 $plugin_placements = array('left','right','hide');
 foreach ($plugin_placements as $plugin_placement) {
 	$plugins = jblog_plugin_api::enum_plugins($plugin_placement);
+	if (!is_array($plugins)) {
+		continue;
+	}
 	$sort_idx = 0;
 	foreach ($plugins as $plugin_data) {
 		$plugin =& jblog_plugin_api::load_plugin($plugin_data['name']);

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

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

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

Modified Files:
	index.php 
Log Message:
fix to allow session ids to be appended to the url


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/index.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.php	13 Mar 2003 12:44:39 -0000	1.8
+++ index.php	25 Mar 2003 18:51:54 -0000	1.9
@@ -5,7 +5,7 @@
 
 $uri = $_SERVER['REQUEST_URI'];
 if (preg_match('@/archives/@', $uri)) {
-    if (preg_match('@/(d_(\d+)\.html)$@', $uri, $matches)) {
+    if (preg_match('@/(d_(\d+)\.html)@', $uri, $matches)) {
         $range = $matches[2];
         $_GET['jBlog']['action'] = "read";
         $_GET['jBlog']['range'] = $range;
@@ -29,7 +29,7 @@
         }
         
         print $data;
-    } else if (preg_match('@/(e_(\d+)\.html)$@', $uri, $matches)) {
+    } else if (preg_match('@/(e_(\d+)\.html)@', $uri, $matches)) {
         $id = $matches[2];
     
         $_GET['jBlog']['action'] = 'read';

[php-blog-cvs] jBlog INSTALL,1.3,1.4

[<jhe...@us...>]

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

Modified Files:
	INSTALL 
Log Message:
Updated installation steps


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/jBlog/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL	19 Mar 2003 13:48:27 -0000	1.3
+++ INSTALL	24 Mar 2003 12:33:00 -0000	1.4
@@ -3,9 +3,8 @@
 ###############################################################################
 
 1. Decompress and put this folder somewhere inside your document root
-2. Adjust .htaccess
-3. Open jBlog in your browser
-5. Done!
+2. Open jBlog in your browser (installer will say hi to you)
+3. Done!
 
 ###############################################################################
 # REQUIREMENTS                                                                #

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

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

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

Modified Files:
	.cvsignore 
Log Message:
Ignore plugins folder


Index: .cvsignore
===================================================================
RCS file: /cvsroot/php-blog/jBlog/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	5 Mar 2003 21:09:38 -0000	1.1
+++ .cvsignore	19 Mar 2003 13:54:10 -0000	1.2
@@ -3,3 +3,4 @@
 .htaccess
 uploads
 archives
+plugins

[php-blog-cvs] jBlog INSTALL,1.2,1.3 jBlog_db_postgres.inc.php,1.1,1.2

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

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

Modified Files:
	INSTALL jBlog_db_postgres.inc.php 
Log Message:
Typo-fix in INSTALL.
Make postgres support work correctly with unix sockets.


Index: INSTALL
===================================================================
RCS file: /cvsroot/php-blog/jBlog/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- INSTALL	14 Mar 2003 21:15:02 -0000	1.2
+++ INSTALL	19 Mar 2003 13:48:27 -0000	1.3
@@ -14,7 +14,7 @@
 1. .htaccess support
 2. PHP Version 4 or greater (PHP 4.3.1 or greater recommended)
 3. php.ini options:
-   - short_open_tags on
+   - short_open_tag on
    - error_reporting E_ALL & ~E_NOTICE (or lower)
    - file_uploads on (For import/image upload features)
 4. php extensions:
@@ -22,7 +22,7 @@
 5. Supported database engine:
    - MySQL
    - PostGreSQL
-   - SQLite
+   - SQLite (not quite!)
 
 ###############################################################################
 # USAGE                                                                       #

Index: jBlog_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_db_postgres.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- jBlog_db_postgres.inc.php	14 Mar 2003 02:38:05 -0000	1.1
+++ jBlog_db_postgres.inc.php	19 Mar 2003 13:48:27 -0000	1.2
@@ -4,7 +4,9 @@
 {
 	global $jBlog;
 
-	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $jBlog['dbHost'], $jBlog['dbName'], $jBlog['dbUser'], $jBlog['dbPass']));
+	$jBlog['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
+		strlen($jBlog['dbHost']) ? ('host=' . $jBlog['dbHost'] . ' ') : '',
+		$jBlog['dbName'], $jBlog['dbUser'], $jBlog['dbPass']));
 
 	return $jBlog['dbConn'];
 }
@@ -89,7 +91,9 @@
 {
 	global $jBlog;
 
-	$jBlog['dbConn'] = pg_connect(sprintf("host=%s dbname=%s user=%s password=%s", $hash['dbHost'], $hash['dbName'], $hash['dbUser'], $hash['dbPass']));
+	$jBlog['dbConn'] = pg_connect(sprintf("%sdbname=%s user=%s password=%s",
+		strlen($hash['dbHost']) ? ('host=' . $hash['dbHost'] . ' ') : '',
+		$hash['dbName'], $hash['dbUser'], $hash['dbPass']));
 	if (!$jBlog['dbConn']) {
 		$errs[] = "Could not connect to database; check your settings.";
 		return false;