X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fgen_sql_patches.php;h=acfbd8084b0462b1fcc5ab34594ce52362a13b32;hb=refs%2Fheads%2Fserver-0.2.1-FINAL%2Fshipsimu-org;hp=14158396a60b7650dde95a505a14ebac8064cf4a;hpb=7858ec10092071d595c3814264c537cd16695875;p=mailer.git

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 14158396a6..acfbd8084b 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Patcht das Passwort-System nach DB-Update        *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * 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 *
@@ -65,13 +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("%s%s.%s.cache",
+	$FQFN = sprintf('%s%s.%s%s',
 		getPath(),
 		getCachePath(),
-		$fileHash
+		$fileHash,
+		getCacheExtension()
 	);
 
 	// Generate secret key from a randomized string
@@ -84,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);
@@ -93,7 +91,7 @@ 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
 	foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
 		// Use rebuildCache()