X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=acfbd8084b0462b1fcc5ab34594ce52362a13b32;hb=e19231f39d9d6583cc5753dbd2638c597957fdd1;hp=4853da16b7023890ae3083769503b693e3bd3377;hpb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 4853da16b7..acfbd8084b 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,16 +10,9 @@
  * -------------------------------------------------------------------- *
  * 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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -67,12 +60,14 @@ if (getMasterSalt() == '') {
 	unset($masterSalt);
 } // END - if
 
-if (getFileHash() == '') {
+if ((getFileHash() == '') || (!isFileReadable(getGenericHashFileName()))) {
 	// Create filename from hashed random string
 	$fileHash = sha1(generatePassword(mt_rand(128, 256)));
-	$FQFN = sprintf("%sinc/.secret/.%s",
+	$FQFN = sprintf('%s%s.%s%s',
 		getPath(),
-		$fileHash
+		getCachePath(),
+		$fileHash,
+		getCacheExtension()
 	);
 
 	// Generate secret key from a randomized string
@@ -83,33 +78,26 @@ if (getFileHash() == '') {
 
 	// 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",
-			getPath()
-		);
-
-		// 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
 
+// @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]
 ?>