php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity db.sql,1.9,1.10

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

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

Modified Files:
	db.sql 
Log Message:
nitfix


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- db.sql	3 Apr 2003 19:44:03 -0000	1.9
+++ db.sql	3 Apr 2003 19:47:03 -0000	1.10
@@ -111,7 +111,7 @@
   last timestamp NOT NULL
 );
 
-CREATE unique INDEX url on {PREFIX}suppress (url, ip);
+CREATE unique INDEX url on {PREFIX}suppress (host, ip);
 
 CREATE TABLE {PREFIX}plugins (
 	name varchar(128) not null,

[php-blog-cvs] serendipity db.sql,1.8,1.9

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

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

Modified Files:
	db.sql 
Log Message:
Maximum length for varchar is 255


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- db.sql	3 Apr 2003 19:31:54 -0000	1.8
+++ db.sql	3 Apr 2003 19:44:03 -0000	1.9
@@ -61,7 +61,7 @@
 );
 
 #
-# Table structure for table '{PREFIX}exits'
+# Table structure for table '{PREFIX}/suppxits'
 # 
 
 CREATE TABLE {PREFIX}exits (
@@ -106,8 +106,8 @@
   scheme varchar(5), 
   host varchar(128),   
   port varchar(5),
-  path varchar(256),
-  query varchar(256),  
+  path varchar(255),
+  query varchar(255),  
   last timestamp NOT NULL
 );
 

[php-blog-cvs] serendipity db.sql,1.7,1.8 serendipity_functions.inc.php,1.23,1.24

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

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

Modified Files:
	db.sql serendipity_functions.inc.php 
Log Message:
Maximum length for varchar is 255


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- db.sql	3 Apr 2003 16:18:26 -0000	1.7
+++ db.sql	3 Apr 2003 19:31:54 -0000	1.8
@@ -81,8 +81,8 @@
   scheme varchar(5), 
   host varchar(128) NOT NULL,   
   port varchar(5),
-  path varchar(256),
-  query varchar(256),  
+  path varchar(255),
+  query varchar(255),  
   PRIMARY KEY  (host,day)
 );
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- serendipity_functions.inc.php	3 Apr 2003 16:18:27 -0000	1.23
+++ serendipity_functions.inc.php	3 Apr 2003 19:31:54 -0000	1.24
@@ -1503,7 +1503,7 @@
     global $serendipity;
 
     $query = "SELECT host, SUM(count) AS total
-              FROM $serendipity[dbPrefix]$list
+              FROM {$serendipity['dbPrefix']}$list
               GROUP BY host 
               ORDER BY total DESC, host
               LIMIT $limit";

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

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
allow variables to be reconfigurable


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin_installer.inc.php	2 Apr 2003 21:02:05 -0000	1.6
+++ serendipity_admin_installer.inc.php	3 Apr 2003 16:32:28 -0000	1.7
@@ -196,9 +196,7 @@
 		 echo "<font color='#ff0000'>".implode("<br>", $errs)."</font><p>";
 		 serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $_POST);
 	 } else {
-		 if (IN_serendipity!==true) {
-			 define('IN_serendipity', true);
-
+		 if (IN_serendipity !== true) {
 			 // Create .htaccess
 			 $a = file("./htaccess.tpl");
 			 $fp = @fopen("./.htaccess", "w");
@@ -240,53 +238,59 @@
 			 if (is_string($res)) {
 				 echo $res;
 			 }
+		}
 
-			 // Save all basic config variables to the database
-			 $p = serendipity_parseTemplate("./serendipity_config_local.tpl");
-			 foreach($p as $key=>$value) {
-				 foreach ($value as $entry) {
-					 $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value) ";
-					 $query .= "VALUES ('" . serendipity_db_escape_string($entry['name']) . "', '";
-					 $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "');"; 
+		// Save all basic config variables to the database
+		$p = serendipity_parseTemplate("./serendipity_config_local.tpl");
+		foreach($p as $key=>$value) {
+			foreach ($value as $entry) {
+				$query = "REPLACE INTO {$_POST['dbPrefix']}config (name, value) ";
+				$query .= "VALUES ('" . serendipity_db_escape_string($entry['name']) . "', '";
+				$query .= serendipity_db_escape_string($_POST[$entry['name']]) . "');"; 
 
-					 serendipity_db_query($query);
-				 }
-			 }
+				serendipity_db_query($query);
+			}
+		}
 
-			 // Create a basic configuration file which gives enough information to open
-			 // the database and get information from the database tables
-			 $configfp = fopen("./serendipity_config_local.inc.php", "w");
-			 if (!is_resource($fp)) {
-				 echo '<font color="#ff0000">Error! Could not write to ./serendipity_config_local.inc.php</font><br>';
-				 echo "Try <i>chown -R www:www {$_POST['serendipityPath']}</i><br>";
-				 echo "followd by <i>chmod 770 {$_POST['serendipityPath']}</i> (change www to the";
-				 echo "user apache runs as.)</font><br />";
-				 echo "Once you've done this, hit your browser's \"reload\" button.";
-				 exit();
-			 }
+		// Create a basic configuration file which gives enough information to open
+		// the database and get information from the database tables
+		$configfp = fopen("./serendipity_config_local.inc.php", "w");
+		if (!is_resource($configfp)) {
+			echo '<font color="#ff0000">Error! Could not write to ./serendipity_config_local.inc.php</font><br>';
+			echo "Try <i>chown -R www:www {$_POST['serendipityPath']}</i><br>";
+			echo "followd by <i>chmod 770 {$_POST['serendipityPath']}</i> (change www to the";
+			echo "user apache runs as.)</font><br />";
+			echo "Once you've done this, hit your browser's \"reload\" button.";
+			exit();
+		}
 
-			 fwrite($configfp, "<?php\n");
-			 fwrite($configfp, "\$serendipity['dbName'] = '{$serendipity['dbName']}';\n");
-			 fwrite($configfp, "\$serendipity['dbPrefix'] = '{$serendipity['dbPrefix']}';\n");
-			 fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHost']}';\n");
-			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
-			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
-			 fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
-			 fwrite($configfp, "?>\n");
+		fwrite($configfp, "<?php\n");
+		fwrite($configfp, "\$serendipity['dbName'] = '{$serendipity['dbName']}';\n");
+		fwrite($configfp, "\$serendipity['dbPrefix'] = '{$serendipity['dbPrefix']}';\n");
+		fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHost']}';\n");
+		fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
+		fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
+		fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
+		fwrite($configfp, "?>\n");
 
-			 fclose($configfp);
+		fclose($configfp);
 
+		chmod("./serendipity_config_local.inc.php", 0770);
 
-			 /* register default plugins */
-			 $GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
-			 $GLOBALS['serendipity']['dbName'] = $_POST['dbName'];
-			 include_once "serendipity_plugin_api.php";
-			 serendipity_plugin_api::register_default_plugins();
+		if (IN_serendipity !== true) {
+			define('IN_serendipity', true);
+			/* register default plugins */
+			$GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
+			$GLOBALS['serendipity']['dbName'] = $_POST['dbName'];
+			include_once "serendipity_plugin_api.php";
+			serendipity_plugin_api::register_default_plugins();
 
-			 echo "<p>Welcome to serendipity!</b><p>";
-			 echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["serendipityHTTPPath"]."'>check out your blog</a>";
-			 session_destroy();
-		 }
+			echo "<p>Welcome to serendipity!</b><p>";
+			echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["serendipityHTTPPath"]."'>check out your blog</a>";
+			session_destroy();
+		} else {
+			echo "Configuration variables saved";
+		}
 	 }
 	 break;
 

[php-blog-cvs] serendipity db.sql,1.6,1.7 serendipity_functions.inc.php,1.22,1.23

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

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

Modified Files:
	db.sql serendipity_functions.inc.php 
Log Message:
first work on referrer fixes


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- db.sql	2 Apr 2003 21:02:04 -0000	1.6
+++ db.sql	3 Apr 2003 16:18:26 -0000	1.7
@@ -76,10 +76,14 @@
 # 
 
 CREATE TABLE {PREFIX}referrers (
-  url varchar(128) NOT NULL default '',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
-  PRIMARY KEY  (url,day)
+  scheme varchar(5), 
+  host varchar(128) NOT NULL,   
+  port varchar(5),
+  path varchar(256),
+  query varchar(256),  
+  PRIMARY KEY  (host,day)
 );
 
 #
