A lot calls saved, expression language rewritten:

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index d853f1ca8d9b9b1b56619e90b1827f27d2c1db99..4853da16b7023890ae3083769503b693e3bd3377 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -43,7 +43,7 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Check if there is no scrambling string
-if (getConfig('pass_scramble') == '') {
+if (getPassScramble() == '') {
        // Generate 40 chars long scramble string
        $scrambleString = genScrambleString(40);
 
@@ -55,7 +55,7 @@ if (getConfig('pass_scramble') == '') {
 } // END - if
 
 // Check if there is no master salt string
-if (getConfig('master_salt') == '') {
+if (getMasterSalt() == '') {
        // Generate the master salt which is the first chars minus 40 chars of this random hash
        // We do an extra scrambling here...
        $masterSalt = scrambleString(sha1(generatePassword(mt_rand(128, 256))));
@@ -67,11 +67,11 @@ if (getConfig('master_salt') == '') {
        unset($masterSalt);
 } // END - if
 
-if (getConfig('file_hash') == '') {
+if (getFileHash() == '') {
        // Create filename from hashed random string
        $fileHash = sha1(generatePassword(mt_rand(128, 256)));
        $FQFN = sprintf("%sinc/.secret/.%s",
-               getConfig('PATH'),
+               getPath(),
                $fileHash
        );
 
@@ -93,7 +93,7 @@ if (getConfig('file_hash') == '') {
 
                // Generate FQFN for .htaccess file
                $FQFN = sprintf("%sinc/.secret/.htaccess",
-                       getConfig('PATH')
+                       getPath()
                );
 
                // Is the .htaccess file there?