Ticket resolved, code rewrites and caching:

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

diff --git a/inc/modules/admin/what-config_autopurge.php b/inc/modules/admin/what-config_autopurge.php
index bc870efe0da8b258d0ad196a081a642430427b4b..cea9d4cb8155c152ae31537b64b565c5f03301f5 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -32,51 +32,45 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
        // Data was submitted so we store it
-       ADMIN_SAVE_SETTINGS($_POST, "_config", "config='0'");
-}
- else
-{
+       ADMIN_SAVE_SETTINGS($_POST);
+} else {
        // Output de-/activation selections
-       define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", $CONFIG['ap_inactive']   , "autopurge_inactive"));
-       define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", $CONFIG['ap_unconfirmed'], "autopurge_unconfirmed"));
-       define('__AP_TASKS_SELECTION'      , ADD_SELECTION("yn", $CONFIG['ap_tasks']      , "autopurge_tasks"));
-       define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION("yn", $CONFIG['ap_del_mails']  , "ap_del_mails"));
+       define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", getConfig('autopurge_inactive')   , "autopurge_inactive"));
+       define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", getConfig('autopurge_unconfirmed'), "autopurge_unconfirmed"));
+       define('__AP_TASKS_SELECTION'      , ADD_SELECTION("yn", getConfig('ap_tasks')             , "autopurge_tasks"));
+       define('__AP_DEL_MAILS_SELECTION'  , ADD_SELECTION("yn", getConfig('ap_del_mails')         , "ap_del_mails"));
 
        // Output notification selections
-       define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION("yn", $CONFIG['ap_in_mail']    , "ap_in_notify"));
-       define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION("yn", $CONFIG['ap_un_mail']    , "ap_un_notify"));
-       define('__AP_NOTIFY_TASKS'         , ADD_SELECTION("yn", $CONFIG['ap_tasks_mail'] , "ap_tasks_notify"));
-       define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION("yn", $CONFIG['ap_dm_notify']  , "ap_dm_notify"));
+       define('__AP_NOTIFY_INACTIVE'      , ADD_SELECTION("yn", getConfig('ap_in_notify')   , "ap_in_notify"));
+       define('__AP_NOTIFY_UNCONFIRMED'   , ADD_SELECTION("yn", getConfig('ap_un_notify')   , "ap_un_notify"));
+       define('__AP_NOTIFY_TASKS'         , ADD_SELECTION("yn", getConfig('ap_tasks_notify'), "ap_tasks_notify"));
+       define('__AP_NOTIFY_DEL_MAILS'     , ADD_SELECTION("yn", getConfig('ap_dm_notify')   , "ap_dm_notify"));
 
        // Output time selection boxes
-       define('__AP_IN_SINCE'      , CREATE_TIME_SELECTIONS($CONFIG['ap_in_since']  , "ap_inactive_since"  , "MWDh"));
-       define('__AP_IN_TIME'       , CREATE_TIME_SELECTIONS($CONFIG['ap_in_time']   , "ap_inactive_time"   , "MWDh"));
-       define('__AP_UN_TIME'       , CREATE_TIME_SELECTIONS($CONFIG['ap_un_time']   , "ap_unconfirmed_time", "MWDh"));
-       define('__AP_TASK_TIME'     , CREATE_TIME_SELECTIONS($CONFIG['ap_tasks_time'], "ap_tasks_time"      , "MWDh"));
-       define('__AP_DEL_MAILS_TIME', CREATE_TIME_SELECTIONS($CONFIG['ap_dm_timeout'], "ap_dm_timeout"      , "MWDh"));
+       define('__AP_IN_SINCE'      , CREATE_TIME_SELECTIONS(getConfig('ap_inactive_since'), "ap_inactive_since"  , "MWDh"));
+       define('__AP_IN_TIME'       , CREATE_TIME_SELECTIONS(getConfig('ap_in_time')       , "ap_inactive_time"   , "MWDh"));
+       define('__AP_UN_TIME'       , CREATE_TIME_SELECTIONS(getConfig('ap_un_time')       , "ap_unconfirmed_time", "MWDh"));
+       define('__AP_TASK_TIME'     , CREATE_TIME_SELECTIONS(getConfig('ap_tasks_time')    , "ap_tasks_time"      , "MWDh"));
+       define('__AP_DEL_MAILS_TIME', CREATE_TIME_SELECTIONS(getConfig('ap_dm_timeout')    , "ap_dm_timeout"      , "MWDh"));
 
        // Mail confirmation links
-       define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS($CONFIG['auto_purge'], "auto_purge", "MWD"));
-       if ($CONFIG['auto_purge_active'] == "N")
-       {
-               define('_CFG_AP_ACTIVE_N', " checked");
+       define('_CFG_AUTO_PURGE', CREATE_TIME_SELECTIONS(getConfig('auto_purge'), "auto_purge", "MWD"));
+       if (getConfig('auto_purge_active') != "Y") {
+               define('_CFG_AP_ACTIVE_N', " checked=\"checked\"");
                define('_CFG_AP_ACTIVE_Y', "");
-       }
-        else
-       {
+       } else {
                define('_CFG_AP_ACTIVE_N', "");
-               define('_CFG_AP_ACTIVE_Y', " checked");
+               define('_CFG_AP_ACTIVE_Y', " checked=\"checked\"");
        }
 
        // Output template