@@ -98,8 +102,12 @@
 );
 
 CREATE TABLE {PREFIX}suppress (
-  url varchar(128) default NULL,
   ip varchar(15) default NULL,
+  scheme varchar(5), 
+  host varchar(128),   
+  port varchar(5),
+  path varchar(256),
+  query varchar(256),  
   last timestamp NOT NULL
 );
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_functions.inc.php	3 Apr 2003 05:34:31 -0000	1.22
+++ serendipity_functions.inc.php	3 Apr 2003 16:18:27 -0000	1.23
@@ -1397,9 +1397,9 @@
 
 function serendipity_track_referrer() {
     global $serendipity;
-    
-    if (!$_SERVER['HTTP_REFERER'] || 
-        strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'])) {
+    $url_parts = parse_url($_SERVER['HTTP_REFERER']);
+    if (!$url_parts['host'] || 
+        strstr($_url_parts['host'], $_SERVER['SERVER_NAME'])) {
         return;
     }
 
@@ -1410,13 +1410,23 @@
     $suppressq = "SELECT count(1) 
                   FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
-                  AND url = '$_SERVER[HTTP_REFERER]'
+                  AND scheme = '$url_parts[scheme]'
+                  AND port = '$url_parts[port]'
+                  AND host = '$url_parts[host]'
+                  AND path = '$url_parts[path]'
+                  AND query = '$url_parts[query]'
                   AND last > now() - 900";
 
-  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
+  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress 
+                  WHERE ip = '$_SERVER[REMOTE_ADDR]'
+                  AND scheme = '$url_parts[scheme]'
+                  AND host = '$url_parts[host]'
+                  AND port = '$url_parts[port]'
+                  AND query = '$url_parts[query]'
+                  AND path = '$url_parts[path]'";
     $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
-                  (url, ip, last) 
-                  VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
+                  (ip, last, scheme, host, port, path, query)   
+                  VALUES ('$_SERVER[REMOTE_ADDR]', now(), '$url_parts[scheme]', '$url_parts[host]', '$url_parts[port]', '$url_parts[path]', '$url_parts[query]')";
 
     $count = serendipity_db_query($suppressq, true);
 
@@ -1445,19 +1455,21 @@
 function serendipity_track_url($list, $url) {
     global $serendipity;
 
-    $u   = parse_url($url);
-    $url = $u['scheme'] . '://' . $u['host'];
+    $url_parts   = parse_url($url);
 
     serendipity_db_query(
       sprintf(
         "UPDATE %s%s
             SET count = count + 1
-          WHERE url = '%s'
+          WHERE scheme = '$url_parts[scheme]'
+            AND host = '$url_parts[host]'
+            AND port = '$url_parts[port]'
+            AND path = '$url_parts[path]'
+            AND query = '$url_parts[query]'
             AND day = NOW()",
 
         $serendipity['dbPrefix'],
-        $list,
-        $url
+        $list
       )
     );
 
@@ -1465,12 +1477,15 @@
         serendipity_db_query(
           sprintf(
             "INSERT INTO %s%s
-                    (url, day, count)
-             VALUES ('%s', NOW(), 1)",
-
+                    (day, count, scheme, host, port, path, query)
+             VALUES ( NOW(), 1, '%s', '%s', '%s', '%s', '%s')",
             $serendipity['dbPrefix'],
             $list,
-            $url
+            $url_parts[scheme],
+            $url_parts[host],
+            $url_parts[port],
+            $url_parts[path],
+            $url_parts[query]
           )
         );
     }
@@ -1487,10 +1502,10 @@
 function serendipity_displayTopUrlList($list, $limit) {
     global $serendipity;
 
-    $query = "SELECT url, SUM(count) AS total
+    $query = "SELECT host, SUM(count) AS total
               FROM $serendipity[dbPrefix]$list
-              GROUP BY url
-              ORDER BY total DESC, url
+              GROUP BY host 
+              ORDER BY total DESC, host
               LIMIT $limit";
     
     $rows = serendipity_db_query($query);
@@ -1498,10 +1513,9 @@
     if (is_array($rows)) {
         foreach ($rows as $row) {
             printf(
-              '<a href="%s">%s</a> (%s)<br />',
+              '<b>%s</b> (%s)<br />',
 
-              $row['url'],
-              $row['url'],
+              $row['host'],
               $row['total']
             );
         }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.21,1.22

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Refactor URL storage.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_functions.inc.php	2 Apr 2003 21:14:40 -0000	1.21
+++ serendipity_functions.inc.php	3 Apr 2003 05:34:31 -0000	1.22
@@ -1445,6 +1445,9 @@
 function serendipity_track_url($list, $url) {
     global $serendipity;
 
+    $u   = parse_url($url);
+    $url = $u['scheme'] . '://' . $u['host'];
+
     serendipity_db_query(
       sprintf(
         "UPDATE %s%s
@@ -1483,22 +1486,26 @@
 
 function serendipity_displayTopUrlList($list, $limit) {
     global $serendipity;
+
     $query = "SELECT url, SUM(count) AS total
               FROM $serendipity[dbPrefix]$list
               GROUP BY url
               ORDER BY total DESC, url
               LIMIT $limit";
+    
+    $rows = serendipity_db_query($query);
 
-	$rows = serendipity_db_query($query);
-	if (is_array($rows)) {
-                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>";
-                }
-	}
+    if (is_array($rows)) {
+        foreach ($rows as $row) {
+            printf(
+              '<a href="%s">%s</a> (%s)<br />',
+
+              $row['url'],
+              $row['url'],
+              $row['total']
+            );
+        }
+    }
 }
 
 function serendipity_set_config_var($name, $val) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.20,1.21

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
don't due serial autodiscovery :)



Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_functions.inc.php	2 Apr 2003 21:02:07 -0000	1.20
+++ serendipity_functions.inc.php	2 Apr 2003 21:14:40 -0000	1.21
@@ -666,11 +666,18 @@
 }
 
 function
-serendipity_trackback_autodiscover($res, $url, $author, $title, $text)
+serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text)
 {
     if(!preg_match('@trackback:ping(\s*rdf:resource)?\s*=\s*"(http:[^"]+)"@', $res, $matches)) {
         return;
     }
+
+	if (preg_match('@dc:identifier\s*=\s*"(http:[^"]+)"@', $res, $test)) {
+		if ($loc != $test[1]) {
+			return;
+		}
+	}
+
     $data = "url=".rawurlencode($url)."&title=".rawurlencode($title).
             "&blog_name=".rawurlencode($author)."&excerpt=".rawurlencode($text);
     $response = serendipity_trackback_is_success(_serendipity_send($matches[2], $data));
@@ -686,7 +693,7 @@
         $res .= fgets($fp, 1024);
     }
     fclose($fp);
-    serendipity_trackback_autodiscover($res, $url, $author, $title, $text);
+    serendipity_trackback_autodiscover($res, $loc, $url, $author, $title, $text);
     serendipity_pingback_autodiscover($loc, $res);
 }
 

[php-blog-cvs] serendipity db.sql,1.5,1.6 serendipity_admin_installer.inc.php,1.5,1.6 serendipity_config.inc.php,1.3,1.4 serendipity_config_local.tpl,1.2,1.3 serendipity_functions.inc.php,1.19,1.20

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

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

Modified Files:
	db.sql serendipity_admin_installer.inc.php 
	serendipity_config.inc.php serendipity_config_local.tpl 
	serendipity_functions.inc.php 
Log Message:
remove weblogid from schemas, apologies to all who upgraded: sorry!
default is 0 for false


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db.sql	31 Mar 2003 22:17:11 -0000	1.5
+++ db.sql	2 Apr 2003 21:02:04 -0000	1.6
@@ -2,16 +2,6 @@
 # Table structure for table '{PREFIX}authors'
 #
 
-create table {PREFIX}weblogs (
-	weblogid {AUTOINCREMENT}
-);
-
-create table {PREFIX}perms (
-	weblogid int(11) not null,
-	userid   int(11) not null,
-	permid   int(4)  not null
-);
-
 create table {PREFIX}authors (
   username varchar(20) default null,
   password varchar(32) default null,
@@ -28,7 +18,6 @@
 create table {PREFIX}comments (
   id {AUTOINCREMENT},
   entry_id int(10) {UNSIGNED} not null default '0',
-  weblogid int(11) not null,
   timestamp int(10) {UNSIGNED} default null,
   title varchar(150) default null,
   author varchar(80) default null,
@@ -55,8 +44,7 @@
   exflag int(1) default null,
   author varchar(20) default null,
   authorid int(11) default null,
-  categoryid int(11) default null,
-  weblogid int(11) not null
+  categoryid int(11) default null
 );
 
 CREATE FULLTEXT INDEX entry on {PREFIX}entries (title,body,extended);
@@ -69,8 +57,7 @@
   id {AUTOINCREMENT},
   entry_id int(10) {UNSIGNED} not null default '0',
   link text,
-  name text,
-  weblogid int(11) not null
+  name text
 );
 
 #
@@ -92,7 +79,6 @@
   url varchar(128) NOT NULL default '',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
-  weblogid int(11) not null,
   PRIMARY KEY  (url,day)
 );
 
@@ -103,21 +89,18 @@
 CREATE TABLE {PREFIX}css (
   cssid {AUTOINCREMENT},
   name varchar(40) default NULL,
-  data text,
-  weblogid int(11) not null
+  data text
 );
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,
-	value text not null,
-	weblogid int(11) not null
+	value text not null
 );
 
 CREATE TABLE {PREFIX}suppress (
   url varchar(128) default NULL,
   ip varchar(15) default NULL,
-  last timestamp NOT NULL,
-  weblogid int(11) not null
+  last timestamp NOT NULL
 );
 
 CREATE unique INDEX url on {PREFIX}suppress (url, ip);
@@ -133,6 +116,5 @@
   categoryid {AUTOINCREMENT},
   category_name varchar(255) default NULL,
   category_description text,
-  authorid int(11) default NULL,
-  weblogid int(11) not null
+  authorid int(11) default NULL
 );

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_installer.inc.php	31 Mar 2003 21:59:25 -0000	1.5
+++ serendipity_admin_installer.inc.php	2 Apr 2003 21:02:05 -0000	1.6
@@ -120,7 +120,6 @@
     $fp = fopen($filename, 'r');
     while (!@feof($fp)) {
         $line = trim(fgets($fp));
-        var_dump($line);
         if ($in_table) {
             $def .= $line;
             if (preg_match('/^\)\s*(type\=\S+)?\s*\;$/i', $line)) {
@@ -236,7 +235,7 @@
 			 serendipity_db_query($query);
 
 			 $text = serendipity_db_escape_string(file_get_contents('./serendipity.css'));
-			 $query = "INSERT into $_POST[dbPrefix]css (name, data, weblogid) values ('default', '$text', '1')";
+			 $query = "INSERT into $_POST[dbPrefix]css (name, data) values ('default', '$text')";
 			 $res = serendipity_db_query($query);
 			 if (is_string($res)) {
 				 echo $res;
@@ -246,9 +245,9 @@
 			 $p = serendipity_parseTemplate("./serendipity_config_local.tpl");
 			 foreach($p as $key=>$value) {
 				 foreach ($value as $entry) {
-					 $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value, weblogid) ";
+					 $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value) ";
 					 $query .= "VALUES ('" . serendipity_db_escape_string($entry['name']) . "', '";
-					 $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "', '1');"; 
+					 $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "');"; 
 
 					 serendipity_db_query($query);
 				 }
@@ -273,7 +272,6 @@
 			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
 			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
 			 fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
-			 fwrite($configfp, "\$serendipity['weblogId'] = '1';\n");
 			 fwrite($configfp, "?>\n");
 
 			 fclose($configfp);

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_config.inc.php	31 Mar 2003 21:49:26 -0000	1.3
+++ serendipity_config.inc.php	2 Apr 2003 21:02:06 -0000	1.4
@@ -29,7 +29,7 @@
 					 );
 
 // Load Configuration options from the database
-$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config WHERE weblogid='1'");
+$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config");
 foreach ($rows as $row) {
 	$serendipity[$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
 }

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_config_local.tpl	1 Apr 2003 06:30:31 -0000	1.2
+++ serendipity_config_local.tpl	2 Apr 2003 21:02:06 -0000	1.3
@@ -24,7 +24,7 @@
 $serendipity["email"]     = "{email|string|j}";                  // Email for admin login
 $serendipity["want_mail"] = {want_mail|bool|true};               // Do you want to receive emails when comments are posted to your serendipity?
 $serendipity["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)
-$serendipity["wysiwyg"]	= {wysiwyg|bool|false};									// Do you want to use the WYSIWYG editor?
+$serendipity["wysiwyg"]	= {wysiwyg|bool|0};									// Do you want to use the WYSIWYG editor?
 $serendipity["layout_mode"] = "{layout_mode|string|table}";     // Layout mode
 
 $serendipity["blogTitle"] = "{blogTitle|string|Foo Bar}";  // Site title
@@ -38,5 +38,5 @@
 $serendipity["thumbSuffix"] = "{thumbSuffix|string|serendipityThumb}";     // Thumbnails will be named original.Suffix.ext
 $serendipity["thumbSize"]   = "{thumbSize|int|110}";                   // Maximum dimension of thumbnails
 
-$serendipity["track_exits"]	= {track_exits|bool|false};									// Do you want to track exit targets?
+$serendipity["track_exits"]	= {track_exits|bool|0};									// Do you want to track exit targets?
 ?>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_functions.inc.php	2 Apr 2003 11:16:51 -0000	1.19
+++ serendipity_functions.inc.php	2 Apr 2003 21:02:07 -0000	1.20
@@ -87,7 +87,7 @@
 		$endts = mktime(0, 0, 0, $month + 1, 1, $year);
 
         // Find out about diary entries
-        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts and weblogid='$serendipity[weblogId]'";
+        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts"; 
         $rows = serendipity_db_query($querystring);
         $activeDays = array();
 		if (is_array($rows)) {
@@ -185,9 +185,9 @@
 		$startts = mktime(0, 0, 0, $month, $day, $year);
 		$endts = mktime(0, 0, 0, $month+1, 0, $year);
 
-		$and = " WHERE timestamp >= $startts AND timestamp <= $endts AND ";
+		$and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
 	} else {
-		$and = " WHERE ";
+		$and = "";
 	}
 
     if (!empty($limit)) {
@@ -197,7 +197,7 @@
     $query = "SELECT e.*, a.username, c.category_name FROM
 			({$serendipity['dbPrefix']}entries AS e LEFT JOIN {$serendipity['dbPrefix']}category c ON e.categoryid = c.categoryid)
 			LEFT JOIN {$serendipity['dbPrefix']}authors a ON
-			e.authorid = a.authorid " . $and . "e.weblogid='$serendipity[weblogId]' " .
+			e.authorid = a.authorid " . $and .
              "ORDER BY timestamp DESC $limit";
     $ret = serendipity_db_query($query);
     if (is_string($ret)) {
@@ -215,7 +215,7 @@
 
 	if ($full === true) $body = ", body, extended";
     $querystring = "SELECT * FROM ".$serendipity["dbPrefix"]."entries e, $serendipity[dbPrefix]authors a
-                    WHERE  a.authorid = e.authorid AND $key LIKE $val and e.weblogid='$serendipity[weblogId]' LIMIT 1";
+                    WHERE  a.authorid = e.authorid AND $key LIKE $val LIMIT 1";
 
 	return serendipity_db_query($querystring, true);
 }
@@ -230,7 +230,7 @@
 		$authorid = $serendipity['authorid'];
 	}
 	
-    $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE weblogid='$serendipity[weblogId]' and authorid = $authorid";
+    $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE authorid = $authorid";
 
 	return serendipity_db_query($querystring);
 }
@@ -243,7 +243,7 @@
 	global $serendipity;
 
     $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$serendipity["dbPrefix"]."entries
-                    WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') AND weblogid='$serendipity[weblogId]' ORDER BY timestamp DESC";
+                    WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
 
 	return serendipity_db_query($querystring);
 }
@@ -349,7 +349,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id and weblogid='$serendipity[weblogId]'";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }
@@ -410,7 +410,7 @@
     $query = "SELECT email, title, mail_comments 
               FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
               WHERE e.id  = '$id'
-              AND e.authorid = a.authorid and e.weblogid='$serendipity[weblogId]";
+              AND e.authorid = a.authorid";
     $row = serendipity_db_query($query, true);
     if($row['mail_comments']) {
         serendipity_sendComment($row['email'], $name, $email, $url, $id, 
@@ -446,7 +446,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "' and weblogid='$serendipity[weblogId]'";
+    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "'";
 
 	return serendipity_db_query($query);
 }
@@ -809,7 +809,7 @@
             $locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
         }
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
-        $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "' and weblogid='$serendipity[weblogId]'";
+        $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
 
         $row = serendipity_db_query($query, true, 'num');
         if ($row[0] > 0) {
@@ -819,7 +819,7 @@
             serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text));
         }
     }
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid' and weblogid='$serendipity[weblogId]'");
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid'");
 
     for ($i = 0; $i < $j; ++$i) {
         $query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES(";
@@ -860,7 +860,6 @@
 	$entry['exflag'] = $exflag;
 	$entry['author'] = $serendipity['user'];
 	$entry['authorid'] = $serendipity['authorid'];
-	$entry['weblogid'] = $serendipity['weblogId'];
 
 	if (!is_numeric($entry["id"])) {
 		/* we need to insert */
@@ -936,14 +935,14 @@
 	if (!is_numeric($id)) return false;
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id and weblogid='$serendipity[weblogId]'", true);
+    $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
     serendipity_purgeEntry($id, $result[0]);
 
-    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "entries WHERE id=$id and weblogid=$serendipity[weblogId]");
+    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "entries WHERE id=$id");
 
-    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "comments WHERE entry_id=$id and weblogid=$serendipity[weblogId]");
+    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "comments WHERE entry_id=$id");
 
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id' and weblogid=$serendipity[weblogId]");
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
 }
 
 function serendipity_updateCSS($css) {
@@ -954,13 +953,12 @@
 
 
 	if ($css["cssid"] == 0) {
-		$css['weblogid'] = $serendipity['weblogId'];	
 		unset($css['cssid']);
 		$res = serendipity_db_insert('css', $css);
 		$newEntry = 1;
 		$css['cssid'] = serendipity_db_insert_id();
 	} else {
-		$res = serendipity_db_update('css', array('cssid' => $css['cssid'], 'weblogid' => $serendipity['weblogId']), $css);
+		$res = serendipity_db_update('css', array('cssid' => $css['cssid']), $css);
 	}
 		
 	if (is_string($res)) {
@@ -1406,9 +1404,9 @@
                   FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND url = '$_SERVER[HTTP_REFERER]'
-                  AND last > now() - 900 and weblogid='$serendipity[weblogId]'";
+                  AND last > now() - 900";
 
-  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
+  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
     $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
                   (url, ip, last) 
                   VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
@@ -1429,7 +1427,7 @@
 function serendipity_track_referrer_gc() {
     global $serendipity;
     
-    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900 and weblogid='$serendipity[weblogId]'";
+    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900";
     serendipity_db_query($gc);
 }
 
@@ -1444,13 +1442,11 @@
       sprintf(
         "UPDATE %s%s
             SET count = count + 1
-          WHERE weblogid = %d
-            AND url = '%s'
+          WHERE url = '%s'
             AND day = NOW()",
 
         $serendipity['dbPrefix'],
         $list,
-        $serendipity['weblogId'],
         $url
       )
     );
@@ -1459,12 +1455,11 @@
         serendipity_db_query(
           sprintf(
             "INSERT INTO %s%s
-                    (weblogid, url, day, count)
-             VALUES (%d, '%s', NOW(), 1)",
+                    (url, day, count)
+             VALUES ('%s', NOW(), 1)",
 
             $serendipity['dbPrefix'],
             $list,
-            $serendipity['weblogId'],
             $url
           )
         );
@@ -1483,7 +1478,6 @@
     global $serendipity;
     $query = "SELECT url, SUM(count) AS total
               FROM $serendipity[dbPrefix]$list
-			  WHERE weblogid='$serendipity[weblogId]'
               GROUP BY url
               ORDER BY total DESC, url
               LIMIT $limit";
@@ -1503,8 +1497,8 @@
 function serendipity_set_config_var($name, $val) {
     global $serendipity;
 
-	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "' and weblogid='$serendipity[weblogId]'");
-	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>$serendipity[weblogId]));
+	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
+	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val));
 	if (is_string($r)) {
 		echo $r;
 	}
