New feature of repaying points to user/jackpot/shred added

[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 5714b3a90ef893e216380257c395ee61cf473a54..c864f160edfd71fd1c519233d0f93f491431e7a8 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -40,32 +40,29 @@ if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
 // Add description as navigation point
 ADD_DESCR("admin", basename(__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 ($_CONFIG['order_max'])
        {
        case "ORDER":
-               define('__ORDER_DEFAULT', " checked");
+               define('__ORDER_DEFAULT', ' checked');
                define('__MAX_DEFAULT'  , "");
                break;
 
        case "MAX":
                define('__ORDER_DEFAULT', "");
-               define('__MAX_DEFAULT'  , " checked");
+               define('__MAX_DEFAULT'  , ' checked');
                break;
        }
 
        // Minimum mails / order
-       define('__MIN_VALUE', $CONFIG['order_min']);
+       define('__MIN_VALUE', $_CONFIG['order_min']);
 
        // Sorting mode (ascending / descending)
-       switch ($CONFIG['order_mode'])
+       switch ($_CONFIG['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'   , $_CONFIG['unconfirmed']);
+       define('_CFG_MAX_TLENGTH'   , $_CONFIG['max_tlength']);
+
+       if ($_CONFIG['test_text'] == 'N') {
+               define('_CFG_TEST_TEXT_N', ' checked');
+               define('_CFG_TEST_TEXT_Y', "");
+       } else {
+               define('_CFG_TEST_TEXT_N', "");
+               define('_CFG_TEST_TEXT_Y', ' 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'   , "");
+                       break;
+
+               case "JACKPOT":
+                       define('_CFG_REPAY_POINTS_REPAY'  , "");
+                       define('_CFG_REPAY_POINTS_JACKPOT', " selected=\"selected\"");
+                       define('_CFG_REPAY_POINTS_NONE'   , "");
+                       break;
+
+               case "NONE":
+                       define('_CFG_REPAY_POINTS_REPAY'  , "");
+                       define('_CFG_REPAY_POINTS_JACKPOT', "");
+                       define('_CFG_REPAY_POINTS_NONE'   , " selected=\"selected\"");
+                       break;
+       }
+
+       if ($_CONFIG['test_subj'] == 'N') {
+               define('_CFG_TEST_SUBJ_N', ' checked');
+               define('_CFG_TEST_SUBJ_Y', "");
+       } else {
+               define('_CFG_TEST_SUBJ_N', "");
+               define('_CFG_TEST_SUBJ_Y', ' checked');
+       }
+
+       if ($_CONFIG['url_blacklist'] == 'N') {
+               define('_CFG_URL_BLIST_N', ' checked');
+               define('_CFG_URL_BLIST_Y', "");
+       } else {
+               define('_CFG_URL_BLIST_N', "");
+               define('_CFG_URL_BLIST_Y', ' checked');
+       }
+
        // Selection list
-       define('__ORDER_SELECT', ORDER_SELECT_OPTION_LIST($CONFIG['order_select']));
+       define('__ORDER_SELECT', ORDER_SELECT_OPTION_LIST($_CONFIG['order_select']));
 
        // Load template
        LOAD_TEMPLATE("admin_config_order");