X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=20cf9be76d26061f34060589bdebfcffc472bbd5;hb=d52156d35605388b7554c31d08bc29f0bb167079;hp=0903d68470947c1253782fe39a7ee8a4119bfc3b;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 0903d68470..20cf9be76d 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -32,7 +32,7 @@
************************************************************************/
// 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);
}
@@ -41,70 +41,82 @@ if (!defined('__SECURITY')) {
if (GET_EXT_VERSION("sql_patches") < "0.3.6") return false;
// Check if there is no scrambling string
-if (empty($_CONFIG['pass_scramble'])) {
+if (getConfig('pass_scramble') == "") {
// Generate 40 chars long scramble string
$scrambleString = genScrambleString(40);
// ... and store it there for future usage
- UPDATE_CONFIG("pass_scramble", $scrambleString);
+ 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;
+ setConfigEntry('pass_scramble', $scrambleString);
unset($scrambleString);
-}
+} // END - if
// Check if there is no master salt string
-if (empty($_CONFIG['master_salt'])) {
+if (getConfig('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(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
// ... and store it there for future usage
- UPDATE_CONFIG("master_salt", $masterSalt);
+ 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;
+ setConfigEntry('master_salt', $masterSalt);
unset($masterSalt);
-}
+} // END - if
-if (empty($_CONFIG['file_hash'])) {
+if (getConfig('file_hash') == "") {
// Create filename from hashed random string
- $file_hash = generateHash(GEN_PASS(rand(128, 256)));
- $file = sprintf("%sinc/.secret/.%s", PATH, $file_hash);
+ $fileHash = sha1(GEN_PASS(mt_rand(128, 256)));
+ $FQFN = sprintf("%sinc/.secret/.%s",
+ constant('PATH'),
+ $fileHash
+ );
+
+ // Count of chars to be taken from back of the string
+ $nums = mt_rand(40, 45);
+
+ // Generate secret key from a randomized string
+ $secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
// 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);
+ WRITE_FILE($FQFN, $secretKey);
+
+ // Is the file there?
+ if (FILE_READABLE($FQFN)) {
+ //* DEBUG: */ unlink($FQFN);
//* 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);
+ // Write $fileHash to database
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+ array($fileHash), __FILE__, __LINE__);
+
+ // Generate FQFN for .htaccess file
+ $FQFN = sprintf("%sinc/.secret/.htaccess",
+ constant('PATH')
+ );
+
+ // Is the .htaccess file there?
+ if (!FILE_READABLE($FQFN)) {
+ // Also create .htaccess file
+ WRITE_FILE($FQFN, "Deny from all\n");
+ } // END - if
// Also update configuration
- $_CONFIG['secret_key'] = $secretKey;
- $_CONFIG['file_hash'] = $file_hash;
+ setConfigEntry('secret_key', $secretKey);
+ setConfigEntry('file_hash' , $fileHash);
- // And remove some variables
+ // Remove variables
unset($secretKey);
- unset($file_hash);
- }
-}
+ unset($fileHash);
+ } // END - if
+} // END - if
//
-?>
+?>
\ No newline at end of file