X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=2abce585f8980bb148ba0e437ca12cbd66f5452a;hb=1a87efa559d469c25f6e4bb863f5881b2fd59dde;hp=8fd4b43047bacaad899070e04138e004578b25f6;hpb=7ff28f7292939ad1a61b9b7a4e3398ff6310a3d0;p=mailer.git
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 8fd4b43047..2abce585f8 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -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!");
@@ -96,28 +94,17 @@ if (empty($_CONFIG['file_hash'])) {
//* DEBUG: */ die("Secret-Key: ".$secretKey."
Cookie: ".get_session('u_hash')."
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
+?>