[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;
 	}