More other options moved out (to config_order)

[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 239c30cc700e115eb49c7de0ba4c44b23bedf99d..73fc2f7232e0e2392dd01be4f133cbab1a2d1ef1 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -51,13 +51,13 @@ if (isset($_POST['ok']))
        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;
        }
 
@@ -78,6 +78,34 @@ 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');
+       }
+
+       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']));