Caching of filters added (should work now)

[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 53c70e73829777a8595142cdc0fb3882a57b47a4..28b2d7e7866c3e1bfafe70b2fe05a7ce93e48faa 100644 (file)
--- a/inc/modules/admin/what-config_cache.php
+++ b/inc/modules/admin/what-config_cache.php
@@ -40,165 +40,182 @@
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
-}
+} // END - if
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Cache path has been not changed by default so don't test it again
-       REQUEST_SET_POST('cache_tested', "N");
+       REQUEST_SET_POST('cache_tested', 'N');
 
        // Check if path has been changed
        if (REQUEST_POST('cache_path') != getConfig('cache_path')) {
                // Okay, cache path has been altered so we have to test it again!
-               REQUEST_SET_POST('cache_tested', "Y");
-       }
+               REQUEST_SET_POST('cache_tested', 'Y');
+       } // END - if
 
        if ((REQUEST_POST('cache_admins') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('admins'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
+
+       if ((REQUEST_POST('cache_acls') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('acls'))) {
+               $GLOBALS['cache_instance']->destroyCacheFile();
+       } // END - if
 
-       if ((REQUEST_POST('cache_acls') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("acls"))) {
+       if ((REQUEST_POST('cache_exts') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('extensions', true))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
-       if ((REQUEST_POST('cache_exts') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("extensions", true))) {
+       if ((REQUEST_POST('cache_config') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('config'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
-       if ((REQUEST_POST('cache_config') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("config"))) {
+       if ((REQUEST_POST('cache_modreg') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('modreg'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
-       if ((REQUEST_POST('cache_modreg') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("modreg"))) {
+       if ((REQUEST_POST('cache_refdepth') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('refdepth'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
-       if ((REQUEST_POST('cache_refdepth') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("refdepth"))) {
+       if ((REQUEST_POST('cache_refsys') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('refsys'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
-       if ((REQUEST_POST('cache_refsys') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile("refsys"))) {
+       if ((REQUEST_POST('cache_filter') == 'N') && ($GLOBALS['cache_instance']->loadCacheFile('filter'))) {
                $GLOBALS['cache_instance']->destroyCacheFile();
-       }
+       } // END - if
 
        // Save configuration
        ADMIN_SAVE_SETTINGS_POST();
 } else {
        // Prepare data
+       // @TODO Rewrite all constants
        switch (getConfig('cache_admins')) {
                case 'Y':
-                       define('__ADMINS_Y', ' chkecked="checked"');
+                       define('__ADMINS_Y', ' checked="checked"');
                        define('__ADMINS_N', '');
                        break;
 
                case 'N':
                        define('__ADMINS_Y', '');
-                       define('__ADMINS_N', ' chkecked="checked"');
+                       define('__ADMINS_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_acls')) {
                case 'Y':
-                       define('__ACLS_Y', ' chkecked="checked"');
+                       define('__ACLS_Y', ' checked="checked"');
                        define('__ACLS_N', '');
                        break;
 
                case 'N':
                        define('__ACLS_Y', '');
-                       define('__ACLS_N', ' chkecked="checked"');
+                       define('__ACLS_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_exts')) {
                case 'Y':
-                       define('__EXTS_Y', ' chkecked="checked"');
+                       define('__EXTS_Y', ' checked="checked"');
                        define('__EXTS_N', '');
                        break;
 
                case 'N':
                        define('__EXTS_Y', '');
-                       define('__EXTS_N', ' chkecked="checked"');
+                       define('__EXTS_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_config')) {
                case 'Y':
-                       define('__CONFIG_Y', ' chkecked="checked"');
+                       define('__CONFIG_Y', ' checked="checked"');
                        define('__CONFIG_N', '');
                        break;
 
                case 'N':
                        define('__CONFIG_Y', '');
-                       define('__CONFIG_N', ' chkecked="checked"');
+                       define('__CONFIG_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_modreg')) {
                case 'Y':
-                       define('__MODREG_Y', ' chkecked="checked"');
+                       define('__MODREG_Y', ' checked="checked"');
                        define('__MODREG_N', '');
                        break;
 
                case 'N':
                        define('__MODREG_Y', '');
-                       define('__MODREG_N', ' chkecked="checked"');
+                       define('__MODREG_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_refdepth')) {
                case 'Y':
-                       define('__REFDEPTH_Y', ' chkecked="checked"');
+                       define('__REFDEPTH_Y', ' checked="checked"');
                        define('__REFDEPTH_N', '');
                        break;
 
                case 'N':
                        define('__REFDEPTH_Y', '');
-                       define('__REFDEPTH_N', ' chkecked="checked"');
+                       define('__REFDEPTH_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_refsys')) {
                case 'Y':
-                       define('__REFSYS_Y', ' chkecked="checked"');
+                       define('__REFSYS_Y', ' checked="checked"');
                        define('__REFSYS_N', '');
                        break;
 
                case 'N':
                        define('__REFSYS_Y', '');
-                       define('__REFSYS_N', ' chkecked="checked"');
+                       define('__REFSYS_N', ' checked="checked"');
+                       break;
+       } // END - switch
+
+       switch (getConfig('cache_filter')) {
+               case 'Y':
+                       define('__FILTER_Y', ' checked="checked"');
+                       define('__FILTER_N', '');
+                       break;
+
+               case 'N':
+                       define('__FILTER_Y', '');
+                       define('__FILTER_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_themes')) {
                case 'Y':
-                       define('__THEMES_Y', ' chkecked="checked"');
+                       define('__THEMES_Y', ' checked="checked"');
                        define('__THEMES_N', '');
                        break;
 
                case 'N':
                        define('__THEMES_Y', '');
-                       define('__THEMES_N', ' chkecked="checked"');
+                       define('__THEMES_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        switch (getConfig('cache_admin_menu')) {
                case 'Y':
-                       define('__ADMIN_MENU_Y', ' chkecked="checked"');
+                       define('__ADMIN_MENU_Y', ' checked="checked"');
                        define('__ADMIN_MENU_N', '');
                        break;
 
                case 'N':
                        define('__ADMIN_MENU_Y', '');
-                       define('__ADMIN_MENU_N', ' chkecked="checked"');
+                       define('__ADMIN_MENU_N', ' checked="checked"');
                        break;
-       }
+       } // END - switch
 
        define('__PATH', getConfig('cache_path'));
 
        // Load template
-       LOAD_TEMPLATE("admin_config_cache");
+       LOAD_TEMPLATE('admin_config_cache');
 }
 
 //