Updated copyright year.

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 467e4b4ecb735cc4cfe693174516a5cd2fb8b8bf..acfbd8084b0462b1fcc5ab34594ce52362a13b32 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -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                              *
@@ -10,10 +10,9 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
- *                                                                      *
- * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009 - 2016 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -33,78 +32,72 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
-
-// Check for version of sql_patches
-if (EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) return false;
+       die();
+} // END - if
 
 // Check if there is no scrambling string
-if (empty($_CONFIG['pass_scramble'])) {
+if (getPassScramble() == '') {
        // 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 (getMasterSalt() == '') {
        // 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 ((getFileHash() == '') || (!isFileReadable(getGenericHashFileName()))) {
        // Create filename from hashed random string
-       $file_hash = generateHash(GEN_PASS(rand(128, 256)));
-       $file = sprintf("%sinc/.secret/.%s", PATH, $file_hash);
-
-       // 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);
+       $fileHash = sha1(generatePassword(mt_rand(128, 256)));
+       $FQFN = sprintf('%s%s.%s%s',
+               getPath(),
+               getCachePath(),
+               $fileHash,
+               getCacheExtension()
+       );
 
-               // Change access rights for more security
-               @chmod($file, 0644);
+       // Generate secret key from a randomized string
+       $secretKey = sha1(generateHash(mt_rand(128, 256)));
 
-               //* 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);
+       // File hash was never created
+       writeToFile($FQFN, $secretKey);
 
+       // Is the file there?
+       if (isFileReadable($FQFN)) {
                // Also update configuration
-               $_CONFIG['secret_key'] = $secretKey;
-               $_CONFIG['file_hash']  = $file_hash;
+               setConfigEntry('secret_key', $secretKey);
 
-               // And remove some variables
-               unset($secretKey);
-               unset($file_hash);
-       }
-}
+               // Force update
+               updateConfiguration('file_hash', $fileHash, '', '0', TRUE);
 
-//
+               // Remove variables
+               unset($secretKey);
+               unset($fileHash);
+       } // END - if
+} // END - if
+
+// @TODO Rewrite this to a filter
+if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance())) {
+       // Destroy some cache files
+       foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
+               // Use rebuildCache()
+               rebuildCache($cache);
+       } // END - foreach
+} // END - if
+
+// [EOF]
 ?>