X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=62ef9909e9e65266de14f52fd9e6728b130e6db9;hb=62b16291efe168636f5eda2c8644f6770382fb1e;hp=8fd4b43047bacaad899070e04138e004578b25f6;hpb=7ff28f7292939ad1a61b9b7a4e3398ff6310a3d0;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 8fd4b43047..62ef9909e9 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -41,83 +41,73 @@ 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
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET pass_scramble='%s' WHERE config=0 LIMIT 1",
-	 array($scrambleString), __FILE__, __LINE__);
+	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
-	$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET master_salt='%s' WHERE config=0 LIMIT 1",
-	 array($masterSalt), __FILE__, __LINE__);
+	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_hash = sha1(GEN_PASS(mt_rand(128, 256)));
 	$file = PATH."inc/.secret/.".$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 = rand(40, 45);
-		// 2. Generate secret key from a randomized string
-		$secretKey = substr(generateHash(GEN_PASS(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",
-		 array($file_hash), __FILE__, __LINE__);
+		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");
+		// Generate FQFN for .htaccess file
+		$FQFN = PATH."inc/.secret/.htaccess";
 
-			// Close the file
-			fclose($fp);
-		}
+		// Is the .htaccess file there?
+		if (!FILE_READABLE($FQFN)) {
+			// Also create .htaccess file
+			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);
-
-		// Don't miss the admin hash here...
-		$passHash = generatePassString(get_session('admin_md5'));
-		set_session('admin_md5', $passHash);
-	}
-}
+	} // END - if
+} // END - if
 
 //
 ?>
\ No newline at end of file