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