X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=0903d68470947c1253782fe39a7ee8a4119bfc3b;hp=e5584c7474d628c2c0e85d3df3fae151259052ee;hb=963e55ca1ea79e255f235e359cde9f7862191dc5;hpb=60494e212a67fe360bfbb481eb4928480a6f379b
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index e5584c7474..0903d68470 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -32,94 +32,79 @@
************************************************************************/
// Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
- $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
- require($INC);
+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;
// Check if there is no scrambling string
-if (empty($_CONFIG['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__);
-
- // Also remember it in config
- $_CONFIG['pass_scramble'] = $scrambleString;
- unset($scrambleString);
+if (empty($_CONFIG['pass_scramble'])) {
+ // Generate 40 chars long scramble string
+ $scrambleString = genScrambleString(40);
+
+ // ... and store it there for future usage
+ UPDATE_CONFIG("pass_scramble", $scrambleString);
+
+ // Also remember it in config
+ $_CONFIG['pass_scramble'] = $scrambleString;
+ unset($scrambleString);
}
// 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));
-
- // ... 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__);
-
- // Also remember it in config
- $_CONFIG['master_salt'] = $masterSalt;
- unset($masterSalt);
+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));
+
+ // ... and store it there for future usage
+ UPDATE_CONFIG("master_salt", $masterSalt);
+
+ // Also remember it in config
+ $_CONFIG['master_salt'] = $masterSalt;
+ unset($masterSalt);
}
-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 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);
- //* DEBUG: */ $test = hexdec($_COOKIE['u_hash']) / hexdec($secretKey);
- //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
- //* DEBUG: */ die("Secret-Key: ".$secretKey."
Cookie: ".$_COOKIE['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);
- }
-
- // Also update configuration
- $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
- $_CONFIG['file_hash'] = $file_hash; unset($file_hash);
- }
+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 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);
+ //* 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);
+
+ // Write $file_hash to database
+ UPDATE_CONFIG("file_hash", $file_hash);
+
+ // Also update configuration
+ $_CONFIG['secret_key'] = $secretKey;
+ $_CONFIG['file_hash'] = $file_hash;
+
+ // And remove some variables
+ unset($secretKey);
+ unset($file_hash);
+ }
}
//
-?>
\ No newline at end of file
+?>