@@ -1513,7 +1507,7 @@
 function serendipity_get_config_var($name, $defval = false) {
     global $serendipity;
 	$name = serendipity_db_escape_string($name);
-	$c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name' and weblogid='$serendipity[weblogId]'", true);
+	$c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name'", true);
 	if (is_array($c)) {
 		return $c[0];
 	}
@@ -1525,7 +1519,7 @@
 
 	$names = array();
 		
-	$query = "SELECT cssid, name from $serendipity[dbPrefix]css where weblogid=$serendipity[weblogId] order by name";
+	$query = "SELECT cssid, name from $serendipity[dbPrefix]css where order by name";
     $rows = serendipity_db_query($query);
 	foreach ($rows as $row) {
 		$names[$row['cssid']] = $row['name'];
@@ -1538,12 +1532,12 @@
     global $serendipity;
 
 	if (is_numeric($name)) {
-    	$query = "select * from $serendipity[dbPrefix]css where cssid = '$name' and weblogid='$serendipity[weblogId]'";
+    	$query = "select * from $serendipity[dbPrefix]css where cssid = '$name'";
 	} else {
 		if ($name === null) {
 			$name = serendipity_get_config_var("default_css", "default");
 		}
-    	$query = "select * from $serendipity[dbPrefix]css where name = '$name' and weblogid='$serendipity[weblogId]'";
+    	$query = "select * from $serendipity[dbPrefix]css where name = '$name'";
 	}
 
 	$qh = serendipity_db_query($query, true);
@@ -1597,7 +1591,7 @@
     global $serendipity;
     $s = mktime(0,0,0, $month, 1, $year);
     $e = mktime(23,59,59, $month, date("t",$s) , $year);
-    $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE weblogid='$serendipity[weblogId]' and timestamp>$s AND timestamp<$e";
+    $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE timestamp>$s AND timestamp<$e";
     $query = serendipity_db_query($querystring);
     return $query[0][0];
 }
@@ -1609,7 +1603,7 @@
     global $serendipity;
 
     echo "<div class='serendipity_title'>The Archive:</div>";
-    $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries where weblogid='$serendipity[weblogId]' ORDER BY timestamp ASC LIMIT 1");
+    $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
     $lastYear = date("Y", $f[0][0]);
     $lastMonth= date("m", $f[0]);
     $currYear = date("Y");

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.18,1.19

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Make Wez happ{y|ier} and add title='' to exit URLs.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_functions.inc.php	2 Apr 2003 09:49:13 -0000	1.18
+++ serendipity_functions.inc.php	2 Apr 2003 11:16:51 -0000	1.19
@@ -541,10 +541,11 @@
   $url = 'http://' . $buffer[2];
 
   return sprintf(
-    '<a href="%sexit.php?url=%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+    '<a href="%sexit.php?url=%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
 
     $serendipity['baseURL'],
     base64_encode($url),
+    $url,
     $url
   );
 }

Re: [php-blog-cvs] serendipity serendipity_functions.inc.php,1.16,1.17

[Wez F. <we...@th...>]

How about adding a title="%s" attribute for the original URL?

--Wez.

On Tue, 1 Apr 2003 ber...@us... wrote:

> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv31963
>
> Modified Files:
> 	serendipity_functions.inc.php
> Log Message:
> Add missing 'onMouseOut' JavaScript event.
>
> Index: serendipity_functions.inc.php
> ===================================================================
> RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -d -r1.16 -r1.17
> --- serendipity_functions.inc.php	2 Apr 2003 07:05:42 -0000	1.16
> +++ serendipity_functions.inc.php	2 Apr 2003 07:13:45 -0000	1.17
> @@ -533,13 +533,13 @@
>
>  /**
>  * Transforms '<a href="http://url/">' into
> -* '<a href="exit.php?url=encurl" onMouseOver="window.status='http://url/';return true;">'.
> +* '<a href="exit.php?url=encurl" ...>'.
>  */
>  function serendipity_encodeExitsCallback($buffer) {
>    $url = 'http://' . $buffer[2];
>
>    return sprintf(
> -    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;"',
> +    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
>
>      base64_encode($url),
>      $url

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.17,1.18

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Prepend exit.php URL with $serendipity['baseURL'].

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_functions.inc.php	2 Apr 2003 07:13:45 -0000	1.17
+++ serendipity_functions.inc.php	2 Apr 2003 09:49:13 -0000	1.18
@@ -536,11 +536,14 @@
 * '<a href="exit.php?url=encurl" ...>'.
 */
 function serendipity_encodeExitsCallback($buffer) {
+  global $serendipity;
+
   $url = 'http://' . $buffer[2];
 
   return sprintf(
-    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+    '<a href="%sexit.php?url=%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
 
+    $serendipity['baseURL'],
     base64_encode($url),
     $url
   );

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.16,1.17

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add missing 'onMouseOut' JavaScript event.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_functions.inc.php	2 Apr 2003 07:05:42 -0000	1.16
+++ serendipity_functions.inc.php	2 Apr 2003 07:13:45 -0000	1.17
@@ -533,13 +533,13 @@
 
 /**
 * Transforms '<a href="http://url/">' into
-* '<a href="exit.php?url=encurl" onMouseOver="window.status='http://url/';return true;">'.
+* '<a href="exit.php?url=encurl" ...>'.
 */
 function serendipity_encodeExitsCallback($buffer) {
   $url = 'http://' . $buffer[2];
 
   return sprintf(
-    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;"',
+    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
 
     base64_encode($url),
     $url

[php-blog-cvs] serendipity exit.php,NONE,1.1

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

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

Added Files:
	exit.php 
Log Message:
Add script to track exit targets.

--- NEW FILE: exit.php ---
<?php
include_once 'serendipity_config.inc.php';

$url = $serendipity['baseURL'];

if ( isset($_GET['url']) &&
    !empty($_GET['url'])) {
    $url = str_replace('&amp;', '&', base64_decode($_GET['url']));
    serendipity_track_exit($url);
}

header('Location: ' . $url);
?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.15,1.16

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Refactor URL tracking to handle exit targets.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_functions.inc.php	1 Apr 2003 19:12:13 -0000	1.15
+++ serendipity_functions.inc.php	2 Apr 2003 07:05:42 -0000	1.16
@@ -1389,41 +1389,37 @@
 function serendipity_track_referrer() {
     global $serendipity;
     
-	if(!$_SERVER['HTTP_REFERER'] || 
-       strstr($_SERVER['HTTP_REFERER'],$_SERVER['SERVER_NAME']))
-    {
+    if (!$_SERVER['HTTP_REFERER'] || 
+        strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'])) {
         return;
     }
-    if(rand(0,100) < 1) {
+
+    if (rand(0, 100) < 1) {
         serendipity_track_referrer_gc();
     } 
+
     $suppressq = "SELECT count(1) 
                   FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND url = '$_SERVER[HTTP_REFERER]'
                   AND last > now() - 900 and weblogid='$serendipity[weblogId]'";
-	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
+
+  	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
     $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
                   (url, ip, last) 
                   VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
-    $update = "UPDATE $serendipity[dbPrefix]referrers
-               SET count = count + 1 
-               WHERE url = '$_SERVER[HTTP_REFERER]' 
-               AND day = now()"; 
-    $insert = "INSERT into $serendipity[dbPrefix]referrers
-              (url, day, count,weblogid)
-              VALUES ('$_SERVER[HTTP_REFERER]', now(), 1, $serendipity[weblogId])";
+
     $count = serendipity_db_query($suppressq, true);
-    if($count[0] > 0) {
+
+    if ($count[0] > 0) {
         serendipity_db_query($suppressu);
         return;
     } 
+
     serendipity_db_query($suppressp);
     serendipity_db_query($suppressu);
-    serendipity_db_query($update);
-    if (serendipity_db_affected_rows() == 0) {
-        serendipity_db_query($insert);
-    }
+
+    serendipity_track_url('referrers', $_SERVER['HTTP_REFERER']);
 }    
 
 function serendipity_track_referrer_gc() {
@@ -1431,6 +1427,44 @@
     
     $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900 and weblogid='$serendipity[weblogId]'";
     serendipity_db_query($gc);
+}
+
+function serendipity_track_exit($url) {
+    serendipity_track_url('exits', $url);
+}
+
+function serendipity_track_url($list, $url) {
+    global $serendipity;
+
+    serendipity_db_query(
+      sprintf(
+        "UPDATE %s%s
+            SET count = count + 1
+          WHERE weblogid = %d
+            AND url = '%s'
+            AND day = NOW()",
+
+        $serendipity['dbPrefix'],
+        $list,
+        $serendipity['weblogId'],
+        $url
+      )
+    );
+
+    if (serendipity_db_affected_rows() == 0) {
+        serendipity_db_query(
+          sprintf(
+            "INSERT INTO %s%s
+                    (weblogid, url, day, count)
+             VALUES (%d, '%s', NOW(), 1)",
+
+            $serendipity['dbPrefix'],
+            $list,
+            $serendipity['weblogId'],
+            $url
+          )
+        );
+    }
 }
 
 function serendipity_displayTopReferrers($limit = 10) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.14,1.15

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add URL as secondary ORDER BY criteria.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_functions.inc.php	1 Apr 2003 09:37:21 -0000	1.14
+++ serendipity_functions.inc.php	1 Apr 2003 19:12:13 -0000	1.15
@@ -1443,11 +1443,11 @@
 
 function serendipity_displayTopUrlList($list, $limit) {
     global $serendipity;
-    $query = "SELECT url, sum(count) AS total
+    $query = "SELECT url, SUM(count) AS total
               FROM $serendipity[dbPrefix]$list
 			  WHERE weblogid='$serendipity[weblogId]'
               GROUP BY url
-              ORDER BY total desc
+              ORDER BY total DESC, url
               LIMIT $limit";
 
 	$rows = serendipity_db_query($query);

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.13,1.14 serendipity_sidebar_items.php,1.2,1.3

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

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

Modified Files:
	serendipity_functions.inc.php serendipity_sidebar_items.php 
Log Message:
Improve 'powered by' messages.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_functions.inc.php	1 Apr 2003 06:31:19 -0000	1.13
+++ serendipity_functions.inc.php	1 Apr 2003 09:37:21 -0000	1.14
@@ -433,10 +433,10 @@
 
 $comment
 
---
+-- 
 Powered by serendipity.
 My blog runs on PHP.  Yours can too.
-http://php-blog.sourceforge.net to find out how.";
+http://php-blog.sf.net/ to find out how.";
 mail($to, "[$serendipity[blogTitle]] New comment posted to $title",  $text,
      "From: $fromName <$fromEmail>\r\n");
      

Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_sidebar_items.php	31 Mar 2003 08:01:59 -0000	1.2
+++ serendipity_sidebar_items.php	1 Apr 2003 09:37:26 -0000	1.3
@@ -156,7 +156,7 @@
 		global $serendipity;
 
 		$title = "";
-		echo "<div class=\"serendipityPlug\">This blog powered by <a href=\"http://sourceforge.net/projects/php-blog\">serendipity</a>!</div>";
+		echo "<div class=\"serendipityPlug\">This blog is powered by <a href=\"http://php-blog.sf.net/\">serendipity</a>!</div>";
 	}
 }
 

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.12,1.13

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Add exit url encoding logic.

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_functions.inc.php	31 Mar 2003 22:17:11 -0000	1.12
+++ serendipity_functions.inc.php	1 Apr 2003 06:31:19 -0000	1.13
@@ -520,7 +520,30 @@
     $ret = preg_replace('/\@([[:alnum:]]+?)\@/','<sub>\1</sub>',$ret);
     $ret = preg_replace('/([\\\])([*#_|^@%])/', '\2', $ret);
 
+    if ($serendipity['track_exits']) {
+        $ret = preg_replace_callback(
+          "#<a href=(\"|')http://([^\"']+)(\"|')#im",
+          'serendipity_encodeExitsCallback',
+          $ret
+        );
+    }
+
     return $ret;
+}
+
+/**
+* Transforms '<a href="http://url/">' into
+* '<a href="exit.php?url=encurl" onMouseOver="window.status='http://url/';return true;">'.
+*/
+function serendipity_encodeExitsCallback($buffer) {
+  $url = 'http://' . $buffer[2];
+
+  return sprintf(
+    '<a href="exit.php?url=%s" onMouseOver="window.status=\'%s\';return true;"',
+
+    base64_encode($url),
+    $url
+  );
 }
 
 /**

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

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

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

Modified Files:
	serendipity_config_local.tpl 
Log Message:
Add 'track_exits' configuration variable.

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_config_local.tpl	28 Mar 2003 20:05:25 -0000	1.1.1.1
+++ serendipity_config_local.tpl	1 Apr 2003 06:30:31 -0000	1.2
@@ -37,4 +37,6 @@
 $serendipity["convert"] = "{convert|string|/usr/local/bin/convert}"; // Full path & name of your convert binary
 $serendipity["thumbSuffix"] = "{thumbSuffix|string|serendipityThumb}";     // Thumbnails will be named original.Suffix.ext
 $serendipity["thumbSize"]   = "{thumbSize|int|110}";                   // Maximum dimension of thumbnails
+
+$serendipity["track_exits"]	= {track_exits|bool|false};									// Do you want to track exit targets?
 ?>

[php-blog-cvs] serendipity db.sql,1.4,1.5 serendipity_functions.inc.php,1.11,1.12

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

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

Modified Files:
	db.sql serendipity_functions.inc.php 
Log Message:
add weblog id to comments
some assorted cleanups


Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db.sql	31 Mar 2003 21:49:26 -0000	1.4
+++ db.sql	31 Mar 2003 22:17:11 -0000	1.5
@@ -28,6 +28,7 @@
 create table {PREFIX}comments (
   id {AUTOINCREMENT},
   entry_id int(10) {UNSIGNED} not null default '0',
+  weblogid int(11) not null,
   timestamp int(10) {UNSIGNED} default null,
   title varchar(150) default null,
   author varchar(80) default null,

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_functions.inc.php	31 Mar 2003 22:12:26 -0000	1.11
+++ serendipity_functions.inc.php	31 Mar 2003 22:17:11 -0000	1.12
@@ -215,7 +215,7 @@
 
 	if ($full === true) $body = ", body, extended";
     $querystring = "SELECT * FROM ".$serendipity["dbPrefix"]."entries e, $serendipity[dbPrefix]authors a
-                    WHERE  a.authorid = e.authorid AND $key LIKE $val and e.weblogid='$serendipity[weblogId] LIMIT 1";
+                    WHERE  a.authorid = e.authorid AND $key LIKE $val and e.weblogid='$serendipity[weblogId]' LIMIT 1";
 
 	return serendipity_db_query($querystring, true);
 }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.10,1.11

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
use weblogid where appropriate


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_functions.inc.php	31 Mar 2003 21:59:25 -0000	1.10
+++ serendipity_functions.inc.php	31 Mar 2003 22:12:26 -0000	1.11
@@ -87,7 +87,7 @@
 		$endts = mktime(0, 0, 0, $month + 1, 1, $year);
 
         // Find out about diary entries
-        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts";
+        $querystring = "SELECT timestamp from $serendipity[dbPrefix]entries WHERE timestamp >= $ts and timestamp <= $endts and weblogid='$serendipity[weblogId]'";
         $rows = serendipity_db_query($querystring);
         $activeDays = array();
 		if (is_array($rows)) {
@@ -185,7 +185,9 @@
 		$startts = mktime(0, 0, 0, $month, $day, $year);
 		$endts = mktime(0, 0, 0, $month+1, 0, $year);
 
-		$and = " WHERE timestamp >= $startts AND timestamp <= $endts ";
+		$and = " WHERE timestamp >= $startts AND timestamp <= $endts AND ";
+	} else {
+		$and = " WHERE ";
 	}
 
     if (!empty($limit)) {
@@ -195,7 +197,7 @@
     $query = "SELECT e.*, a.username, c.category_name FROM
 			({$serendipity['dbPrefix']}entries AS e LEFT JOIN {$serendipity['dbPrefix']}category c ON e.categoryid = c.categoryid)
 			LEFT JOIN {$serendipity['dbPrefix']}authors a ON
-			e.authorid = a.authorid " . $and .
+			e.authorid = a.authorid " . $and . "e.weblogid='$serendipity[weblogId]' " .
              "ORDER BY timestamp DESC $limit";
     $ret = serendipity_db_query($query);
     if (is_string($ret)) {
@@ -213,7 +215,7 @@
 
 	if ($full === true) $body = ", body, extended";
     $querystring = "SELECT * FROM ".$serendipity["dbPrefix"]."entries e, $serendipity[dbPrefix]authors a
-                    WHERE  a.authorid = e.authorid AND $key LIKE $val  LIMIT 1";
+                    WHERE  a.authorid = e.authorid AND $key LIKE $val and e.weblogid='$serendipity[weblogId] LIMIT 1";
 
 	return serendipity_db_query($querystring, true);
 }
@@ -228,7 +230,7 @@
 		$authorid = $serendipity['authorid'];
 	}
 	
-    $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE authorid = $authorid";
+    $querystring = "SELECT * FROM ".$serendipity['dbPrefix']."category WHERE weblogid='$serendipity[weblogId]' and authorid = $authorid";
 
 	return serendipity_db_query($querystring);
 }
@@ -241,7 +243,7 @@
 	global $serendipity;
 
     $querystring = "SELECT id, author, timestamp, comments, title, body, extended FROM ".$serendipity["dbPrefix"]."entries
-                    WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') ORDER BY timestamp DESC";
+                    WHERE MATCH (title,body,extended) AGAINST ('".addslashes($term)."') AND weblogid='$serendipity[weblogId]' ORDER BY timestamp DESC";
 
 	return serendipity_db_query($querystring);
 }
@@ -347,7 +349,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id and weblogid='$serendipity[weblogId]'";
     if (isset($limit)) {
         $query .= " LIMIT $limit";
     }
@@ -408,7 +410,7 @@
     $query = "SELECT email, title, mail_comments 
               FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
               WHERE e.id  = '$id'
-              AND e.authorid = a.authorid";
+              AND e.authorid = a.authorid and e.weblogid='$serendipity[weblogId]";
     $row = serendipity_db_query($query, true);
     if($row['mail_comments']) {
         serendipity_sendComment($row['email'], $name, $email, $url, $id, 
@@ -444,7 +446,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "'";
+    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "' and weblogid='$serendipity[weblogId]'";
 
 	return serendipity_db_query($query);
 }
@@ -780,7 +782,7 @@
             $locations[$i] = "http://".$_SERVER['HTTP_HOST'].$locations[$i];
         }
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
-        $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
+        $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "' and weblogid='$serendipity[weblogId]'";
 
         $row = serendipity_db_query($query, true, 'num');
         if ($row[0] > 0) {
@@ -790,7 +792,7 @@
             serendipity_reference_autodiscover($locations[$i], $url, $author, $title, serendipity_trackback_excerpt($text));
         }
     }
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid'");
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$tmpid' and weblogid='$serendipity[weblogId]'");
 
     for ($i = 0; $i < $j; ++$i) {
         $query = "INSERT INTO {$serendipity['dbPrefix']}references (entry_id, name, link) VALUES(";
@@ -907,14 +909,14 @@
 	if (!is_numeric($id)) return false;
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
+    $result = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries WHERE id=$id and weblogid='$serendipity[weblogId]'", true);
     serendipity_purgeEntry($id, $result[0]);
 
-    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "entries WHERE id=$id");
+    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "entries WHERE id=$id and weblogid=$serendipity[weblogId]");
 
-    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "comments WHERE entry_id=$id");
+    serendipity_db_query("DELETE FROM ".$serendipity["dbPrefix"].  "comments WHERE entry_id=$id and weblogid=$serendipity[weblogId]");
 
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id' and weblogid=$serendipity[weblogId]");
 }
 
 function serendipity_updateCSS($css) {
@@ -1376,8 +1378,8 @@
                   FROM $serendipity[dbPrefix]suppress
                   WHERE ip = '$_SERVER[REMOTE_ADDR]'
                   AND url = '$_SERVER[HTTP_REFERER]'
-                  AND last > now() - 900";
-	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]'";
+                  AND last > now() - 900 and weblogid='$serendipity[weblogId]'";
+	$suppressp = "DELETE FROM $serendipity[dbPrefix]suppress where url='$_SERVER[HTTP_REFERER]' and ip='$_SERVER[REMOTE_ADDR]' and weblogid='$serendipity[weblogId]'";
     $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
                   (url, ip, last) 
                   VALUES ('$_SERVER[HTTP_REFERER]', '$_SERVER[REMOTE_ADDR]', now())";
@@ -1404,7 +1406,7 @@
 function serendipity_track_referrer_gc() {
     global $serendipity;
     
-    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900";
+    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - 900 and weblogid='$serendipity[weblogId]'";
     serendipity_db_query($gc);
 }
 
@@ -1420,6 +1422,7 @@
     global $serendipity;
     $query = "SELECT url, sum(count) AS total
               FROM $serendipity[dbPrefix]$list
+			  WHERE weblogid='$serendipity[weblogId]'
               GROUP BY url
               ORDER BY total desc
               LIMIT $limit";
@@ -1439,7 +1442,7 @@
 function serendipity_set_config_var($name, $val) {
     global $serendipity;
 
-	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
+	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "' and weblogid='$serendipity[weblogId]'");
 	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>$serendipity[weblogId]));
 	if (is_string($r)) {
 		echo $r;
@@ -1449,7 +1452,7 @@
 function serendipity_get_config_var($name, $defval = false) {
     global $serendipity;
 	$name = serendipity_db_escape_string($name);
-	$c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name'", true);
+	$c = serendipity_db_query("SELECT value from $serendipity[dbPrefix]config where name='$name' and weblogid='$serendipity[weblogId]'", true);
 	if (is_array($c)) {
 		return $c[0];
 	}
@@ -1461,7 +1464,7 @@
 
 	$names = array();
 		
-	$query = "SELECT cssid, name from $serendipity[dbPrefix]css order by name";
+	$query = "SELECT cssid, name from $serendipity[dbPrefix]css where weblogid=$serendipity[weblogId] order by name";
     $rows = serendipity_db_query($query);
 	foreach ($rows as $row) {
 		$names[$row['cssid']] = $row['name'];
@@ -1474,12 +1477,12 @@
     global $serendipity;
 
 	if (is_numeric($name)) {
-    	$query = "select * from $serendipity[dbPrefix]css where cssid = '$name'";
+    	$query = "select * from $serendipity[dbPrefix]css where cssid = '$name' and weblogid='$serendipity[weblogId]'";
 	} else {
 		if ($name === null) {
 			$name = serendipity_get_config_var("default_css", "default");
 		}
-    	$query = "select * from $serendipity[dbPrefix]css where name = '$name'";
+    	$query = "select * from $serendipity[dbPrefix]css where name = '$name' and weblogid='$serendipity[weblogId]'";
 	}
 
 	$qh = serendipity_db_query($query, true);
@@ -1533,7 +1536,7 @@
     global $serendipity;
     $s = mktime(0,0,0, $month, 1, $year);
     $e = mktime(23,59,59, $month, date("t",$s) , $year);
-    $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE timestamp>$s AND timestamp<$e";
+    $querystring = "SELECT count(id) FROM {$serendipity['dbPrefix']}entries WHERE weblogid='$serendipity[weblogId]' and timestamp>$s AND timestamp<$e";
     $query = serendipity_db_query($querystring);
     return $query[0][0];
 }
@@ -1545,7 +1548,7 @@
     global $serendipity;
 
     echo "<div class='serendipity_title'>The Archive:</div>";
-    $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries ORDER BY timestamp ASC LIMIT 1");
+    $f = serendipity_db_query("SELECT timestamp FROM {$serendipity['dbPrefix']}entries where weblogid='$serendipity[weblogId]' ORDER BY timestamp ASC LIMIT 1");
     $lastYear = date("Y", $f[0][0]);
     $lastMonth= date("m", $f[0]);
     $currYear = date("Y");

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

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_functions.inc.php 
Log Message:
abstract the hack...  when this is properly generated, multiple weblogs 
will work.


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_installer.inc.php	31 Mar 2003 21:52:14 -0000	1.4
+++ serendipity_admin_installer.inc.php	31 Mar 2003 21:59:25 -0000	1.5
@@ -273,6 +273,7 @@
 			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
 			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
 			 fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
+			 fwrite($configfp, "\$serendipity['weblogId'] = '1';\n");
 			 fwrite($configfp, "?>\n");
 
 			 fclose($configfp);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_functions.inc.php	31 Mar 2003 21:56:32 -0000	1.9
+++ serendipity_functions.inc.php	31 Mar 2003 21:59:25 -0000	1.10
@@ -831,7 +831,7 @@
 	$entry['exflag'] = $exflag;
 	$entry['author'] = $serendipity['user'];
 	$entry['authorid'] = $serendipity['authorid'];
-	$entry['weblogid'] = 1;
+	$entry['weblogid'] = $serendipity['weblogId'];
 
 	if (!is_numeric($entry["id"])) {
 		/* we need to insert */
@@ -925,13 +925,13 @@
 
 
 	if ($css["cssid"] == 0) {
-		$css['weblogid'] = 1;	
+		$css['weblogid'] = $serendipity['weblogId'];	
 		unset($css['cssid']);
 		$res = serendipity_db_insert('css', $css);
 		$newEntry = 1;
 		$css['cssid'] = serendipity_db_insert_id();
 	} else {
-		$res = serendipity_db_update('css', array('cssid' => $css['cssid'], 'weblogid' => 1), $css);
+		$res = serendipity_db_update('css', array('cssid' => $css['cssid'], 'weblogid' => $serendipity['weblogId']), $css);
 	}
 		
 	if (is_string($res)) {
@@ -1387,7 +1387,7 @@
                AND day = now()"; 
     $insert = "INSERT into $serendipity[dbPrefix]referrers
               (url, day, count,weblogid)
-              VALUES ('$_SERVER[HTTP_REFERER]', now(), 1, 1)";
+              VALUES ('$_SERVER[HTTP_REFERER]', now(), 1, $serendipity[weblogId])";
     $count = serendipity_db_query($suppressq, true);
     if($count[0] > 0) {
         serendipity_db_query($suppressu);
@@ -1440,7 +1440,7 @@
     global $serendipity;
 
 	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
-	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>1));
+	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>$serendipity[weblogId]));
 	if (is_string($r)) {
 		echo $r;
 	}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.8,1.9

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
make sure to always insert the weblogid


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_functions.inc.php	31 Mar 2003 21:49:27 -0000	1.8
+++ serendipity_functions.inc.php	31 Mar 2003 21:56:32 -0000	1.9
@@ -831,6 +831,7 @@
 	$entry['exflag'] = $exflag;
 	$entry['author'] = $serendipity['user'];
 	$entry['authorid'] = $serendipity['authorid'];
+	$entry['weblogid'] = 1;
 
 	if (!is_numeric($entry["id"])) {
 		/* we need to insert */
@@ -924,13 +925,13 @@
 
 
 	if ($css["cssid"] == 0) {
-		
+		$css['weblogid'] = 1;	
 		unset($css['cssid']);
 		$res = serendipity_db_insert('css', $css);
 		$newEntry = 1;
 		$css['cssid'] = serendipity_db_insert_id();
 	} else {
-		$res = serendipity_db_update('css', array('cssid' => $css['cssid']), $css);
+		$res = serendipity_db_update('css', array('cssid' => $css['cssid'], 'weblogid' => 1), $css);
 	}
 		
 	if (is_string($res)) {
@@ -1385,8 +1386,8 @@
                WHERE url = '$_SERVER[HTTP_REFERER]' 
                AND day = now()"; 
     $insert = "INSERT into $serendipity[dbPrefix]referrers
-              (url, day, count)
-              VALUES ('$_SERVER[HTTP_REFERER]', now(), 1)";
+              (url, day, count,weblogid)
+              VALUES ('$_SERVER[HTTP_REFERER]', now(), 1, 1)";
     $count = serendipity_db_query($suppressq, true);
     if($count[0] > 0) {
         serendipity_db_query($suppressu);
@@ -1439,7 +1440,7 @@
     global $serendipity;
 
 	serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'");
-	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val));
+	$r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val, "weblogid"=>1));
 	if (is_string($r)) {
 		echo $r;
 	}

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.3,1.4

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
the database is not a HO


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_installer.inc.php	31 Mar 2003 21:51:41 -0000	1.3
+++ serendipity_admin_installer.inc.php	31 Mar 2003 21:52:14 -0000	1.4
@@ -269,7 +269,7 @@
 			 fwrite($configfp, "<?php\n");
 			 fwrite($configfp, "\$serendipity['dbName'] = '{$serendipity['dbName']}';\n");
 			 fwrite($configfp, "\$serendipity['dbPrefix'] = '{$serendipity['dbPrefix']}';\n");
-			 fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHOst']}';\n");
+			 fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHost']}';\n");
 			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
 			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
 			 fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");

[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.2,1.3

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

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

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
add dbType, this was hacked in manually :)


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_installer.inc.php	31 Mar 2003 21:49:26 -0000	1.2
+++ serendipity_admin_installer.inc.php	31 Mar 2003 21:51:41 -0000	1.3
@@ -272,6 +272,7 @@
 			 fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHOst']}';\n");
 			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
 			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
+			 fwrite($configfp, "\$serendipity['dbType'] = '{$serendipity['dbType']}';\n");
 			 fwrite($configfp, "?>\n");
 
 			 fclose($configfp);

[php-blog-cvs] serendipity LICENSE,1.1.1.1,1.2 db.sql,1.3,1.4 serendipity_admin_installer.inc.php,1.1.1.1,1.2 serendipity_config.inc.php,1.2,1.3 serendipity_db.inc.php,1.1.1.1,1.2 serendipity_db_mysql.inc.php,1.2,1.3 serendipity_functions.inc.php,1.7,1.8

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

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

Modified Files:
	LICENSE db.sql serendipity_admin_installer.inc.php 
	serendipity_config.inc.php serendipity_db.inc.php 
	serendipity_db_mysql.inc.php serendipity_functions.inc.php 
Log Message:
holy mangled schemas batman.

first steps towards multiple weblog support.  mostly hardcoded for now, 
and entirely ugly, but the basis is in there.

All config is in the db, and has a weblog associated with it.  remove 
headers and comments that used '#'.

Check back later in the day for the finished version. :)


Index: LICENSE
===================================================================
RCS file: /cvsroot/php-blog/serendipity/LICENSE,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- LICENSE	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ LICENSE	31 Mar 2003 21:49:26 -0000	1.2
@@ -22,9 +22,3 @@
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-
-######################################################################################
-serendipity (c) 2003    Jannis Hermanns          <J...@ha...>          www.jannis.to
-& the serendipity team: Sterling Hughes          <ste...@bu...>
-                  Christian Mühlhaeuser    <ch...@ch...>
\ No newline at end of file

Index: db.sql
===================================================================
RCS file: /cvsroot/php-blog/serendipity/db.sql,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db.sql	31 Mar 2003 07:54:55 -0000	1.3
+++ db.sql	31 Mar 2003 21:49:26 -0000	1.4
@@ -2,6 +2,16 @@
 # Table structure for table '{PREFIX}authors'
 #
 
+create table {PREFIX}weblogs (
+	weblogid {AUTOINCREMENT}
+);
+
+create table {PREFIX}perms (
+	weblogid int(11) not null,
+	userid   int(11) not null,
+	permid   int(4)  not null
+);
+
 create table {PREFIX}authors (
   username varchar(20) default null,
   password varchar(32) default null,
@@ -44,7 +54,8 @@
   exflag int(1) default null,
   author varchar(20) default null,
   authorid int(11) default null,
-  categoryid int(11) default null
+  categoryid int(11) default null,
+  weblogid int(11) not null
 );
 
 CREATE FULLTEXT INDEX entry on {PREFIX}entries (title,body,extended);
@@ -57,7 +68,8 @@
   id {AUTOINCREMENT},
   entry_id int(10) {UNSIGNED} not null default '0',
   link text,
-  name text
+  name text,
+  weblogid int(11) not null
 );
 
 #
@@ -79,6 +91,7 @@
   url varchar(128) NOT NULL default '',
   day date NOT NULL,
   count int(11) NOT NULL default '0',
+  weblogid int(11) not null,
   PRIMARY KEY  (url,day)
 );
 
