[php-blog-cvs] jBlog jBlog_admin_installer.inc.php,1.13,1.14 jBlog_config.inc.php,1.5,1.6 jBlog_config_local.tpl,1.6,1.7

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

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

Modified Files:
	jBlog_admin_installer.inc.php jBlog_config.inc.php 
	jBlog_config_local.tpl 
Log Message:
Fix bool fields in the configuration screen.
Fix "'" handling in the configuration screen (it was not a magic_quotes_gpc
issue).
Add magic_quotes_gpc avoidance code, thanks to Ilia.


Index: jBlog_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_admin_installer.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jBlog_admin_installer.inc.php	14 Mar 2003 02:38:05 -0000	1.13
+++ jBlog_admin_installer.inc.php	14 Mar 2003 04:04:26 -0000	1.14
@@ -88,6 +88,7 @@
 
 function jBlog_printConfigTemplate($t, $from = false) {
 	global $jBlog;
+
     echo "<form action='?' method='POST'>";
     echo "<input type='hidden' name='jBlog[adminModule]' value='installer'>";
     echo "<input type='hidden' name='installAction' value='check'>";
@@ -101,11 +102,11 @@
 			echo "<td valign='top'>".$value[$x]["name"].":</td>";
             echo "<td>";
             if ($value[$x]["type"] == "bool") {
-				echo "<input type='radio' name='".$value[$x]["name"]."' value='true'  ".(($values[$x]["default"]=='true') ? "" : "CHECKED")."> Yes<br>";
-                echo "<input type='radio' name='".$value[$x]["name"]."' value='false' ".(($values[$x]["default"]=='true') ? "CHECKED" : "")."> No<br>";
+				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>";
             }
             else {
-				echo "<input type='text' name='".$value[$x]["name"]."' value='".$value[$x]["default"]."'>";
+				echo "<input type='text' name='".$value[$x]["name"]."' value=\"".htmlentities($value[$x]["default"])."\">";
             }
             echo "</td>";
             echo "<td valign='top'><font color='#bbbbbb'>// ".$value[$x]["desc"]." (".$value[$x]["type"].")</font></td>";

Index: jBlog_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- jBlog_config.inc.php	14 Mar 2003 02:38:05 -0000	1.5
+++ jBlog_config.inc.php	14 Mar 2003 04:04:26 -0000	1.6
@@ -60,6 +60,33 @@
 	die ("jBlog error: unable to connect to database - exiting");
 }
 
+// Avoid magic_quotes_gpc issues
+// courtesy of il...@ph...
+function jBlog_strip_quotes(&$var)
+{
+    if (is_array($v)) {
+        array_walk($var[$k], 'jBlog_strip_quotes');
+    } else {
+        $var = stripslashes($var);
+    }
+}
+
+if (ini_get("magic_quotes_gpc")) {
+    if (@count($_GET)) {
+        array_walk($_GET, 'jBlog_strip_quotes');
+    }
+    if (@count($_POST)) {
+        array_walk($_POST, 'jBlog_strip_quotes');
+    }
+    if (@count($_COOKIES)) {
+        array_walk($_COOKIES, 'jBlog_strip_quotes');
+    }
+    if (@count($_FILES)) {
+        array_walk($_FILES, 'jBlog_strip_quotes');
+    }
+}
+
+
 // Merge get and post into the jBlog array
 $jBlog["GET"] = &$_GET["jBlog"];
 $jBlog["POST"] = &$_POST["jBlog"];

Index: jBlog_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/jBlog/jBlog_config_local.tpl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- jBlog_config_local.tpl	13 Mar 2003 20:23:16 -0000	1.6
+++ jBlog_config_local.tpl	14 Mar 2003 04:04:26 -0000	1.7
@@ -4,7 +4,7 @@
 * General configure options, adjust to your needs:                       *
 *************************************************************************/
 // Database Settings
-$jBlog["dbType"]   = "{dbType|string|mysql}";			 // Database type (mysql|sqlite)
+$jBlog["dbType"]   = "{dbType|string|mysql}";			 // Database type (mysql|postgres)
 $jBlog["dbHost"]   = "{dbHost|string|localhost}";        // MySQL host
 $jBlog["dbUser"]   = "{dbUser|string|jBlog}";            // Username
 $jBlog["dbPass"]   = "{dbPass|string|jBlog}";            // Password