php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 538)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	serendipity_admin_installer.inc.php 
	serendipity_db_postgres.inc.php serendipity_functions.inc.php 
Added Files:
	serendipity_functions_config.inc.php 
Log Message:
This fixes installation issues with s9y for people desiring postgresql database backends.  I tested installation on a system with mysql and I don't think I broke anything.

I made use of the abstracted functions serendipity_set_config_var and serendipity_get_config_var to set the values from the installation script.

To make use of these functions, I broke them out into serendipity_functions_config.inc.php.  I also changed the installer so that it included serendipity_db.inc.php instead of the sub-database script.  To make this work, I temporarily set $serendipity['dbType'].

Someone really needs to commit the schema for the css table!  Just add it to the db.sql file and commit.

--- NEW FILE: serendipity_functions_config.inc.php ---
<?php # $Id: serendipity_functions_config.inc.php,v 1.1 2003/06/29 02:40:48 jtate Exp $


function serendipity_set_config_var($name, $val) {
    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));
       if (is_string($r)) {
               echo $r;
       }
}

function serendipity_get_config_var($name, $defval = false) {
    global $serendipity;
       if ( isset($serendipity['CONFIG'][$name]) ) {
               return $serendipity['CONFIG'][$name];
       } else {
               return $defval;
       }
}

?>

Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_admin_installer.inc.php	22 Jun 2003 19:52:18 -0000	1.14
+++ serendipity_admin_installer.inc.php	29 Jun 2003 02:40:48 -0000	1.15
@@ -202,7 +202,8 @@
 			 $serendipity[$k] = $v;
 		 }
 	 }
-	 include_once $_POST['serendipityPath'] . '/serendipity_db_' . $_POST['dbType'] . '.inc.php';
+         $serendipity['dbType'] = $_POST['dbType'];
+	 include_once $_POST['serendipityPath'] . '/serendipity_db.inc.php';
 		
 	 // Probe database (do it after the dir stuff, as we need to be able to create the
 	 // sqlite database)
@@ -239,7 +240,8 @@
 								'$_POST[email]',
 								$mail_comments) ";
 			 serendipity_db_query($query);
-                         $query = "INSERT INTO $_POST[dbPrefix]config set name='template', value='default'";
+			 include_once $_POST['serendipityPath'] . '/serendipity_functions_config.inc.php';
+                         serendipity_set_config_var('template', 'default');
                          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')";
@@ -269,15 +271,11 @@
 
 		// 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);
-			}
-		}
+                foreach($p as $key=>$value) {
+                        foreach ($value as $entry) {
+                                serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
+                        }
+                }
 
 		// Create a basic configuration file which gives enough information to open
 		// the database and get information from the database tables

Index: serendipity_db_postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_db_postgres.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_db_postgres.inc.php	3 Apr 2003 21:02:41 -0000	1.3
+++ serendipity_db_postgres.inc.php	29 Jun 2003 02:40:48 -0000	1.4
@@ -50,6 +50,7 @@
 			if (function_exists("debug_backtrace")) {
 			    highlight_string(var_export(debug_backtrace(), 1));
 			}
+			print "<br><code>$sql</code>\n";
 		}
 		return false;
 	}

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- serendipity_functions.inc.php	28 Jun 2003 18:47:14 -0000	1.84
+++ serendipity_functions.inc.php	29 Jun 2003 02:40:48 -0000	1.85
@@ -1,6 +1,8 @@
 <?php
 include_once("./serendipity_db.inc.php");
 include_once("./compat.php");
+include_once("./serendipity_functions_config.inc.php");
+
 function serendipity_getTemplateFile($file) {
 	global $serendipity;
 	if ( file_exists($serendipity['templatePath'] . $serendipity['CONFIG']['template'] . '/'. $file) ) {
@@ -1661,25 +1663,6 @@
         }
     }
     echo "</span>";
-}
-
-function serendipity_set_config_var($name, $val) {
-    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));
-	if (is_string($r)) {
-		echo $r;
-	}
-}
-
-function serendipity_get_config_var($name, $defval = false) {
-    global $serendipity;
-	if ( isset($serendipity['CONFIG'][$name]) ) {
-		return $serendipity['CONFIG'][$name];
-	} else {
-		return $defval;
-	}
 }
 
 function serendipity_emit_htmlarea_code($item)