@@ -89,18 +102,21 @@
 CREATE TABLE {PREFIX}css (
   cssid {AUTOINCREMENT},
   name varchar(40) default NULL,
-  data text
+  data text,
+  weblogid int(11) not null
 );
 
 create table {PREFIX}config (
 	name varchar(255) not null primary key,
-	value text not null
+	value text not null,
+	weblogid int(11) not null
 );
 
 CREATE TABLE {PREFIX}suppress (
   url varchar(128) default NULL,
   ip varchar(15) default NULL,
-  last timestamp NOT NULL
+  last timestamp NOT NULL,
+  weblogid int(11) not null
 );
 
 CREATE unique INDEX url on {PREFIX}suppress (url, ip);
@@ -116,5 +132,6 @@
   categoryid {AUTOINCREMENT},
   category_name varchar(255) default NULL,
   category_description text,
-  authorid int(11) default NULL
+  authorid int(11) default NULL,
+  weblogid int(11) not null
 );

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_installer.inc.php	28 Mar 2003 20:05:26 -0000	1.1.1.1
+++ serendipity_admin_installer.inc.php	31 Mar 2003 21:49:26 -0000	1.2
@@ -1,53 +1,42 @@
  <?php
-
-##########################################################################
-# serendipity - another blogger...                                             #
-##########################################################################
-#                                                                        #
-# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
-#                                                                        #
-##########################################################################
-
-if (file_exists("./serendipity_config_local.inc.php") && IN_serendipity !== true) die ("Don't hack!");
 umask(0000);
 include_once('compat.php');
 
 function serendipity_query_default($optname, $default)
 {
 	switch ($optname) {
-		case "serendipityPath":
-			return dirname(__FILE__) . '/';
+	case "serendipityPath":
+		return dirname(__FILE__) . '/';
 
-		case "serendipityHTTPPath":
-			return dirname($_SERVER['PHP_SELF']) . '/';
+	case "serendipityHTTPPath":
+		return dirname($_SERVER['PHP_SELF']) . '/';
 
-		case "baseURL":
-			$ssl = $_SERVER['HTTPS'] == 'on';
-			$port = $_SERVER['SERVER_PORT'];
+	case "baseURL":
+		$ssl = $_SERVER['HTTPS'] == 'on';
+		$port = $_SERVER['SERVER_PORT'];
 
-			return sprintf("http%s://%s%s%s/",
-				$ssl ? 's' : '',
-				$_SERVER['HTTP_HOST'],
-				(($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
-				dirname($_SERVER['PHP_SELF'])
-				);
+		return sprintf("http%s://%s%s%s/",
+					   $ssl ? 's' : '',
+					   $_SERVER['HTTP_HOST'],
+					   (($ssl && $port != 443) || (!$ssl && $port != 80)) ? (':' . $port) : '',
+					   dirname($_SERVER['PHP_SELF'])
+					   );
 	
-		case "convert":
-			$path = explode(":", $_ENV['PATH']);
-			/* add some other possible locations to the path while we are at it,
-			 * as these are not always included in the apache path */
-			$path[] = '/usr/X11R6/bin';
+	case "convert":
+		$path = explode(":", $_ENV['PATH']);
+		/* add some other possible locations to the path while we are at it,
+		 * as these are not always included in the apache path */
+		$path[] = '/usr/X11R6/bin';
 
-			foreach ($path as $dir) {
-				if (@is_executable($dir . '/convert')) {
-					return $dir . '/convert';
-				}
+		foreach ($path as $dir) {
+			if (@is_executable($dir . '/convert')) {
+				return $dir . '/convert';
 			}
-			return $default;
+		}
+		return $default;
 	
-		default:
-			return $default;
+	default:
+		return $default;
 	}
 }
 
@@ -94,7 +83,7 @@
     echo "<input type='hidden' name='serendipity[adminModule]' value='installer'>";
     echo "<input type='hidden' name='installAction' value='check'>";
     echo "<br>";
-    foreach ($t as $key=>$value) {
+    foreach ($t as $key => $value) {
 		echo "<b>$key:</b><br>";
         echo "<table>";
 		for ($x=0; $x<count($value); $x++) {
@@ -103,14 +92,18 @@
 			echo "<td valign='top'>".$value[$x]["name"].":</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>";
+				echo "<input type='radio' name='".$value[$x]["name"]."' value='true'  ";
+				echo (($value[$x]["default"]==true) ? "CHECKED" : "")."> Yes<br>";
+                echo "<input type='radio' name='".$value[$x]["name"]."' value='false' ";
+				echo (($value[$x]["default"]==true) ? "" : "CHECKED")."> No<br>";
             }
             else {
-				echo "<input type='text' name='".$value[$x]["name"]."' value=\"".htmlentities($value[$x]["default"])."\">";
+				echo "<input type='text' name='".$value[$x]["name"]."' value=\"";
+				echo htmlentities($value[$x]["default"])."\">";
             }
             echo "</td>";
-            echo "<td valign='top'><font color='#bbbbbb'>// ".$value[$x]["desc"]." (".$value[$x]["type"].")</font></td>";
+            echo "<td valign='top'><font color='#bbbbbb'>// ".$value[$x]["desc"];
+			echo " (".$value[$x]["type"].")</font></td>";
             echo "</tr>";
         }
         echo "</table>";
@@ -146,156 +139,174 @@
     return $queries;
 }
 
-
 switch ($_POST["installAction"]) {
+ case "check":
+	 // Check dirs
+	 if (!is_dir($_POST["serendipityPath"])) {
+		 $errs[] = $_POST["serendipityPath"]." does not exist, create it.";
+	 }
+	 elseif (!is_writable($_POST["serendipityPath"])) {
+		 $errs[] = "I can't write to ".$_POST["serendipityPath"]." check permissions!";
+	 }
+	 elseif (!is_dir($_POST["serendipityPath"].$_POST["uploadPath"])
+			 && @mkdir($_POST["serendipityPath"].$_POST["uploadPath"], 0770) !== true) {
+		 $errs[] = $_POST["serendipityPath"].$_POST["uploadPath"]." does not exist and I couldn't create it. You do it.";
+	 }
 
-        case "check":
-
-
-		// Check dirs
-        if (!is_dir($_POST["serendipityPath"])) {
-			$errs[] = $_POST["serendipityPath"]." does not exist, create it.";
-        }
-        elseif (!is_writable($_POST["serendipityPath"])) {
-			$errs[] = "I can't write to ".$_POST["serendipityPath"]." check permissions!";
-        }
-        elseif (!is_dir($_POST["serendipityPath"].$_POST["uploadPath"])
-                && @mkdir($_POST["serendipityPath"].$_POST["uploadPath"], 0770) !== true) {
-			$errs[] = $_POST["serendipityPath"].$_POST["uploadPath"]." does not exist and I couldn't create it. You do it.";
-        }
-
-        // Check paths
-        elseif (!is_writable($_POST["serendipityPath"].$_POST["uploadPath"])) {
-			$errs[] = "I can't write to ".$_POST["serendipityPath"].$_POST["uploadPath"]."!";
-            $errs[] = "&nbsp;-&gt; run <i>chmod g+rwx ".$_POST["serendipityPath"].$_POST["uploadPath"]."</i>";
-        }
+	 // Check paths
+	 elseif (!is_writable($_POST["serendipityPath"].$_POST["uploadPath"])) {
+		 $errs[] = "I can't write to ".$_POST["serendipityPath"].$_POST["uploadPath"]."!";
+		 $errs[] = "&nbsp;-&gt; run <i>chmod g+rwx ".$_POST["serendipityPath"].$_POST["uploadPath"]."</i>";
+	 }
 
-		// Attempt to create the archives directory
-        if (!is_dir($_POST["serendipityPath"]."archives") &&
-            @mkdir($_POST["serendipityPath"]."archives", 0770) !== true) {
-			$errs[] = "Couldn't create the archives directory, you do it.";
-            $errs[] = "&nbsp;-&gt; Run <i>mkdir ".$_POST["serendipityPath"]."</i>";
-            $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["serendipityPath"]."archives</i>";
-        }
+	 // Attempt to create the archives directory
+	 if (!is_dir($_POST["serendipityPath"]."archives") &&
+		 @mkdir($_POST["serendipityPath"]."archives", 0770) !== true) {
+		 $errs[] = "Couldn't create the archives directory, you do it.";
+		 $errs[] = "&nbsp;-&gt; Run <i>mkdir ".$_POST["serendipityPath"]."</i>";
+		 $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["serendipityPath"]."archives</i>";
+	 }
 
-		// Attempt to create the plugins dir
-		if (!is_dir($_POST['serendipityPath'] . "plugins") &&
-			@mkdir($_POST['serendipityPath'] . "plugins", 0770) !== true) {
-			$errs[] = "Couldn't create the plugins directory, you do it.";
-            $errs[] = "&nbsp;-&gt; Run <i>mkdir ".$_POST["serendipityPath"]."</i>";
-            $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["serendipityPath"]."plugins</i>";
-		}
+	 // Attempt to create the plugins dir
+	 if (!is_dir($_POST['serendipityPath'] . "plugins") &&
+		 @mkdir($_POST['serendipityPath'] . "plugins", 0770) !== true) {
+		 $errs[] = "Couldn't create the plugins directory, you do it.";
+		 $errs[] = "&nbsp;-&gt; Run <i>mkdir ".$_POST["serendipityPath"]."</i>";
+		 $errs[] = "&nbsp;-&gt; and <i>chmod g+rwx ".$_POST["serendipityPath"]."plugins</i>";
+	 }
 
-		$_POST['dbType'] = strtolower(basename($_POST['dbType']));
-		foreach ($_POST as $k => $v) {
-			if (substr($k, 0, 2) == 'db' || $k == 'serendipityPath') {
-				$serendipity[$k] = $v;
-			}
-		}
-		include_once $_POST['serendipityPath'] . '/serendipity_db_' . $_POST['dbType'] . '.inc.php';
+	 $_POST['dbType'] = strtolower(basename($_POST['dbType']));
+	 foreach ($_POST as $k => $v) {
+		 if (substr($k, 0, 2) == 'db' || $k == 'serendipityPath') {
+			 $serendipity[$k] = $v;
+		 }
+	 }
+	 include_once $_POST['serendipityPath'] . '/serendipity_db_' . $_POST['dbType'] . '.inc.php';
 		
-		// Probe database (do it after the dir stuff, as we need to be able to create the
-		// sqlite database)
-		serendipity_db_probe($_POST, $errs);
+	 // Probe database (do it after the dir stuff, as we need to be able to create the
+	 // sqlite database)
+	 serendipity_db_probe($_POST, $errs);
 
-		// Check imagick
-        if ($_POST["magick"] == "true" && !is_executable($_POST["convert"])) {
-			$errs[] = "Can't execute convert binary!";
-        }
+	 // Check imagick
+	 if ($_POST["magick"] == "true" && !is_executable($_POST["convert"])) {
+		 $errs[] = "Can't execute convert binary!";
+	 }
 
-        // Something went wrong
-        if (is_array($errs) && count($errs)) {
-			echo "<font color='#ff0000'>".implode("<br>", $errs)."</font><p>";
-			serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $_POST);
-        } else {
-			echo "Everything seems to be alright, saving config...<p>";
-            $f = implode("", file("./serendipity_config_local.tpl"));
-            $p = serendipity_parseTemplate("./serendipity_config_local.tpl");
-            foreach($p as $key=>$value) {
-				for($x=0; $x<count($value); $x++) {
-                	$replace = "{".$value[$x]["name"]."|".$value[$x]["type"]."|".$value[$x]["distdefault"]."}";
-					$f = str_replace($replace,
-                                    str_replace("\"", "\\\"", $_POST[$value[$x]["name"]]), $f);
-                	//echo "Replacing $replace with ".$_POST[$value[$x]["name"]]."<br>";
-                }
-            }
-            $fp = @fopen("./serendipity_config_local.inc.php", "w");
-            if (!is_resource($fp)) {
-				echo "<font color='#ff0000'>Error! Could not write to ./serendipity_config_local.inc.php.<br>";
-                echo "Try <i>chown -R www:www ".$_POST["serendipityPath"]."</i><br>";
-                echo "followed by <i>chmod 770 ".$serendipity_POST["serendipityPath"]."</i> (change www to the";
-                echo "user your apache is running as).</font><br>";
-                echo "After that you can press your browser's reload button.";
-            }
-            else {
-            	echo "Writing to config file...";
-                fwrite($fp, $f);
-                fclose($fp);
-				echo "<b>Done.</b><br>";
-				if (IN_serendipity!==true) {
-					define('IN_serendipity', true);
+	 // Something went wrong
+	 if (is_array($errs) && count($errs)) {
+		 echo "<font color='#ff0000'>".implode("<br>", $errs)."</font><p>";
+		 serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $_POST);
+	 } else {
+		 if (IN_serendipity!==true) {
+			 define('IN_serendipity', 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["serendipityHTTPPath"],$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["serendipityHTTPPath"],$a[$x])."\n");
+				 }
+				 fclose($fp);
+			 }
 
-					// Create tables
-					echo "Attempting to setup Database...<br>";
-					$queries = serendipity_parse_sql_tables('./db.sql');
-					$queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
-					foreach ($queries as $query) {
-						serendipity_db_schema_import($query);
-					}
-					if($_POST['want_mail'] == true) {
-						$mail_comments = 1;
-					} else {
-						$mail_comments = 0;
-					}
-					$enc_pass = md5($_POST['pass']);
-					$query = "INSERT INTO $_POST[dbPrefix]authors
+			 // Create tables
+			 echo "Attempting to setup Database...<br>";
+			 $queries = serendipity_parse_sql_tables('./db.sql');
+			 $queries = str_replace("{PREFIX}", $_POST['dbPrefix'], $queries);
+			 foreach ($queries as $query) {
+				 serendipity_db_schema_import($query);
+			 }
+			 if($_POST['want_mail'] == true) {
+				 $mail_comments = 1;
+			 } else {
+				 $mail_comments = 0;
+			 }
+			 $enc_pass = md5($_POST['pass']);
+			 $query = "INSERT INTO $_POST[dbPrefix]authors
 						(username, password, email, mail_comments) 
 						VALUES('$_POST[user]',
 								'$enc_pass',
 								'$_POST[email]',
 								$mail_comments) ";
-					serendipity_db_query($query);
+			 serendipity_db_query($query);
 
-					$text = serendipity_db_escape_string(file_get_contents('./serendipity.css'));
-					$query = "INSERT into $_POST[dbPrefix]css (name, data) values ('default', '$text')";
-					$res = serendipity_db_query($query);
-					if (is_string($res)) {
-						echo $res;
-					}
+			 $text = serendipity_db_escape_string(file_get_contents('./serendipity.css'));
+			 $query = "INSERT into $_POST[dbPrefix]css (name, data, weblogid) values ('default', '$text', '1')";
+			 $res = serendipity_db_query($query);
+			 if (is_string($res)) {
+				 echo $res;
+			 }
 
-					/* register default plugins */
-					
-					$GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
-					$GLOBALS['serendipity']['dbName'] = $_POST['dbName'];
-					include_once "serendipity_plugin_api.php";
-					serendipity_plugin_api::register_default_plugins();
+			 // Save all basic config variables to the database
+			 $p = serendipity_parseTemplate("./serendipity_config_local.tpl");
+			 foreach($p as $key=>$value) {
+				 foreach ($value as $entry) {
+					 $query = "INSERT INTO {$_POST['dbPrefix']}config (name, value, weblogid) ";
+					 $query .= "VALUES ('" . serendipity_db_escape_string($entry['name']) . "', '";
+					 $query .= serendipity_db_escape_string($_POST[$entry['name']]) . "', '1');"; 
 
-					echo "<p>Welcome to serendipity!</b><p>";
-					echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["serendipityHTTPPath"]."'>check out your blog</a>";
-					session_destroy();
-				}
-            }
-        }
-    break;
+					 serendipity_db_query($query);
+				 }
+			 }
 
-	default:
-    	if (file_exists("./serendipity_config_local.inc.php")) $from = &$serendipity;
-        else $from = false;
-    	serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $from);
+			 // Create a basic configuration file which gives enough information to open
+			 // the database and get information from the database tables
+			 $configfp = fopen("./serendipity_config_local.inc.php", "w");
+			 if (!is_resource($fp)) {
+				 echo '<font color="#ff0000">Error! Could not write to ./serendipity_config_local.inc.php</font><br>';
+				 echo "Try <i>chown -R www:www {$_POST['serendipityPath']}</i><br>";
+				 echo "followd by <i>chmod 770 {$_POST['serendipityPath']}</i> (change www to the";
+				 echo "user apache runs as.)</font><br />";
+				 echo "Once you've done this, hit your browser's \"reload\" button.";
+				 exit();
+			 }
+
+			 fwrite($configfp, "<?php\n");
+			 fwrite($configfp, "\$serendipity['dbName'] = '{$serendipity['dbName']}';\n");
+			 fwrite($configfp, "\$serendipity['dbPrefix'] = '{$serendipity['dbPrefix']}';\n");
+			 fwrite($configfp, "\$serendipity['dbHost'] = '{$serendipity['dbHOst']}';\n");
+			 fwrite($configfp, "\$serendipity['dbUser'] = '{$serendipity['dbUser']}';\n");
+			 fwrite($configfp, "\$serendipity['dbPass'] = '{$serendipity['dbPass']}';\n");
+			 fwrite($configfp, "?>\n");
+
+			 fclose($configfp);
+
+
+			 /* register default plugins */
+			 $GLOBALS['serendipity']['dbPrefix'] = $_POST['dbPrefix'];
+			 $GLOBALS['serendipity']['dbName'] = $_POST['dbName'];
+			 include_once "serendipity_plugin_api.php";
+			 serendipity_plugin_api::register_default_plugins();
+
+			 echo "<p>Welcome to serendipity!</b><p>";
+			 echo "Write down your password: ".$_POST["pass"]." and <a href='".$_POST["serendipityHTTPPath"]."'>check out your blog</a>";
+			 session_destroy();
+		 }
+	 }
+	 break;
+
+ default:
+	 if (file_exists("./serendipity_config_local.inc.php")) {
+		 $from = &$serendipity;
+	 }
+	 else {
+		 $from = false;
+	 }
+
+	 serendipity_printConfigTemplate(serendipity_parseTemplate("./serendipity_config_local.tpl"), $from);
 }
