Extension ext-network cleaned up

[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 30509c2edf6fe755e4810ff9a2a9a7b98f30cb81..7345a4eb6fa846d07abb65c242b0b37458c4c61d 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -44,7 +44,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 addYouAreHereLink('admin', __FILE__);
 
 // Stop saving data if one input field is !isset
-if (isFormSent()) {
+if (isFormSent('save_config')) {
        // Calculate stamps and set calculated stamps
        setPostRequestElement('online_timeout'       , createEpocheTimeFromSelections('online_timeout'       , postRequestArray()));
        setPostRequestElement('url_tlock'            , createEpocheTimeFromSelections('url_tlock'            , postRequestArray()));
@@ -67,7 +67,7 @@ if (isFormSent()) {
        if (!isPostRequestElementSet('reject_url'))            { unsetPostRequestElement('ok'); }
 } // END - if
 
-if (isFormSent()) {
+if (isFormSent('save_config')) {
        // Update stamps directly
        adminSaveSettingsFromPostData();
 } else {
@@ -83,17 +83,15 @@ if (isFormSent()) {
                $content[$entry] = '';
        } // END - foreach
 
-       // Set selections
-       foreach (array('css_php','mailid_error_redirect') as $entry) {
-               $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
-       } // END - foreach
-
        for ($i = '0'; $i <= 5; $i++) {
                $content['comma_def_' . $i] = '';
        } // END - for
 
+       // Set selections
+       $content = merge_array($content, getCheckedConfig(array('css_php','mailid_error_redirect')));
+
        // Set selection
-       $content['comma_def_' . getConfig('max_comma')] = ' selected="selected"';
+       $content = merge_array($content, getSelectedConfig(array('comma_def_' . getConfig('max_comma'))));
 
        // Load template
        loadTemplate('admin_config_other', FALSE, $content);