From: Roland Häder <roland@mxchange.org>
Date: Wed, 3 Oct 2012 18:01:47 +0000 (+0000)
Subject: Rewrote some 'manual' cache rebuilding to use rebuildCache()
X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=commitdiff_plain;h=6c18a7bf8866b5ebdcb219891efaad99989a2cd5

Rewrote some 'manual' cache rebuilding to use rebuildCache()
---

diff --git a/inc/filter/cache_filter.php b/inc/filter/cache_filter.php
index 7ef4dd33aa..ec02333dfb 100644
--- a/inc/filter/cache_filter.php
+++ b/inc/filter/cache_filter.php
@@ -111,9 +111,7 @@ function FILTER_CACHE_DESTROY_FILTER ($filterData) {
 	} // END - if
 
 	// Remove cache files
-	if ($GLOBALS['cache_instance']->loadCacheFile('filter')) {
-		$GLOBALS['cache_instance']->removeCacheFile();
-	} // END - if
+	rebuildCache('filter', 'filter');
 
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Done!');
 	return $filterData;
diff --git a/inc/gen_sql_patches.php b/inc/gen_sql_patches.php
index 2364c35972..783124e1b4 100644
--- a/inc/gen_sql_patches.php
+++ b/inc/gen_sql_patches.php
@@ -95,9 +95,13 @@ if (getFileHash() == '') {
 // @TODO Rewrite this to a filter
 if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isCacheInstanceValid())) {
 	// 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) {
+		// Is the cache file there?
+		if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
+			// Then remove it
+			$GLOBALS['cache_instance']->removeCacheFile();
+		} // END - if
+	} // END - foreach
 } // END - if
 
 // [EOF]
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 2bee0b51c1..4de2f33ea3 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1244,19 +1244,19 @@ function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctio
 		// Delete cache?
 		if ((count($cacheFiles) > 0) && (!empty($cacheFiles[0]))) {
 			// Delete cache file(s)
-			foreach ($cacheFiles as $cacheFile) {
+			foreach ($cacheFiles as $cacheF) {
 				// Skip any empty entries
-				if (empty($cacheFile)) {
+				if (empty($cache)) {
 					// This may cause trouble in loadCacheFile()
 					continue;
 				} // END - if
 
 				// Is the cache file loadable?
-				if ($GLOBALS['cache_instance']->loadCacheFile($cacheFile)) {
+				if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
 					// Then remove it
 					$GLOBALS['cache_instance']->removeCacheFile();
 				} // END - if
-			} // END - if
+			} // END - foreach
 		} // END - if
 
 		// Was this fine?
diff --git a/inc/modules/admin/what-config_mods.php b/inc/modules/admin/what-config_mods.php
index 2d5f2e810d..cd5e40d9ba 100644
--- a/inc/modules/admin/what-config_mods.php
+++ b/inc/modules/admin/what-config_mods.php
@@ -117,9 +117,7 @@ LIMIT 1",
 	runFilterChain('run_sqls');
 
 	// Remove cache file if version matches
-	if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
-		if ($GLOBALS['cache_instance']->loadCacheFile('modules')) $GLOBALS['cache_instance']->removeCacheFile();
-	} // END - if
+	rebuildCache('modules', 'modules');
 
 	// Entries updated
 	displayMessage('{--ADMIN_MODS_CHANGED--}');
diff --git a/inc/modules/admin/what-config_points.php b/inc/modules/admin/what-config_points.php
index 58cebbd1a6..bf65c6b625 100644
--- a/inc/modules/admin/what-config_points.php
+++ b/inc/modules/admin/what-config_points.php
@@ -107,10 +107,7 @@ if (isFormSent()) {
 			} // END - switch
 
 			// Update cache file
-			// @TODO Rewrite this to a filter
-			if (isExtensionInstalledAndNewer('cache', '0.1.2')) {
-				if ($GLOBALS['cache_instance']->loadCacheFile('refdepths')) $GLOBALS['cache_instance']->removeCacheFile();
-			} // END - if
+			rebuildCache('refdepths', 'refdepths');
 			break;
 
 		case 'settings':
