Fixes for compilation, more EL code:

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

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index 84c277f5e73107fa20a51f088346fd22424739bc..c1a24294b8542358f421f6605eaa90a5fe16a82f 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -43,16 +43,10 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (!isExtensionActive('other')) {
-       // Missing extension!
-       displayMessage(generateExtensionInactiveNotInstalledMessage('other'));
-       return;
-} // END - if
-
 // Stop saving data if one input field is !isset
 if (isFormSent()) {
        // Calculate stamps and set calculated stamps
-       setPostRequestParameter('online_timeout'       , createEpocheTimeFromSelections('ip_timeout'           , postRequestArray()));
+       setPostRequestParameter('online_timeout'       , createEpocheTimeFromSelections('online_timeout'       , postRequestArray()));
        setPostRequestParameter('url_tlock'            , createEpocheTimeFromSelections('url_tlock'            , postRequestArray()));
        setPostRequestParameter('profile_lock'         , createEpocheTimeFromSelections('profile_lock'         , postRequestArray()));
        setPostRequestParameter('profile_update'       , createEpocheTimeFromSelections('profile_update'       , postRequestArray()));
@@ -78,11 +72,11 @@ if (isFormSent()) {
        adminSaveSettingsFromPostData();
 } else {
        // Time selection boxes
-       $content['online_timeout']   = createTimeSelections(getOnlineTimeout()      , 'ip_timeout'           , 'ms');
-       $content['url_tlock']        = createTimeSelections(getUrlTlock()           , 'url_tlock'            , 'WDh');
-       $content['profile_lock']     = createTimeSelections(getProfileLock()        , 'profile_lock'         , 'WDh');
-       $content['profile_update']   = createTimeSelections(getProfileUpdate()      , 'profile_update'       , 'YM');
-       $content['profile_reupdate'] = createTimeSelections(getResendProfileUpdate(), 'resend_profile_update', 'MWD');
+       $content['online_timeout']   = createConfigurationTimeSelections('online_timeout'       , 'ms');
+       $content['url_tlock']        = createConfigurationTimeSelections('url_tlock'            , 'WDh');
+       $content['profile_lock']     = createConfigurationTimeSelections('profile_lock'         , 'WDh');
+       $content['profile_update']   = createConfigurationTimeSelections('profile_update'       , 'YM');
+       $content['profile_reupdate'] = createConfigurationTimeSelections('resend_profile_update', 'MWD');
 
        // Prepare more Y/N selections
        foreach (array('show_points_unconfirmed','show_timings','youre_here','member_menu','guest_menu','order_multi_page','autosend_active','send_prof_update','admin_notify','display_debug_sqls','stats_enabled') as $entry) {