Fixed also usage of previously renamed fields as they must be the same

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

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index b98e1db125592e2f302f646a4daa9defa7132382..89510af4e7c89c3e373ff158f4e724a55ab8a0a1 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -43,7 +43,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (isFormSent()) {
+if (isFormSent('save_config')) {
        // Save data
        adminSaveSettingsFromPostData();
 } else {
@@ -53,17 +53,10 @@ if (isFormSent()) {
        } // END - foreach
 
        // Set all default checks
-       foreach (array('order_max_full', 'order_mode') as $entry) {
-               $content[$entry . '_' . strtolower(getConfig($entry))] = ' checked="checked"';
-       } // END - foreach
+       $content = merge_array($content, getCheckedConfig(array('order_max_full', 'order_mode')));
 
        // Set all default selections
-       foreach (array('repay_deleted_mails') as $entry) {
-               $content[$entry . '_' . strtolower(getConfig($entry))] = ' selected="selected"';
-       } // END - foreach
-
-       // Selection list
-       $content['order_selection'] = addOrderSelectionOptions(getConfig('order_select'));
+       $content = merge_array($content, getSelectedConfig(array('repay_deleted_mails')));
 
        // Load template
        loadTemplate('admin_config_order', FALSE, $content);