Even more constants/language strings rewritten, merge_array() now logs debug messages

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 98337f0f3c55565e050416eeffe2223629929e26..0c9afaab5c6131cac397fb96c565a5354e42e06c 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -46,7 +46,7 @@ if (getConfig('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",
+       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
@@ -58,10 +58,10 @@ if (getConfig('pass_scramble') == "") {
 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(mt_rand(128, 256))), 0, -40));
+       $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_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",
+       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
@@ -71,42 +71,41 @@ if (getConfig('master_salt') == "") {
 
 if (getConfig('file_hash') == "") {
        // Create filename from hashed random string
-       $file_hash = generateHash(sha1(GEN_PASS(mt_rand(128, 256))));
-       $file = PATH."inc/.secret/.".$file_hash;
+       $file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
+       $file = sprintf("%sinc/.secret/.%s",
+               constant('PATH'),
+               $file_hash
+       );
+
+       // 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 = mt_rand(40, 45);
-               // 2. Generate secret key from a randomized string
-               $secretKey = substr(generateHash(GEN_PASS(mt_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);
+       WRITE_FILE($file, $secretKey);
 
+       // Is the file there?
+       if (FILE_READABLE($file)) {
                //* 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",
+               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");
+               // Generate FQFN for .htaccess file
+               $FQFN = sprintf("%sinc/.secret/.htaccess",
+                       constant('PATH')
+               );
 
-                       // Close the file
-                       fclose($fp);
+               // 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