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

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 61eebc187f..20cf9be76d 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -41,73 +41,82 @@ 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;
+	setConfigEntry('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;
+	setConfigEntry('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 = PATH."inc/.secret/.".$file_hash;
+	$fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+	$FQFN = sprintf("%sinc/.secret/.%s",
+		constant('PATH'),
+		$fileHash
+	);
+
+	// 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);
-
-		//* DEBUG: */ unlink($file);
+	WRITE_FILE($FQFN, $secretKey);
+
+	// Is the file there?
+	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);
+		//* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".get_session('u_hash')."<br />Test: ".$test);
+
+		// Write $fileHash to database
+		SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+			array($fileHash), __FILE__, __LINE__);
 
-		// 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__);
+		// Generate FQFN for .htaccess file
+		$FQFN = sprintf("%sinc/.secret/.htaccess",
+			constant('PATH')
+		);
+
+		// 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;
-		$_CONFIG['file_hash']  = $file_hash;
+		setConfigEntry('secret_key', $secretKey);
+		setConfigEntry('file_hash' , $fileHash);
 
-		// And remove some variables
+		// Remove variables
 		unset($secretKey);
-		unset($file_hash);
-	}
-}
+		unset($fileHash);
+	} // END - if
+} // END - if
 
 //
-?>
+?>
\ No newline at end of file