Ticket resolved, code rewrites and caching:

[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 1c8e8dd9a37fdb185593959cb7ab24e296ac8390..dbf9e3075aa86b23f96297f297b69dc4a721b346 100644 (file)
--- a/inc/modules/admin/what-config_order.php
+++ b/inc/modules/admin/what-config_order.php
@@ -32,37 +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'])) {
        // Save data
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Prepare constants for the template
-       switch ($_CONFIG['order_max_full'])
+       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\"");
@@ -76,18 +76,18 @@ if (isset($_POST['ok'])) {
        }
 
        // 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']);
+       define('_CFG_UNCONFIRMED'   , getConfig('unconfirmed'));
+       define('_CFG_MAX_TLENGTH'   , getConfig('max_tlength'));
 
-       if ($_CONFIG['test_text'] == "N") {
-               define('_CFG_TEST_TEXT_N', ' checked');
+       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_Y', " checked=\"checked\"");
        }
 
-       switch ($_CONFIG['repay_deleted_mails']) {
+       switch (getConfig('repay_deleted_mails')) {
                case "REPAY":
                        define('_CFG_REPAY_POINTS_REPAY'  , " selected=\"selected\"");
                        define('_CFG_REPAY_POINTS_JACKPOT', "");
@@ -107,24 +107,24 @@ if (isset($_POST['ok'])) {
                        break;
        }
 
-       if ($_CONFIG['test_subj'] == "N") {
-               define('_CFG_TEST_SUBJ_N', ' checked');
+       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_Y', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['url_blacklist'] == "N") {
-               define('_CFG_URL_BLIST_N', ' checked');
+       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_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");