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

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 8fd4b43047..8c54d294aa 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // Check for version of sql_patches
-if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
+if (EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) return false;
 
 // Check if there is no scrambling string
 if (empty($_CONFIG['pass_scramble'])) {
@@ -46,8 +46,7 @@ if (empty($_CONFIG['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",
-	 array($scrambleString), __FILE__, __LINE__);
+	UPDATE_CONFIG("pass_scramble", $scrambleString);
 
 	// Also remember it in config
 	$_CONFIG['pass_scramble'] = $scrambleString;
@@ -61,8 +60,7 @@ if (empty($_CONFIG['master_salt'])) {
 	$masterSalt = scrambleString(substr(generateHash(GEN_PASS(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__);
+	UPDATE_CONFIG("master_salt", $masterSalt);
 
 	// Also remember it in config
 	$_CONFIG['master_salt'] = $masterSalt;
@@ -72,14 +70,14 @@ if (empty($_CONFIG['master_salt'])) {
 if (empty($_CONFIG['file_hash'])) {
 	// Create filename from hashed random string
 	$file_hash = generateHash(GEN_PASS(rand(128, 256)));
-	$file = PATH."inc/.secret/.".$file_hash;
+	$file = sprintf("%sinc/.secret/.%s", PATH, $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);
 		// 3. Write the key to the file
@@ -93,31 +91,20 @@ 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
-		$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);
-		}
+		UPDATE_CONFIG("file_hash", $file_hash);
 
 		// Also update configuration
-		$_CONFIG['secret_key'] = $secretKey; unset($secretKey);
-		$_CONFIG['file_hash']  = $file_hash; unset($file_hash);
+		$_CONFIG['secret_key'] = $secretKey;
+		$_CONFIG['file_hash']  = $file_hash;
 
-		// Don't miss the admin hash here...
-		$passHash = generatePassString(get_session('admin_md5'));
-		set_session('admin_md5', $passHash);
+		// And remove some variables
+		unset($secretKey);
+		unset($file_hash);
 	}
 }
 
 //
-?>
\ No newline at end of file
+?>