+
+/*
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: t
+ * End:
+ */
 
 ?>

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_config.inc.php	30 Mar 2003 15:38:08 -0000	1.2
+++ serendipity_config.inc.php	31 Mar 2003 21:49:26 -0000	1.3
@@ -1,61 +1,65 @@
 <?php
-##########################################################################
-# serendipity - another blogger...                                             #
-##########################################################################
-#                                                                        #
-# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
-#                                                                        #
-##########################################################################
 define('IN_serendipity', true);
 include_once('compat.php');
 
 // For security reasons (serendipity relies on register_globals on)
 $serendipity = array();
 
-if (!file_exists("./serendipity_config_local.inc.php"))
-	die ("serendipity is not yet installed! Go to the <a href='serendipity_admin.php'>Installation</a>");
-include_once('./serendipity_config_local.inc.php');
-
-// Put your emoticons here
-$serendipity["smiles"] = array(":'(" => $serendipity["serendipityHTTPPath"]."pixel/cry_smile.gif",
-                         ":-)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
-					     ":-O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
-					     ":O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
-                         ":-("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
-                         ":("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
-                         ":)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
-						 "8-)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
-                         ":-D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
-                         ":D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
-						 "8)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
-                         ":-P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
-                         ";-)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
-                         ";)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
-                         ":P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
-                        );
 
 
-// You're done :)
+if (!file_exists("./serendipity_config_local.inc.php")) {
+	die("Serendipity is not yet installed.  Please <a href=\"serendipity_admin.php\">install</a> it now.");
+}
 
