X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=1a7c1fc7951b04528f5df70cf7af11e416328fb1;hp=c6d3a5373b3908b798a579dd547fab13696b13b9;hb=08b3c51b70b6498fd92a2760979d64470ad1b586;hpb=aba7afc0616db433dac750c3386dbb23b5d077ca

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index c6d3a5373b..1a7c1fc795 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -46,11 +46,11 @@ if (getConfig('pass_scramble') == "") {
 	$scrambleString = genScrambleString(40);
 
 	// ... and store it there for future usage
-	$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET pass_scramble='%s' WHERE config=0 LIMIT 1",
 		array($scrambleString), __FILE__, __LINE__);
 
 	// Also remember it in config
-	$_CONFIG['pass_scramble'] = $scrambleString;
+	setConfigEntry('pass_scramble', $scrambleString);
 	unset($scrambleString);
 } // END - if
 
@@ -61,60 +61,60 @@ if (getConfig('master_salt') == "") {
 	$masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
 	// ... and store it there for future usage
-	$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
+	SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET master_salt='%s' WHERE config=0 LIMIT 1",
 		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);
+
+	// Generate secret key from a randomized string
+	$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
 
 	// File hash was never created
-	$fp = @fopen($file, 'w') or mxchange_die("Cannot write secret key file!");
-	if ($fp != false) {
-		// Could write to secret file! So let's generate the secret key...
-		// 1. Count of chars to be taken from back of the string
-		$nums = mt_rand(40, 45);
-		// 2. Generate secret key from a randomized string
-		$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
-		// 3. Write the key to the file
-		fwrite($fp, $secretKey);
-		// 4. Close file
-		fclose($fp);
-
-		// Change access rights for more security
-		@chmod($file, 0644);
+	WRITE_FILE($file, $secretKey);
 
+	// Is the file there?
+	if (FILE_READABLE($file)) {
 		//* DEBUG: */ unlink($file);
 		//* 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);
+		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
 
 		// Write $file_hash to database
-		$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
 			array($file_hash), __FILE__, __LINE__);
 
+		// Generate FQFN for .htaccess file
+		$FQFN = sprintf("%sinc/.secret/.htaccess",
+			constant('PATH')
+		);
+
 		// Is the .htaccess file there?
-		if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+		if (!FILE_READABLE($FQFN)) {
 			// Also create .htaccess file
-			$fp = @fopen(PATH."inc/.secret/.htaccess", 'w') or mxchange_die("Cannot write to .htaccess file!");
-			if ($fp != false) {
-				// Add deny line to file
-				fwrite($fp, "Deny from all");
-
-				// Close the file
-				fclose($fp);
-			} // END - if
+			WRITE_FILE($FQFN, "Deny from all\n");
 		} // 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