Fixed logfile writing in installation phase, .revision is now ignored

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 732d4345b1637a2eedcb262ec42681a734495c9d..60353c90b5d498f9eff2e652ff5a85027dacca4d 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *

- *                                                                      *
+ * $Revision:: 856                                                    $ *
+ * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009)              $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author:: stelzi                                                   $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *

  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *


@@ -46,11 +51,11 @@ if (getConfig('pass_scramble') == "") {
        $scrambleString = genScrambleString(40);
 
        // ... and store it there for future usage
        $scrambleString = genScrambleString(40);
 
        // ... and store it there for future usage

-       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
                array($scrambleString), __FILE__, __LINE__);
 
        // Also remember it in config

-       $_CONFIG['pass_scramble'] = $scrambleString;
+       setConfigEntry('pass_scramble', $scrambleString);

        unset($scrambleString);
 } // END - if
 
        unset($scrambleString);
 } // END - if
 


@@ -61,60 +66,60 @@ if (getConfig('master_salt') == "") {
        $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
        // ... and store it there for future usage
        $masterSalt = scrambleString(substr(sha1(GEN_PASS(mt_rand(128, 256))), 0, -40));
 
        // ... and store it there for future usage

-       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
                array($masterSalt), __FILE__, __LINE__);
 
        // Also remember it in config

-       $_CONFIG['master_salt'] = $masterSalt;
+       setConfigEntry('master_salt', $masterSalt);

        unset($masterSalt);
 } // END - if
 
 if (getConfig('file_hash') == "") {
        // Create filename from hashed random string
        unset($masterSalt);
 } // END - if
 
 if (getConfig('file_hash') == "") {
        // Create filename from hashed random string

-       $file_hash = sha1(GEN_PASS(mt_rand(128, 256)));
-       $file = PATH."inc/.secret/.".$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
 
        // 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(sha1(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);
-
-               //* 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: */ $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 $fileHash to database
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
+                       array($fileHash), __FILE__, __LINE__);

 
 

-               // Write $file_hash to database
-               SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_config` SET file_hash='%s' WHERE config=0 LIMIT 1",
-                       array($file_hash), __FILE__, __LINE__);
+               // Generate FQFN for .htaccess file
+               $FQFN = sprintf("%sinc/.secret/.htaccess",
+                       constant('PATH')
+               );

 
                // Is the .htaccess file there?
 
                // Is the .htaccess file there?

-               if (!FILE_READABLE(PATH."inc/.secret/.htaccess")) {
+               if (!FILE_READABLE($FQFN)) {

                        // Also create .htaccess file
                        // 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
+                       WRITE_FILE($FQFN, "Deny from all\n");

                } // END - if
 
                // Also update configuration
                } // END - if
 
                // Also update configuration

-               $_CONFIG['secret_key'] = $secretKey; unset($secretKey);
-               $_CONFIG['file_hash']  = $file_hash; unset($file_hash);
+               setConfigEntry('secret_key', $secretKey);
+               setConfigEntry('file_hash' , $fileHash);
+
+               // Remove variables
+               unset($secretKey);
+               unset($fileHash);

        } // END - if
 } // END - if
 
        } // END - if
 } // END - if