X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=f4251010df6d9bfe929759eb0c09f4d4acff4dc2;hb=f9cc6f432459393d1c3a220e5270705d341a350e;hp=467e4b4ecb735cc4cfe693174516a5cd2fb8b8bf;hpb=7f104f6fe558bb56b4205241435a2357c2feece1;p=mailer.git
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 467e4b4ecb..f4251010df 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -32,13 +32,13 @@
************************************************************************/
// Some security stuff...
-if (!defined('__SECURITY')) {
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Check for version of sql_patches
-if (EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) return false;
+if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
// Check if there is no scrambling string
if (empty($_CONFIG['pass_scramble'])) {
@@ -46,40 +46,42 @@ if (empty($_CONFIG['pass_scramble'])) {
$scrambleString = genScrambleString(40);
// ... and store it there for future usage
- UPDATE_CONFIG("pass_scramble", $scrambleString);
+ $result = 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'])) {
// 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(generateHash(GEN_PASS(mt_rand(128, 256))), 0, -40));
// ... and store it there for future usage
- UPDATE_CONFIG("master_salt", $masterSalt);
+ $result = 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'])) {
// Create filename from hashed random string
- $file_hash = generateHash(GEN_PASS(rand(128, 256)));
- $file = sprintf("%sinc/.secret/.%s", PATH, $file_hash);
+ $file_hash = generateHash(sha1(GEN_PASS(mt_rand(128, 256))));
+ $file = PATH."inc/.secret/.".$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);
+ $secretKey = substr(generateHash(GEN_PASS(mt_rand(128, 256))), -$nums);
// 3. Write the key to the file
fwrite($fp, $secretKey);
// 4. Close file
@@ -91,20 +93,27 @@ 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."
Cookie: ".get_session('u_hash')."
Test: ".$test);
+ //* DEBUG: */ die("Secret-Key: ".$secretKey."
Cookie: ".get_session('u_hash')."
Test: ".$test);
// Write $file_hash to database
- UPDATE_CONFIG("file_hash", $file_hash);
+ $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET file_hash='%s' WHERE config=0 LIMIT 1",
+ array($file_hash), __FILE__, __LINE__);
- // Also update configuration
- $_CONFIG['secret_key'] = $secretKey;
- $_CONFIG['file_hash'] = $file_hash;
+ // 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");
- // And remove some variables
- unset($secretKey);
- unset($file_hash);
- }
-}
+ // Close the file
+ fclose($fp);
+ } // END - if
+
+ // Also update configuration
+ $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
+ $_CONFIG['file_hash'] = $file_hash; unset($file_hash);
+ } // END - if
+} // END - if
//
-?>
+?>
\ No newline at end of file