X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-config_order.php;h=04febbd6ea023df9c5453339d612db8c2de9c9d5;hb=f9a9c09e1ae257449bfd98f8854e321efba1dc3c;hp=5714b3a90ef893e216380257c395ee61cf473a54;hpb=75ad748a68473ace540251427a74fb781b1145e9;p=mailer.git

diff --git a/inc/modules/admin/what-config_order.php b/inc/modules/admin/what-config_order.php
index 5714b3a90e..04febbd6ea 100644
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -32,40 +32,37 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+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 (isset($_POST['ok'])) {
 	// Save data
-	ADMIN_SAVE_SETTINGS($_POST, "_config", "config='0'");
-}
- else
-{
+	ADMIN_SAVE_SETTINGS($_POST);
+} else {
 	// Prepare constants for the template
-	switch ($CONFIG['order_max'])
+	switch (getConfig('order_max_full'))
 	{
 	case "ORDER":
-		define('__ORDER_DEFAULT', " checked");
+		define('__ORDER_DEFAULT', " checked=\"checked\"");
 		define('__MAX_DEFAULT'  , "");
 		break;
 
 	case "MAX":
 		define('__ORDER_DEFAULT', "");
-		define('__MAX_DEFAULT'  , " checked");
+		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'])
+	switch (getConfig('order_mode'))
 	{
 	case "ASC":
 		define('__ASC_DEFAULT' , " selected=\"selected\"");
@@ -78,8 +75,56 @@ if (isset($_POST['ok']))
 		break;
 	}
 
+	// Transfer other config data into constants for the template (DO NOT set $_CONFIG as global in LOAD_TEMPLATE!!!)
+	define('_CFG_UNCONFIRMED'   , getConfig('unconfirmed'));
+	define('_CFG_MAX_TLENGTH'   , getConfig('max_tlength'));
+
+	if (getConfig('test_text') == "N") {
+		define('_CFG_TEST_TEXT_N', " checked=\"checked\"");
+		define('_CFG_TEST_TEXT_Y', "");
+	} else {
+		define('_CFG_TEST_TEXT_N', "");
+		define('_CFG_TEST_TEXT_Y', " checked=\"checked\"");
+	}
+
+	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_SHRED'  , "");
+			break;
+
+		case "SHRED":
+			define('_CFG_REPAY_POINTS_REPAY'  , "");
+			define('_CFG_REPAY_POINTS_JACKPOT', "");
+			define('_CFG_REPAY_POINTS_SHRED'  , " selected=\"selected\"");
+			break;
+	}
+
+	if (getConfig('test_subj') == "N") {
+		define('_CFG_TEST_SUBJ_N', " checked=\"checked\"");
+		define('_CFG_TEST_SUBJ_Y', "");
+	} else {
+		define('_CFG_TEST_SUBJ_N', "");
+		define('_CFG_TEST_SUBJ_Y', " checked=\"checked\"");
+	}
+
+	if (getConfig('url_blacklist') == "N") {
+		define('_CFG_URL_BLIST_N', " checked=\"checked\"");
+		define('_CFG_URL_BLIST_Y', "");
+	} else {
+		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");