X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=c6d3a5373b3908b798a579dd547fab13696b13b9;hb=e8b99d201eaf3ef83bb83e6b42f146752a06721a;hp=98337f0f3c55565e050416eeffe2223629929e26;hpb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 98337f0f3c..c6d3a5373b 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -58,7 +58,7 @@ if (getConfig('pass_scramble') == "") {
 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(mt_rand(128, 256))), 0, -40));
+	$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",
@@ -71,7 +71,7 @@ if (getConfig('master_salt') == "") {
 
 if (getConfig('file_hash') == "") {
 	// Create filename from hashed random string
-	$file_hash = generateHash(sha1(GEN_PASS(mt_rand(128, 256))));
+	$file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
 	$file = PATH."inc/.secret/.".$file_hash;
 
 	// File hash was never created
@@ -81,7 +81,7 @@ if (getConfig('file_hash') == "") {
 		// 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(generateHash(GEN_PASS(mt_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
@@ -99,14 +99,17 @@ if (getConfig('file_hash') == "") {
 		$result = SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
 			array($file_hash), __FILE__, __LINE__);
 
-		// 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);
+		// 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