Rewrites for installation of sql_patches

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index f4251010df6d9bfe929759eb0c09f4d4acff4dc2..c6d3a5373b3908b798a579dd547fab13696b13b9 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -41,12 +41,12 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
 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
-       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_config SET pass_scramble='%s' WHERE config=0 LIMIT 1",
+       $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
@@ -55,13 +55,13 @@ if (empty($_CONFIG['pass_scramble'])) {
 } // 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(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",
+       $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
@@ -69,9 +69,9 @@ if (empty($_CONFIG['master_salt'])) {
        unset($masterSalt);
 } // END - if
 
-if (empty($_CONFIG['file_hash'])) {
+if (getConfig('file_hash') == "") {
        // Create filename from hashed random string
-       $file_hash = generateHash(sha1(GEN_PASS(mt_rand(128, 256))));
+       $file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
        $file = PATH."inc/.secret/.".$file_hash;
 
        // File hash was never created
@@ -81,7 +81,7 @@ if (empty($_CONFIG['file_hash'])) {
                // 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);
+               $secretKey = substr(sha1(GEN_PASS(mt_rand(128, 256))), -$nums);
                // 3. Write the key to the file
                fwrite($fp, $secretKey);
                // 4. Close file
@@ -96,17 +96,20 @@ if (empty($_CONFIG['file_hash'])) {
                //* 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",
+               $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);
+               // Is the .htaccess file there?
+               if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+                       // 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);
+                       } // END - if
                } // END - if
 
                // Also update configuration