diff --git a/inc/modules/admin/what-extensions.php b/inc/modules/admin/what-extensions.php
index b346d479b1..7a2415fdc9 100644
--- a/inc/modules/admin/what-extensions.php
+++ b/inc/modules/admin/what-extensions.php
@@ -362,10 +362,13 @@ ORDER BY
 						// @TODO Rewrite this to a filter
 						if (isExtensionActive('cache')) {
 							// Remove cache file (will be auto-created again!)
-							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('filter'))    $GLOBALS['cache_instance']->removeCacheFile();
-							if ($GLOBALS['cache_instance']->loadCacheFile('modules'))   $GLOBALS['cache_instance']->removeCacheFile();
+							foreach (array('config', 'extension', 'filter', 'modules') as $cache) {
+								// Is the cache file there?
+								if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
+									// Remove cache file
+									$GLOBALS['cache_instance']->removeCacheFile();
+								} // END - if
+							} // END - foreach
 						} // END - if
 
 						// Errors?
diff --git a/inc/modules/admin/what-list_admins_acls.php b/inc/modules/admin/what-list_admins_acls.php
index c1de42d5fa..69c9b1a67c 100644
--- a/inc/modules/admin/what-list_admins_acls.php
+++ b/inc/modules/admin/what-list_admins_acls.php
@@ -98,10 +98,7 @@ LIMIT 1",
 	} // END - foreach
 
 	// Update cache when installed
-	// @TODO Rewrite this to a filter
-	if (isExtensionActive('cache')) {
-		if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-	} // END - if
+	rebuildCache('admin_acls', 'admin_acls');
 
 	// Entries changed
 	displayMessage('{--ADMIN_ADMINS_ENTRIES_CHANGED--}');
@@ -133,9 +130,7 @@ LIMIT 1",
 	} // END - foreach
 
 	// Update cache when installed
-	if (isExtensionActive('cache')) {
-		if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-	} // END - if
+	rebuildCache('admin_acls', 'admin_acls');
 
 	// Entries deleted
 	displayMessage('{--ADMIN_ADMINS_ENTRIES_DELETED--}');
@@ -165,8 +160,17 @@ LIMIT 1",
 				), __FILE__, __LINE__);
 			if (SQL_HASZERONUMS($result)) {
 				// Finally add the new ACL
-				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (`admin_id`,`action_menu`,`what_menu`,`access_mode`)
-VALUES (%s,'%s','%s','%s')",
+				SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_acls` (
+	`admin_id`,
+	`action_menu`,
+	`what_menu`,
+	`access_mode`
+) VALUES (
+	%s,
+	'%s',
+	'%s',
+	'%s'
+)",
 				array(
 					bigintval(postRequestElement('admin_id')),
 					postRequestElement('action_menu'),
@@ -176,9 +180,7 @@ VALUES (%s,'%s','%s','%s')",
 				$content = '{--ADMIN_ADMINS_ACL_SAVED--}';
 
 				// Update cache when installed
-				if (isExtensionActive('cache')) {
-					if ($GLOBALS['cache_instance']->loadCacheFile('admin_acls')) $GLOBALS['cache_instance']->removeCacheFile();
-				} // END - if
+				rebuildCache('admin_acls', 'admin_acls');
 			} else {
 				// ACL does already exist!
 				$content = '{--ADMIN_ADMINS_ACL_ALREADY_ADDED--}';
@@ -199,7 +201,17 @@ VALUES (%s,'%s','%s','%s')",
 	displayMessage($content);
 } else {
 	// List all ACLs
-	$result = SQL_QUERY('SELECT `id`,`admin_id`,`action_menu`,`what_menu`,`access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` ORDER BY `admin_id` ASC,`id` ASC', __FILE__, __LINE__);
+	$result = SQL_QUERY('SELECT
+	`id`,
+	`admin_id`,
+	`action_menu`,
+	`what_menu`,
+	`access_mode`
+FROM
+	`{?_MYSQL_PREFIX?}_admins_acls`
+ORDER BY
+	`admin_id` ASC,
+	`id` ASC', __FILE__, __LINE__);
 
 	// Entries found?
 	if (!SQL_HASZERONUMS($result)) {