X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=acfbd8084b0462b1fcc5ab34594ce52362a13b32;hp=3d2a48dfe5da78d94ac1e8c234abd54ab7b73739;hb=61621983cc6d7195fcc7eab29b5f6080ff283b34;hpb=5c8a9ba30d1aaa13a6f18c51548a4d3f2c25326e

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 3d2a48dfe5..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/cache/.%s.cache",
+	$FQFN = sprintf('%s%s.%s%s',
 		getPath(),
-		$fileHash
+		getCachePath(),
+		$fileHash,
+		getCacheExtension()
 	);
 
 	// Generate secret key from a randomized string
@@ -85,7 +80,9 @@ if (getFileHash() == '') {
 	if (isFileReadable($FQFN)) {
 		// Also update configuration
 		setConfigEntry('secret_key', $secretKey);
-		updateConfiguration('file_hash', $fileHash);
+
+		// Force update
+		updateConfiguration('file_hash', $fileHash, '', '0', TRUE);
 
 		// Remove variables
 		unset($secretKey);
@@ -94,11 +91,12 @@ if (getFileHash() == '') {
 } // END - if
 
 // @TODO Rewrite this to a filter
-if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isCacheInstanceValid())) {
+if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isValidCacheInstance())) {
 	// Destroy some cache files
-	if ($GLOBALS['cache_instance']->loadCacheFile('config'))    $GLOBALS['cache_instance']->removeCacheFile();
-	if ($GLOBALS['cache_instance']->loadCacheFile('extension')) $GLOBALS['cache_instance']->removeCacheFile();
-	if ($GLOBALS['cache_instance']->loadCacheFile('modules'))   $GLOBALS['cache_instance']->removeCacheFile();
+	foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
+		// Use rebuildCache()
+		rebuildCache($cache);
+	} // END - foreach
 } // END - if
 
 // [EOF]