2003	Jan	Feb	Mar (179)	Apr (56)	May (53)	Jun (65)	Jul (70)	Aug (89)	Sep (50)	Oct (38)	Nov (12)	Dec (12)
2004	Jan (57)	Feb (226)	Mar (172)	Apr (194)	May (120)	Jun (162)	Jul (297)	Aug (156)	Sep (312)	Oct (180)	Nov (358)	Dec (362)
2005	Jan (275)	Feb (224)	Mar (202)	Apr (157)	May (133)	Jun (115)	Jul (211)	Aug (257)	Sep (135)	Oct (116)	Nov (106)	Dec (81)
2006	Jan (74)	Feb (94)	Mar (59)	Apr (125)	May (50)	Jun (71)	Jul (45)	Aug (80)	Sep (3)	Oct (44)	Nov (50)	Dec (38)
2007	Jan (46)	Feb (33)	Mar (24)	Apr (28)	May (19)	Jun (37)	Jul (66)	Aug (73)	Sep (87)	Oct (33)	Nov (39)	Dec (37)
2008	Jan (20)	Feb (54)	Mar (47)	Apr (68)	May (10)	Jun (13)	Jul (13)	Aug (25)	Sep (11)	Oct (22)	Nov (22)	Dec (34)
2009	Jan (34)	Feb (35)	Mar (11)	Apr (10)	May (15)	Jun (18)	Jul (28)	Aug (22)	Sep (9)	Oct (12)	Nov (6)	Dec (32)
2010	Jan (11)	Feb (7)	Mar (9)	Apr (3)	May (16)	Jun (1)	Jul (2)	Aug (25)	Sep (9)	Oct (8)	Nov (4)	Dec (8)
2011	Jan (17)	Feb (1)	Mar (6)	Apr (7)	May (5)	Jun (2)	Jul (12)	Aug (3)	Sep (18)	Oct (3)	Nov (2)	Dec
2012	Jan (92)	Feb (74)	Mar (64)	Apr (55)	May (44)	Jun (91)	Jul (35)	Aug (42)	Sep (32)	Oct (56)	Nov (42)	Dec (81)
2013	Jan (117)	Feb (130)	Mar (33)	Apr (36)	May (155)	Jun (241)	Jul (113)	Aug (70)	Sep (50)	Oct (55)	Nov (34)	Dec (36)
2014	Jan (94)	Feb (67)	Mar (177)	Apr (67)	May (147)	Jun (137)	Jul (58)	Aug (56)	Sep (62)	Oct (35)	Nov (118)	Dec (53)
2015	Jan (204)	Feb (165)	Mar (275)	Apr (42)	May (58)	Jun (91)	Jul (81)	Aug (62)	Sep (23)	Oct (63)	Nov (29)	Dec (110)
2016	Jan (82)	Feb (55)	Mar (48)	Apr (92)	May (77)	Jun (41)	Jul (27)	Aug (41)	Sep (101)	Oct (84)	Nov (12)	Dec (18)
2017	Jan (44)	Feb (40)	Mar (23)	Apr (79)	May (27)	Jun (12)	Jul (20)	Aug (14)	Sep (3)	Oct (9)	Nov (4)	Dec (9)
2018	Jan (5)	Feb (23)	Mar (150)	Apr (114)	May (63)	Jun (25)	Jul (23)	Aug (54)	Sep (43)	Oct (10)	Nov (9)	Dec (1)
2019	Jan (1)	Feb (27)	Mar (27)	Apr (64)	May (21)	Jun (17)	Jul (12)	Aug (81)	Sep (15)	Oct (25)	Nov (15)	Dec (13)
2020	Jan (5)	Feb (4)	Mar (95)	Apr (59)	May (53)	Jun (22)	Jul (3)	Aug (13)	Sep (10)	Oct (4)	Nov (3)	Dec (1)
2021	Jan (20)	Feb (32)	Mar (34)	Apr (22)	May (58)	Jun (43)	Jul (35)	Aug (2)	Sep (14)	Oct (1)	Nov (2)	Dec
2022	Jan (2)	Feb (6)	Mar (4)	Apr	May (5)	Jun (4)	Jul (3)	Aug (5)	Sep (6)	Oct (3)	Nov (38)	Dec (15)
2023	Jan (26)	Feb (12)	Mar (3)	Apr (9)	May (2)	Jun (5)	Jul (8)	Aug	Sep (39)	Oct (11)	Nov (3)	Dec (3)
2024	Jan (19)	Feb (20)	Mar (15)	Apr (12)	May (2)	Jun (12)	Jul (4)	Aug (9)	Sep	Oct	Nov	Dec
2025	Jan (72)	Feb (80)	Mar (92)	Apr (35)	May (19)	Jun (14)	Jul	Aug	Sep	Oct	Nov	Dec

php-blog-cvs Mailing List for Serendipity PHP Weblog System (Page 538)

A reliable, secure & extensible PHP blog | Not mainstream since 2002

php-blog-cvs — Serendipity commit list