-/*************************************************************************
-* You shouldn't need to touch anything here.                             *
-*************************************************************************/
+// Load DB configuration information
+include_once("./serendipity_config_local.inc.php");
 
-include($serendipity["serendipityPath"]."/serendipity_functions.inc.php");
-if (serendipity_FUNCTIONS_LOADED!== true)
-	die ("serendipity error: could not include serendipity_functions.inc.php - exiting");
+include_once("./serendipity_functions.inc.php");
+if (serendipity_FUNCTIONS_LOADED!== true) {
+	die("serendipity error: could not include serendipity_functions.inc.php - exiting");
+}
+// Connect to database
+if (!serendipity_db_connect()) {
+	die("serendipity error: unable to connect to database - exiting");
+}
 
-include($serendipity["serendipityPath"]."/serendipity_lang_".$serendipity["lang"].".inc.php");
-if (serendipity_LANG_LOADED !== true)
-	die ("serendipity error: could not include serendipity_lang_".$serendipity["lang"].".inc.php - exiting");
+$translation = array(
+					 "true" => true,
+					 "false" => false
+					 );
 
+// Load Configuration options from the database
+$rows = serendipity_db_query("SELECT name,value FROM {$serendipity['dbPrefix']}config WHERE weblogid='1'");
+foreach ($rows as $row) {
+	$serendipity[$row['name']] = isset($translation[$row['value']]) ? $translation[$row['value']] : $row['value'];
+}
 
