Several more constants rewritten to getConfig()

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 8a8797dcafb1af8c5486e7d111a6eee747ce75b5..d8cf59fece8633bfa79fbcbb2a6b4c5cab924ef5 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -51,11 +51,9 @@ if (getConfig('pass_scramble') == '') {
        $scrambleString = genScrambleString(40);
 
        // ... 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__);
+       updateConfiguration('pass_scramble', $scrambleString);
 
-       // Also remember it in config
-       setConfigEntry('pass_scramble', $scrambleString);
+       // Remove dummy string
        unset($scrambleString);
 } // END - if
 
@@ -66,11 +64,9 @@ if (getConfig('master_salt') == '') {
        $masterSalt = scrambleString(sha1(generatePassword(mt_rand(128, 256))));
 
        // ... 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__);
+       updateConfiguration('master_salt', $masterSalt);
 
-       // Also remember it in config
-       setConfigEntry('master_salt', $masterSalt);
+       // Remove dummy string
        unset($masterSalt);
 } // END - if
 
@@ -78,7 +74,7 @@ if (getConfig('file_hash') == '') {
        // Create filename from hashed random string
        $fileHash = sha1(generatePassword(mt_rand(128, 256)));
        $FQFN = sprintf("%sinc/.secret/.%s",
-               constant('PATH'),
+               getConfig('PATH'),
                $fileHash
        );
 
@@ -99,12 +95,11 @@ if (getConfig('file_hash') == '') {
                //* 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__);
+               updateConfiguration('file_hash', $fileHash);
 
                // Generate FQFN for .htaccess file
                $FQFN = sprintf("%sinc/.secret/.htaccess",
-               constant('PATH')
+                       getConfig('PATH')
                );
 
                // Is the .htaccess file there?
@@ -115,7 +110,6 @@ if (getConfig('file_hash') == '') {
 
                // Also update configuration
                setConfigEntry('secret_key', $secretKey);
-               setConfigEntry('file_hash' , $fileHash);
 
                // Remove variables
                unset($secretKey);