Several code cleanups:

[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 994886dea6c9834354a2bbd2ff462f72dc3cf20a..61f640ec9ffb438e3c99211701af65aa3a57604b 100644 (file)
--- a/inc/modules/admin/what-config_autopurge.php
+++ b/inc/modules/admin/what-config_autopurge.php
@@ -48,7 +48,7 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Output de-/activation selections
-       $content['ap_inactive_selection']    = addSelectionBox('yn', getConfig('autopurge_inactive')   , 'autopurge_inactive');
+       $content['ap_inactive_selection']    = addSelectionBox('yn', getAutopurgeInactive()   , 'autopurge_inactive');
        $content['ap_unconfirmed_selection'] = addSelectionBox('yn', getConfig('autopurge_unconfirmed'), 'autopurge_unconfirmed');
        $content['ap_tasks_selection']       = addSelectionBox('yn', getConfig('autopurge_tasks')      , 'autopurge_tasks');
        $content['ap_del_mails_selection']   = addSelectionBox('yn', getConfig('ap_del_mails')         , 'ap_del_mails');
@@ -60,14 +60,14 @@ if (isFormSent()) {
        $content['ap_notify_del_mails']   = addSelectionBox('yn', getConfig('ap_dm_notify')   , 'ap_dm_notify');
 
        // Output time selection boxes
-       $content['ap_in_since']       = createTimeSelections(getApInactiveSince()  , 'ap_inactive_since'  , 'MWDh');
-       $content['ap_in_time']        = createTimeSelections(getApInactiveTime()   , 'ap_inactive_time'   , 'MWDh');
-       $content['ap_un_time']        = createTimeSelections(getApUnconfirmedTime(), 'ap_unconfirmed_time', 'MWDh');
-       $content['ap_task_time']      = createTimeSelections(getApTasksTime()      , 'ap_tasks_time'      , 'MWDh');
-       $content['ap_del_mails_time'] = createTimeSelections(getApDmTimeout()      , 'ap_dm_timeout'      , 'MWDh');
+       $content['ap_in_since']       = createConfigurationTimeSelections('ap_inactive_since'  , 'MWDh');
+       $content['ap_in_time']        = createConfigurationTimeSelections('ap_inactive_time'   , 'MWDh');
+       $content['ap_un_time']        = createConfigurationTimeSelections('ap_unconfirmed_time', 'MWDh');
+       $content['ap_task_time']      = createConfigurationTimeSelections('ap_tasks_time'      , 'MWDh');
+       $content['ap_del_mails_time'] = createConfigurationTimeSelections('ap_dm_timeout'      , 'MWDh');
 
        // Mail confirmation links
-       $content['auto_purge'] = createTimeSelections(getAutoPurge(), 'auto_purge', 'MWD');
+       $content['auto_purge'] = createConfigurationTimeSelections('auto_purge', 'MWD');
 
        // Prepare more Y/N selections
        foreach (array('auto_purge_active') as $entry) {