Cache class rewritten to better convention

[mailer.git] / inc / modules / admin / what-config_cache.php

diff --git a/inc/modules/admin/what-config_cache.php b/inc/modules/admin/what-config_cache.php
index 6f0a5f4a0659a358093654f35514b2799367884b..eade1757395995467d21fdc90994fcb3b72d53f2 100644 (file)
--- a/inc/modules/admin/what-config_cache.php
+++ b/inc/modules/admin/what-config_cache.php
@@ -38,96 +38,158 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
        // Cache path has been not changed by default so don't test it again
        $_POST['cache_tested'] = "N";
 
        // Check if path has been changed
-       if ($_POST['cache_path'] != $_CONFIG['cache_path'])
-       {
+       if ($_POST['cache_path'] != $_CONFIG['cache_path']) {
                // Okay, cache path has been altered so we have to test it again!
                $_POST['cache_tested'] = "Y";
        }
 
        // Delete deactivated cache files
-       if (($_POST['cache_admins'] == "N") && ($cacheInstance->cache_file("admins", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_admins'] == "N") && ($cacheInstance->loadCacheFile("admins"))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_acls'] == "N") && ($cacheInstance->cache_file("acls", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_acls'] == "N") && ($cacheInstance->loadCacheFile("acls"))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_exts'] == "N") && ($cacheInstance->cache_file("extensions", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_exts'] == "N") && ($cacheInstance->loadCacheFile("extensions", true))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_config'] == "N") && ($cacheInstance->cache_file("config", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_config'] == "N") && ($cacheInstance->loadCacheFile("config"))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_modreg'] == "N") && ($cacheInstance->cache_file("modreg", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_modreg'] == "N") && ($cacheInstance->loadCacheFile("modreg"))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_refdepth'] == "N") && ($cacheInstance->cache_file("refdepth", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_refdepth'] == "N") && ($cacheInstance->loadCacheFile("refdepth"))) {
+               $cacheInstance->destroyCacheFile();
        }
-       if (($_POST['cache_refsys'] == "N") && ($cacheInstance->cache_file("refsys", true)))
-       {
-               $cacheInstance->cache_destroy();
+       if (($_POST['cache_refsys'] == "N") && ($cacheInstance->loadCacheFile("refsys"))) {
+               $cacheInstance->destroyCacheFile();
        }
 
        // Save configuration
        ADMIN_SAVE_SETTINGS($_POST);
-}
- else
-{
+} else {
        // Prepare data
        switch ($_CONFIG['cache_admins']) {
-               case 'Y': define('__ADMINS_Y', " checked"); define('__ADMINS_N', "");         break;
-               case 'N': define('__ADMINS_Y', "");         define('__ADMINS_N', " checked"); break;
+               case 'Y':
+                       define('__ADMINS_Y', " checked=\"checked\"");
+                       define('__ADMINS_N', "");
+                       break;
+
+               case 'N':
+                       define('__ADMINS_Y', "");
+                       define('__ADMINS_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_acls']) {
-               case 'Y': define('__ACLS_Y', " checked"); define('__ACLS_N', "");         break;
-               case 'N': define('__ACLS_Y', "");         define('__ACLS_N', " checked"); break;
+               case 'Y':
+                       define('__ACLS_Y', " checked=\"checked\"");
+                       define('__ACLS_N', "");
+                       break;
+
+               case 'N':
+                       define('__ACLS_Y', "");
+                       define('__ACLS_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_exts']) {
-               case 'Y': define('__EXTS_Y', " checked"); define('__EXTS_N', "");         break;
-               case 'N': define('__EXTS_Y', "");         define('__EXTS_N', " checked"); break;
+               case 'Y':
+                       define('__EXTS_Y', " checked=\"checked\"");
+                       define('__EXTS_N', "");
+                       break;
+
+               case 'N':
+                       define('__EXTS_Y', "");
+                       define('__EXTS_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_config']) {
-               case 'Y': define('__CONFIG_Y', " checked"); define('__CONFIG_N', "");         break;
-               case 'N': define('__CONFIG_Y', "");         define('__CONFIG_N', " checked"); break;
+               case 'Y':
+                       define('__CONFIG_Y', " checked=\"checked\"");
+                       define('__CONFIG_N', "");
+                       break;
+
+               case 'N':
+                       define('__CONFIG_Y', "");
+                       define('__CONFIG_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_modreg']) {
-               case 'Y': define('__MODREG_Y', " checked"); define('__MODREG_N', "");         break;
-               case 'N': define('__MODREG_Y', "");         define('__MODREG_N', " checked"); break;
+               case 'Y':
+                       define('__MODREG_Y', " checked=\"checked\"");
+                       define('__MODREG_N', "");
+                       break;
+
+               case 'N':
+                       define('__MODREG_Y', "");
+                       define('__MODREG_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_refdepth']) {
-               case 'Y': define('__REFDEPTH_Y', " checked"); define('__REFDEPTH_N', "");         break;
-               case 'N': define('__REFDEPTH_Y', "");         define('__REFDEPTH_N', " checked"); break;
+               case 'Y':
+                       define('__REFDEPTH_Y', " checked=\"checked\"");
+                       define('__REFDEPTH_N', "");
+                       break;
+
+               case 'N':
+                       define('__REFDEPTH_Y', "");
+                       define('__REFDEPTH_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_refsys']) {
-               case 'Y': define('__REFSYS_Y', " checked"); define('__REFSYS_N', "");         break;
-               case 'N': define('__REFSYS_Y', "");         define('__REFSYS_N', " checked"); break;
+               case 'Y':
+                       define('__REFSYS_Y', " checked=\"checked\"");
+                       define('__REFSYS_N', "");
+                       break;
+
+               case 'N':
+                       define('__REFSYS_Y', "");
+                       define('__REFSYS_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_themes']) {
-               case 'Y': define('__THEMES_Y', " checked"); define('__THEMES_N', "");         break;
-               case 'N': define('__THEMES_Y', "");         define('__THEMES_N', " checked"); break;
+               case 'Y':
+                       define('__THEMES_Y', " checked=\"checked\"");
+                       define('__THEMES_N', "");
+                       break;
+
+               case 'N':
+                       define('__THEMES_Y', "");
+                       define('__THEMES_N', " checked=\"checked\"");
+                       break;
        }
+
        switch ($_CONFIG['cache_admin_menu']) {
-               case 'Y': define('__ADMIN_MENU_Y', " checked"); define('__ADMIN_MENU_N', "");         break;
-               case 'N': define('__ADMIN_MENU_Y', "");         define('__ADMIN_MENU_N', " checked"); break;
+               case 'Y':
+                       define('__ADMIN_MENU_Y', " checked=\"checked\"");
+                       define('__ADMIN_MENU_N', "");
+                       break;
+
+               case 'N':
+                       define('__ADMIN_MENU_Y', "");
+                       define('__ADMIN_MENU_N', " checked=\"checked\"");
+                       break;
        }
+
        define('__PATH', $_CONFIG['cache_path']);
 
        // Load template
        LOAD_TEMPLATE("admin_config_cache");
 }
+
 //
 ?>