More queries and language constants rewritten

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index efa794120113073c89f18c3ce3ff78c718046348..1a7c1fc7951b04528f5df70cf7af11e416328fb1 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -50,7 +50,7 @@ if (getConfig('pass_scramble') == "") {
                array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config
-       $_CONFIG['pass_scramble'] = $scrambleString;
+       setConfigEntry('pass_scramble', $scrambleString);
        unset($scrambleString);
 } // END - if
 
@@ -65,14 +65,17 @@ if (getConfig('master_salt') == "") {
                array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config
-       $_CONFIG['master_salt'] = $masterSalt;
+       setConfigEntry('master_salt', $masterSalt);
        unset($masterSalt);
 } // END - if
 
 if (getConfig('file_hash') == "") {
        // Create filename from hashed random string
        $file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
-       $file = PATH."inc/.secret/.".$file_hash;
+       $file = sprintf("%sinc/.secret/.%s",
+               constant('PATH'),
+               $file_hash
+       );
 
        // Count of chars to be taken from back of the string
        $nums = mt_rand(40, 45);
@@ -95,7 +98,9 @@ if (getConfig('file_hash') == "") {
                        array($file_hash), __FILE__, __LINE__);
 
                // Generate FQFN for .htaccess file
-               $FQFN = PATH."inc/.secret/.htaccess";
+               $FQFN = sprintf("%sinc/.secret/.htaccess",
+                       constant('PATH')
+               );
 
                // Is the .htaccess file there?
                if (!FILE_READABLE($FQFN)) {
@@ -104,8 +109,12 @@ if (getConfig('file_hash') == "") {
                } // END - if
 
                // Also update configuration
-               $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
-               $_CONFIG['file_hash']  = $file_hash; unset($file_hash);
+               setConfigEntry('secret_key', $secretKey);
+               setConfigEntry('file_hash' , $file_hash);
+
+               // Remove variables
+               unset($secretKey);
+               unset($file_hash);
        } // END - if
 } // END - if