X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=20cf9be76d26061f34060589bdebfcffc472bbd5;hb=c4ceb98e54f072c262519fc2ea31ccf6f8559049;hp=0c9afaab5c6131cac397fb96c565a5354e42e06c;hpb=397eb5dee2611cfaa1ff494d73e6785b88109cd6;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 0c9afaab5c..20cf9be76d 100644
--- 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,16 +65,16 @@ 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 = sprintf("%sinc/.secret/.%s",
+	$fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+	$FQFN = sprintf("%sinc/.secret/.%s",
 		constant('PATH'),
-		$file_hash
+		$fileHash
 	);
 
 	// Count of chars to be taken from back of the string
@@ -84,18 +84,18 @@ if (getConfig('file_hash') == "") {
 	$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
 
 	// File hash was never created
-	WRITE_FILE($file, $secretKey);
+	WRITE_FILE($FQFN, $secretKey);
 
 	// Is the file there?
-	if (FILE_READABLE($file)) {
-		//* DEBUG: */ unlink($file);
+	if (FILE_READABLE($FQFN)) {
+		//* DEBUG: */ unlink($FQFN);
 		//* DEBUG: */ $test = hexdec(get_session('u_hash')) / hexdec($secretKey);
 		//* DEBUG: */ $test = generateHash(str_replace('.', "", $test));
 		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
 
-		// Write $file_hash to database
+		// Write $fileHash to database
 		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
-			array($file_hash), __FILE__, __LINE__);
+			array($fileHash), __FILE__, __LINE__);
 
 		// Generate FQFN for .htaccess file
 		$FQFN = sprintf("%sinc/.secret/.htaccess",
@@ -109,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' , $fileHash);
+
+		// Remove variables
+		unset($secretKey);
+		unset($fileHash);
 	} // END - if
 } // END - if