X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=1e3f278d58127d0c9418dd1fe310293b86a2bd0d;hp=57ec554ca29ef3b8ad3f40a7fe747987d406e7c4;hb=ab5ff5126ef56b08f5130a9e110b53c00d0a2761;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 57ec554ca2..1e3f278d58 100644
--- 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                              *
@@ -14,11 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2013 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 *
@@ -39,13 +38,10 @@
 // Some security stuff...
 if (!defined('__SECURITY')) {
 	die();
-}
-
-// Check for version of sql_patches
-if (getExtensionVersion('sql_patches') < '0.3.6') return false;
+} // END - if
 
 // Check if there is no scrambling string
-if (getConfig('pass_scramble') == '') {
+if (getPassScramble() == '') {
 	// Generate 40 chars long scramble string
 	$scrambleString = genScrambleString(40);
 
@@ -57,7 +53,7 @@ if (getConfig('pass_scramble') == '') {
 } // END - if
 
 // Check if there is no master salt string
-if (getConfig('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(sha1(generatePassword(mt_rand(128, 256))));
@@ -69,52 +65,44 @@ if (getConfig('master_salt') == '') {
 	unset($masterSalt);
 } // END - if
 
-if (getConfig('file_hash') == '') {
+if ((getFileHash() == '') || (!isFileReadable(getGenericHashFileName()))) {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
-	$FQFN = sprintf("%sinc/.secret/.%s",
-		getConfig('PATH'),
-		$fileHash
+	$FQFN = sprintf('%s%s.%s%s',
+		getPath(),
+		getCachePath(),
+		$fileHash,
+		getCacheExtension()
 	);
 
-	// 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(generatePassword(mt_rand(128, 256))), -$nums);
+	$secretKey = sha1(generateHash(mt_rand(128, 256)));
 
 	// File hash was never created
 	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
 		setConfigEntry('secret_key', $secretKey);
 
+		// Force update
+		updateConfiguration('file_hash', $fileHash, '', '0', TRUE);
+
 		// Remove variables
 		unset($secretKey);
 		unset($fileHash);
 	} // END - if
 } // END - if
 
-//
-?>
\ No newline at end of file
+// @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]
+?>