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

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 61eebc187f..0903d68470 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // 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);
 }
@@ -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,7 +70,7 @@ 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!");
@@ -93,11 +91,10 @@ 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__);
+		UPDATE_CONFIG("file_hash", $file_hash);
 
 		// Also update configuration
 		$_CONFIG['secret_key'] = $secretKey;