- remove triplle extension (.tpl.cache.php)

[mailer.git] / inc / gen_sql_patches.php

diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 12e3a617edcc50fc54b166f985658eed557506e0..1e3f278d58127d0c9418dd1fe310293b86a2bd0d 100644 (file)
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * 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 *
@@ -65,13 +65,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 +85,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,11 +96,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]