Extension ext-network cleaned up

[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 43f7f8fb3b23c9e77879ee3968e986d34a28f910..89510af4e7c89c3e373ff158f4e724a55ab8a0a1 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -16,8 +16,8 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -37,13 +37,13 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
-       die();
+       exit();
 } // END - if
 
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (isFormSent()) {
+if (isFormSent('save_config')) {
        // Save data
        adminSaveSettingsFromPostData();
 } else {
@@ -53,20 +53,13 @@ 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);
+       loadTemplate('admin_config_order', FALSE, $content);
 }
 
 // [EOF]