Old config.php is now automatically updated to new config-local.php format, several...

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 58283c56cb2362f9554a6b43c3dc7c5cea50d2d1..e2b45f2eab75893a31c0360bc290e53ec3ae87a9 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -52,7 +52,7 @@ if (getConfig('pass_scramble') == '') {
 
        // ... and store it there for future usage
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
-               array($scrambleString), __FILE__, __LINE__);
+       array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config
        setConfigEntry('pass_scramble', $scrambleString);
@@ -67,7 +67,7 @@ if (getConfig('master_salt') == '') {
 
        // ... and store it there for future usage
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
-               array($masterSalt), __FILE__, __LINE__);
+       array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config
        setConfigEntry('master_salt', $masterSalt);
@@ -78,8 +78,8 @@ if (getConfig('file_hash') == '') {
        // Create filename from hashed random string
        $fileHash = sha1(generatePassword(mt_rand(128, 256)));
        $FQFN = sprintf("%sinc/.secret/.%s",
-               constant('PATH'),
-               $fileHash
+       constant('PATH'),
+       $fileHash
        );
 
        // Count of chars to be taken from back of the string
@@ -93,18 +93,18 @@ if (getConfig('file_hash') == '') {
 
        // Is the file there?
        if (isFileReadable($FQFN)) {
-               //* DEBUG: */ unlink($FQFN);
+               //* DEBUG: */ removeFile($FQFN);
                //* DEBUG: */ $test = hexdec(getSession('u_hash')) / hexdec($secretKey);
                //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
                //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".getSession('u_hash')."<br />Test: ".$test);
 
                // Write $fileHash to database
                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
-                       array($fileHash), __FILE__, __LINE__);
+               array($fileHash), __FILE__, __LINE__);
 
                // Generate FQFN for .htaccess file
                $FQFN = sprintf("%sinc/.secret/.htaccess",
-                       constant('PATH')
+               constant('PATH')
                );
 
                // Is the .htaccess file there?