Some getConfig() rewritten to isConfigEntrySet()

[mailer.git] / inc / functions.php

diff --git a/inc/functions.php b/inc/functions.php
index f7c7e5be093bdba37e0ad2cb3ed14c2e8b2c3e2e..0f206df6d0b448c0c4c7200a2be7d9d2eb2bdf7b 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1245,10 +1245,10 @@ function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
 
        // Build key string
        $keys   = constant('SITE_KEY').":".constant('DATE_KEY');
-       if (getConfig('secret_key') != null)  $keys .= ":".getConfig('secret_key');
-       if (getConfig('file_hash') != null)   $keys .= ":".getConfig('file_hash');
+       if (isConfigEntrySet('secret_key'))  $keys .= ":".getConfig('secret_key');
+       if (isConfigEntrySet('file_hash'))   $keys .= ":".getConfig('file_hash');
        $keys .= ":".date("d-m-Y (l-F-T)", bigintval(getConfig('patch_ctime')));
-       if (getConfig('master_salt') != null) $keys .= ":".getConfig('master_salt');
+       if (isConfigEntrySet('master_salt')) $keys .= ":".getConfig('master_salt');
 
        // Build string from misc data
        $data   = $code.":".$uid.":".$DATA;
@@ -1263,7 +1263,7 @@ function GEN_RANDOM_CODE ($length, $code, $uid, $DATA="") {
        // Calculate number for generating the code
        $a = $code + constant('_ADD') - 1;
 
-       if (getConfig('master_hash') != null) {
+       if (isConfigEntrySet('master_hash')) {
                // Generate hash with master salt from modula of number with the prime number and other data
                $saltedHash = generateHash(($a % constant('_PRIME')).":".$server.":".$keys.":".$data.":".date("d-m-Y (l-F-T)", time()).":".$a, getConfig('master_salt'));