Rewrites/fixes for handling config entries in SQLs
[mailer.git] / inc / gen_sql_patches.php
index 2abce58..d853f1c 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/08/2005 *
- * ===============                              Last change: 01/01/2006 *
+ * Mailer v0.2.1-FINAL                                Start: 10/08/2005 *
+ * ===================                          Last change: 01/01/2006 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : gen_sql_patches.php                              *
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
-       $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;
+if (!defined('__SECURITY')) {
+       die();
+} // END - if
 
 // 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);
+       updateConfiguration('pass_scramble', $scrambleString);
 
-       // Also remember it in config
-       $_CONFIG['pass_scramble'] = $scrambleString;
+       // Remove dummy string
        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(sha1(generatePassword(mt_rand(128, 256))));
 
        // ... and store it there for future usage
-       UPDATE_CONFIG("master_salt", $masterSalt);
+       updateConfiguration('master_salt', $masterSalt);
 
-       // Also remember it in config
-       $_CONFIG['master_salt'] = $masterSalt;
+       // Remove dummy string
        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(generatePassword(mt_rand(128, 256)));
+       $FQFN = sprintf("%sinc/.secret/.%s",
+               getConfig('PATH'),
+               $fileHash
+       );
+
+       // Generate secret key from a randomized string
+       $secretKey = sha1(generateHash(mt_rand(128, 256)));
 
        // 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."<br>Cookie: ".get_session('u_hash')."<br>Test: ".$test);
-
-               // Write $file_hash to database
-               UPDATE_CONFIG("file_hash", $file_hash);
+       writeToFile($FQFN, $secretKey);
+
+       // Is the file there?
+       if (isFileReadable($FQFN)) {
+               //* DEBUG: */ removeFile($FQFN);
+               //* DEBUG: */ $test = hexdec(getSession('u_hash')) / hexdec($secretKey);
+               //* DEBUG: */ $test = generateHash(str_replace('.', '', $test));
+               //* DEBUG: */ die("Secret-Key: ".$secretKey."<br />Cookie: ".getSession('u_hash')."<br />Test: ".$test);
+
+               // Write $fileHash to database
+               updateConfiguration('file_hash', $fileHash);
+
+               // Generate FQFN for .htaccess file
+               $FQFN = sprintf("%sinc/.secret/.htaccess",
+                       getConfig('PATH')
+               );
+
+               // Is the .htaccess file there?
+               if (!isFileReadable($FQFN)) {
+                       // Also create .htaccess file
+                       writeToFile($FQFN, "Deny from all\n");
+               } // END - if
 
                // Also update configuration
-               $_CONFIG['secret_key'] = $secretKey;
-               $_CONFIG['file_hash']  = $file_hash;
+               setConfigEntry('secret_key', $secretKey);
 
-               // And remove some variables
+               // Remove variables
                unset($secretKey);
-               unset($file_hash);
-       }
-}
+               unset($fileHash);
+       } // END - if
+} // END - if
 
-//
+// [EOF]
 ?>