X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=732d4345b1637a2eedcb262ec42681a734495c9d;hp=45e7a626c3eb019473007033825a675ed7dbd031;hb=f36ab6ae1503ee54a7c9d0083a8089286d8b37ef;hpb=41e2891fb998d13b22b8d7984358f258cc85267d

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 45e7a626c3..732d4345b1 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -41,45 +41,47 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
 
 // Check if there is no scrambling string
-if (empty($_CONFIG['pass_scramble'])) {
+if (getConfig('pass_scramble') == "") {
 	// Generate 40 chars long scramble string
 	$scrambleString = genScrambleString(40);
 
 	// ... and store it there for future usage
-	UPDATE_CONFIG("pass_scramble", $scrambleString);
+	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;
 	unset($scrambleString);
-}
+} // END - if
 
 // Check if there is no master salt string
-if (empty($_CONFIG['master_salt'])) {
+if (getConfig('master_salt') == "") {
 	// Generate the master salt which is the first chars minus 40 chars of this random hash
 	// We do an extra scrambling here...
-	$masterSalt = scrambleString(substr(generateHash(GEN_PASS(rand(128, 256))), 0, -40));
+	$masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
 	// ... and store it there for future usage
-	UPDATE_CONFIG("master_salt", $masterSalt);
+	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;
 	unset($masterSalt);
-}
+} // END - if
 
-if (empty($_CONFIG['file_hash'])) {
+if (getConfig('file_hash') == "") {
 	// Create filename from hashed random string
-	$file_hash = generateHash(GEN_PASS(rand(128, 256)));
-	$file = sprintf("%sinc/.secret/.%s", PATH, $file_hash);
+	$file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
+	$file = PATH."inc/.secret/.".$file_hash;
 
 	// 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 = rand(40, 45);
+		$nums = mt_rand(40, 45);
 		// 2. Generate secret key from a randomized string
-		$secretKey = substr(generateHash(GEN_PASS(rand(128, 256))), -$nums);
+		$secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
 		// 3. Write the key to the file
 		fwrite($fp, $secretKey);
 		// 4. Close file
@@ -91,20 +93,30 @@ if (empty($_CONFIG['file_hash'])) {
 		//* 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
-		UPDATE_CONFIG("file_hash", $file_hash);
+		SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+			array($file_hash), __FILE__, __LINE__);
+
+		// Is the .htaccess file there?
+		if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+			// 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
+		} // END - if
 
 		// Also update configuration
-		$_CONFIG['secret_key'] = $secretKey;
-		$_CONFIG['file_hash']  = $file_hash;
-
-		// And remove some variables
-		unset($secretKey);
-		unset($file_hash);
-	}
-}
+		$_CONFIG['secret_key'] = $secretKey; unset($secretKey);
+		$_CONFIG['file_hash']  = $file_hash; unset($file_hash);
+	} // END - if
+} // END - if
 
 //
-?>
+?>
\ No newline at end of file