X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-config_order.php;h=03a1d0dad0f9b464dd605eec922810508d19ce70;hb=3afdce4fe00b4af570122ce7b8158ced44aec7d3;hp=c864f160edfd71fd1c519233d0f93f491431e7a8;hpb=e79e1454e88271e35086963a0422a51cc243e67a;p=mailer.git

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index c864f160ed..03a1d0dad0 100644
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Konfiguration der Mailbuchungsseite              *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,102 +37,101 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR('admin', __FILE__);
 
-if (isset($_POST['ok'])) {
+if (isFormSent()) {
 	// Save data
-	ADMIN_SAVE_SETTINGS($_POST);
+	ADMIN_SAVE_SETTINGS_POST();
 } else {
 	// Prepare constants for the template
-	switch ($_CONFIG['order_max'])
-	{
-	case "ORDER":
-		define('__ORDER_DEFAULT', ' checked');
-		define('__MAX_DEFAULT'  , "");
-		break;
-
-	case "MAX":
-		define('__ORDER_DEFAULT', "");
-		define('__MAX_DEFAULT'  , ' checked');
-		break;
+	switch (getConfig('order_max_full')) {
+		case 'ORDER':
+			define('__ORDER_DEFAULT', ' checked="checked"');
+			define('__MAX_DEFAULT'  , '');
+			break;
+
+		case 'MAX':
+			define('__ORDER_DEFAULT', '');
+			define('__MAX_DEFAULT'  , ' checked="checked"');
+			break;
 	}
 
 	// Minimum mails / order
-	define('__MIN_VALUE', $_CONFIG['order_min']);
+	define('__MIN_VALUE', getConfig('order_min'));
 
 	// Sorting mode (ascending / descending)
-	switch ($_CONFIG['order_mode'])
-	{
-	case "ASC":
-		define('__ASC_DEFAULT' , " selected=\"selected\"");
-		define('__DESC_DEFAULT', "");
-		break;
-
-	case "DESC":
-		define('__ASC_DEFAULT' , "");
-		define('__DESC_DEFAULT', " selected=\"selected\"");
-		break;
+	switch (getConfig('order_mode')) {
+		case "ASC":
+			define('__ASC_DEFAULT' , ' selected="selected"');
+			define('__DESC_DEFAULT', '');
+			break;
+
+		case "DESC":
+			define('__ASC_DEFAULT' , '');
+			define('__DESC_DEFAULT', ' selected="selected"');
+			break;
 	}
 
-	// Transfer other config data into constants for the template (DO NOT set $_CONFIG as global in LOAD_TEMPLATE!!!)
-	define('_CFG_UNCONFIRMED'   , $_CONFIG['unconfirmed']);
-	define('_CFG_MAX_TLENGTH'   , $_CONFIG['max_tlength']);
+	// Transfer other config data into constants for the template
+	define('_CFG_UNCONFIRMED'   , getConfig('unconfirmed'));
+	define('_CFG_MAX_TLENGTH'   , getConfig('max_tlength'));
 
-	if ($_CONFIG['test_text'] == 'N') {
-		define('_CFG_TEST_TEXT_N', ' checked');
-		define('_CFG_TEST_TEXT_Y', "");
+	if (getConfig('test_text') != 'Y') {
+		define('_CFG_TEST_TEXT_N', ' checked="checked"');
+		define('_CFG_TEST_TEXT_Y', '');
 	} else {
-		define('_CFG_TEST_TEXT_N', "");
-		define('_CFG_TEST_TEXT_Y', ' checked');
+		define('_CFG_TEST_TEXT_N', '');
+		define('_CFG_TEST_TEXT_Y', ' checked="checked"');
 	}
 
-	switch ($_CONFIG['repay_deleted_mails']) {
-		case "REPAY":
-			define('_CFG_REPAY_POINTS_REPAY'  , " selected=\"selected\"");
-			define('_CFG_REPAY_POINTS_JACKPOT', "");
-			define('_CFG_REPAY_POINTS_NONE'   , "");
+	switch (getConfig('repay_deleted_mails')) {
+		case 'REPAY':
+			define('_CFG_REPAY_POINTS_REPAY'  , ' selected="selected"');
+			define('_CFG_REPAY_POINTS_JACKPOT', '');
+			define('_CFG_REPAY_POINTS_SHRED'  , '');
 			break;
 
-		case "JACKPOT":
-			define('_CFG_REPAY_POINTS_REPAY'  , "");
-			define('_CFG_REPAY_POINTS_JACKPOT', " selected=\"selected\"");
-			define('_CFG_REPAY_POINTS_NONE'   , "");
+		case 'JACKPOT':
+			define('_CFG_REPAY_POINTS_REPAY'  , '');
+			define('_CFG_REPAY_POINTS_JACKPOT', ' selected="selected"');
+			define('_CFG_REPAY_POINTS_SHRED'  , '');
 			break;
 
-		case "NONE":
-			define('_CFG_REPAY_POINTS_REPAY'  , "");
-			define('_CFG_REPAY_POINTS_JACKPOT', "");
-			define('_CFG_REPAY_POINTS_NONE'   , " selected=\"selected\"");
+		case 'SHRED':
+			define('_CFG_REPAY_POINTS_REPAY'  , '');
+			define('_CFG_REPAY_POINTS_JACKPOT', '');
+			define('_CFG_REPAY_POINTS_SHRED'  , ' selected="selected"');
 			break;
 	}
 
-	if ($_CONFIG['test_subj'] == 'N') {
-		define('_CFG_TEST_SUBJ_N', ' checked');
-		define('_CFG_TEST_SUBJ_Y', "");
+	if (getConfig('test_subj') != 'Y') {
+		define('_CFG_TEST_SUBJ_N', ' checked="checked"');
+		define('_CFG_TEST_SUBJ_Y', '');
 	} else {
-		define('_CFG_TEST_SUBJ_N', "");
-		define('_CFG_TEST_SUBJ_Y', ' checked');
+		define('_CFG_TEST_SUBJ_N', '');
+		define('_CFG_TEST_SUBJ_Y', ' checked="checked"');
 	}
 
-	if ($_CONFIG['url_blacklist'] == 'N') {
-		define('_CFG_URL_BLIST_N', ' checked');
-		define('_CFG_URL_BLIST_Y', "");
+	if (getConfig('url_blacklist') != 'Y') {
+		define('_CFG_URL_BLIST_N', ' checked="checked"');
+		define('_CFG_URL_BLIST_Y', '');
 	} else {
-		define('_CFG_URL_BLIST_N', "");
-		define('_CFG_URL_BLIST_Y', ' checked');
+		define('_CFG_URL_BLIST_N', '');
+		define('_CFG_URL_BLIST_Y', ' checked="checked"');
 	}
 
 	// Selection list
-	define('__ORDER_SELECT', ORDER_SELECT_OPTION_LIST($_CONFIG['order_select']));
+	define('__ORDER_SELECT', ORDER_SELECT_OPTION_LIST(getConfig('order_select')));
 
 	// Load template
 	LOAD_TEMPLATE("admin_config_order");
 }
+
 //
 ?>