-// Connect to database
-if (!serendipity_db_connect()) {
-	die ("serendipity error: unable to connect to database - exiting");
+// Load basic language information
+include_once($serendipity["serendipityPath"]."/serendipity_lang_".$serendipity["lang"].".inc.php");
+if (serendipity_LANG_LOADED !== true) {
+  die("serendipity error: could not include serendipity_lang_".$serendipity["lang"].".inc.php - exiting");
 }
 
+// A Set of emoticons to rewrite
+$serendipity["smiles"] = array(
+							   ":'(" => $serendipity["serendipityHTTPPath"]."pixel/cry_smile.gif",
+							   ":-)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
+							   ":-O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
+							   ":O"  => $serendipity["serendipityHTTPPath"]."pixel/embaressed_smile.gif",
+							   ":-("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
+							   ":("  => $serendipity["serendipityHTTPPath"]."pixel/sad_smile.gif",
+							   ":)"  => $serendipity["serendipityHTTPPath"]."pixel/regular_smile.gif",
+							   "8-)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
+							   ":-D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
+							   ":D"  => $serendipity["serendipityHTTPPath"]."pixel/teeth_smile.gif",
+							   "8)"  => $serendipity["serendipityHTTPPath"]."pixel/shades_smile.gif",
+							   ":-P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
+							   ";-)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
+							   ";)"  => $serendipity["serendipityHTTPPath"]."pixel/wink_smile.gif",
+							   ":P"  => $serendipity["serendipityHTTPPath"]."pixel/tounge_smile.gif",
+							   );
+
+
 // Avoid magic_quotes_gpc issues
 // courtesy of il...@ph...
 function serendipity_strip_quotes(&$var)
@@ -94,13 +98,27 @@
 $serendipity["POST"] = &$_POST["serendipity"];
 
 // We don't care who tells us what to do
-if (!$serendipity["GET"]["action"])
+if (!$serendipity["GET"]["action"]) {
     $serendipity["GET"]["action"] = $serendipity["POST"]["action"];
-if (!$serendipity["GET"]["adminAction"])
+} 
+
+if (!$serendipity["GET"]["adminAction"]) {
 	$serendipity["GET"]["adminAction"] = $serendipity["POST"]["adminAction"];
+}
 
 // Some stuff...
-if (!$_SESSION["serendipityAuthedUser"]) $_SESSION["serendipityAuthedUser"] = false;
+if (!$_SESSION["serendipityAuthedUser"]) {
+	$_SESSION["serendipityAuthedUser"] = false;
+}
+
 $serendipity["user"] = $_SESSION["serendipityUser"];
 $serendipity["email"] = $_SESSION["serendipityEmail"];
+
+/** 
+ * Local Variables:
+ * c-basic-offset: 4
+ * tab-width: 4
+ * indent-tabs-mode: t
+ * End:
+ */
 ?>

Index: serendipity_db.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_db.inc.php	28 Mar 2003 20:05:24 -0000	1.1.1.1
+++ serendipity_db.inc.php	31 Mar 2003 21:49:27 -0000	1.2
@@ -1,6 +1,6 @@
-<?php # $Id$
+<?php 
 
-include_once $serendipity['serendipityPath'] . "/serendipity_db_" . $serendipity['dbType'] . ".inc.php";
+include_once("./serendipity_db_" . $serendipity['dbType'] . ".inc.php");
 
 function serendipity_db_update($table, $keys, $values)
 {

Index: serendipity_db_mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_mysql.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_db_mysql.inc.php	29 Mar 2003 16:13:08 -0000	1.2
+++ serendipity_db_mysql.inc.php	31 Mar 2003 21:49:27 -0000	1.3
@@ -75,6 +75,10 @@
 {
 	global $serendipity;
 
+	if ($serendipity['dbConn']) {
+	  return;
+	}
+
 	$serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
 	return $serendipity['dbConn'];
 }

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_functions.inc.php	31 Mar 2003 07:55:22 -0000	1.7
+++ serendipity_functions.inc.php	31 Mar 2003 21:49:27 -0000	1.8
@@ -1,18 +1,6 @@
 <?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!");
-
-include_once "serendipity_db.inc.php";
-include_once "compat.php";
+include_once("./serendipity_db.inc.php");
+include_once("./compat.php");
 
 $serendipity["imageList"] = array();
 function serendipity_displayCommentForm($id) {