Fix inserting random code into serendipity_config_local.inc.php as Admin.

diff --git a/include/functions_installer.inc.php b/include/functions_installer.inc.php
index 5fc795ab5de6395ac404fa5f4e06c144b97c8566..f0553b4d35a4e6e4239ea6b1e8d71b13e8f6d19f 100644 (file)
--- a/include/functions_installer.inc.php
+++ b/include/functions_installer.inc.php
@@ -95,17 +95,17 @@ function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $db
     fwrite($configfp, "\t*/\n\n");
 
     fwrite($configfp, "\t\$serendipity['versionInstalled']  = '{$serendipity['version']}';\n");
-    fwrite($configfp, "\t\$serendipity['dbName']            = '{$dbName}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPrefix']          = '{$dbPrefix}';\n");
-    fwrite($configfp, "\t\$serendipity['dbHost']            = '{$dbHost}';\n");
-    fwrite($configfp, "\t\$serendipity['dbUser']            = '{$dbUser}';\n");
-    fwrite($configfp, "\t\$serendipity['dbPass']            = '{$dbPass}';\n");
-    fwrite($configfp, "\t\$serendipity['dbType']            = '{$dbType}';\n");
+    fwrite($configfp, "\t\$serendipity['dbName']            = '" . addslashes($dbName) . "';\n");
+    fwrite($configfp, "\t\$serendipity['dbPrefix']          = '" . addslashes($dbPrefix) . "';\n");
+    fwrite($configfp, "\t\$serendipity['dbHost']            = '" . addslashes($dbHost) . "';\n");
+    fwrite($configfp, "\t\$serendipity['dbUser']            = '" . addslashes($dbUser) . "';\n");
+    fwrite($configfp, "\t\$serendipity['dbPass']            = '" . addslashes($dbPass) . "';\n");
+    fwrite($configfp, "\t\$serendipity['dbType']            = '" . addslashes($dbType) . "';\n");
     fwrite($configfp, "\t\$serendipity['dbPersistent']      = ". (serendipity_db_bool($dbPersistent) ? 'true' : 'false') .";\n");
 
     if (is_array($privateVariables) && count($privateVariables) > 0) {
         foreach($privateVariables AS $p_idx => $p_val) {
-            fwrite($configfp, "\t\$serendipity['{$p_idx}']  = '{$p_val}';\n");
+            fwrite($configfp, "\t\$serendipity['{$p_idx}']  = '" . addslashes($p_val) . "';\n");
         }
     }
 
@@ -1092,7 +1092,7 @@ function serendipity_check_rewrite($default) {
         );
         return $default;
     } else {
-        fwrite($fp, 'ErrorDocument 404 ' . $serendipity_root . 'index.php');
+        fwrite($fp, 'ErrorDocument 404 ' . addslashes($serendipity_root) . 'index.php');
         fclose($fp);
 
         // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument

diff --git a/rss.php b/rss.php
index 0733c6f9383b03a4694d1da2477d3492edd81b64..05777a0a85cf57bafb616083b675d4608e71ae66 100644 (file)
--- a/rss.php
+++ b/rss.php
@@ -105,7 +105,7 @@ $metadata = array(
     'language'          => $serendipity['lang'],
     'additional_fields' => array(),
     'link'              => $serendipity['baseURL'],
-    'email'             => $serendipity['email'],
+    'email'             => $serendipity['blogMail'],
     'fullFeed'          => false,
     'showMail'          => false,
     'version'           => $version