Mahor rewrite:

[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 56bf2c494e3301ed9c65dfb504a447b75fd6e45b..b55200c1a2d3daf261b8ff5fe6176679744a4f5a 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -45,27 +45,27 @@ if (isset($_POST['ok'])) {
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Output de-/activation selections
-       define('__AP_INACTIVE_SELECTION'   , ADD_SELECTION("yn", $_CONFIG['autopurge_inactive']   , "autopurge_inactive"));
-       define('__AP_UNCONFIRMED_SELECTION', ADD_SELECTION("yn", $_CONFIG['autopurge_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_inactive_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_AUTO_PURGE', CREATE_TIME_SELECTIONS(getConfig('auto_purge'), "auto_purge", "MWD"));
+       if (getConfig('auto_purge_active') == "N") {
                define('_CFG_AP_ACTIVE_N', " checked=\"checked\"");
                define('_CFG_AP_ACTIVE_Y', "");
        } else {