Some functions rewritten to hungarian notation, handling of array rewritten

[mailer.git] / inc / modules / admin / what-config_other.php

diff --git a/inc/modules/admin/what-config_other.php b/inc/modules/admin/what-config_other.php
index c356122bd37fa39a119ab446215991d45e90f979..9b79974df7e2c4f4b61fbb3a082818f84b21906b 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -37,12 +37,12 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {
        // Missing extension!
-       ADD_FATAL(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "other"));
+       addFatalMessage(sprintf(EXTENSION_PROBLEM_NOT_INSTALLED, "other"));
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Stop saving data if one input field is !isset
 if (isset($_POST['ok'])) {
@@ -75,29 +75,30 @@ if (isset($_POST['ok'])) {
        ADMIN_SAVE_SETTINGS($_POST);
 } else {
        // Transfer config data into constants for the template (DO NOT set $_CONFIG as global in LOAD_TEMPLATE!!!)
-       define('_CFG_CODE_LENGTH'   , $_CONFIG['code_length']);
-       define('_CFG_ACT_SYSTEM'    , $_CONFIG['activate_xchange']);
-       define('_CFG_MAX_SEND'      , $_CONFIG['max_send']);
-       define('_CFG_REJECT_URL'    , $_CONFIG['reject_url']);
+       define('_CFG_CODE_LENGTH', getConfig('code_length'));
+       define('_CFG_ACT_SYSTEM' , getConfig('activate_xchange'));
+       define('_CFG_MAX_SEND'   , getConfig('max_send'));
+       define('_CFG_REJECT_URL' , getConfig('reject_url'));
+       define('_CFG_MIN_AGE'    , getConfig('min_age'));
 
        // Is there the pro-version function avaiable to create selection boxes instead of input boxes?
        if (function_exists('CREATE_TIME_SELECTIONS')) {
                // Only pro versions: time selection boxes
-               define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS($_CONFIG['online_timeout'], "ip_timeout"           , "ms"));
-               define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS($_CONFIG['url_tlock']     , "url_tlock"            , "WDh"));
-               define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS($_CONFIG['profile_lock']  , "profile_lock"         , "WDh"));
-               define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS($_CONFIG['profile_update'], "profile_update"       , "YM"));
-               define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($_CONFIG['resend_profile_update'] , "resend_profile_update", "MWD"));
+               define('_CFG_ONLINE_TIMEOUT', CREATE_TIME_SELECTIONS(getConfig('online_timeout'), "ip_timeout"           , "ms"));
+               define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS(getConfig('url_tlock')     , "url_tlock"            , "WDh"));
+               define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS(getConfig('profile_lock')  , "profile_lock"         , "WDh"));
+               define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS(getConfig('profile_update'), "profile_update"       , "YM"));
+               define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS(getConfig('resend_profile_update') , "resend_profile_update", "MWD"));
        } else {
                // Normal input boxes
-               define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['online_timeout']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-               define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-               define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-               define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$_CONFIG['profile_update']."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
-               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$_CONFIG['resend_profile_update'] ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_ONLINE_TIMEOUT', "<INPUT type=\"text\" name=\"online_timeout\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('online_timeout')."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('url_tlock')     ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('profile_lock')  ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".getConfig('profile_update')."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
+               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".getConfig('resend_profile_update') ."\"> <FONT class=\"tiny\">("._SECONDS.")</FONT>");
        }
 
-       if ($_CONFIG['order_multi_page'] == "N") {
+       if (getConfig('order_multi_page') == "N") {
                define('_CFG_ORDER_MULTI_N', " checked=\"checked\"");
                define('_CFG_ORDER_MULTI_Y', "");
        } else {
@@ -105,7 +106,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_ORDER_MULTI_Y', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['autosend_active'] == "N") {
+       if (getConfig('autosend_active') == "N") {
                define('_CFG_AUTOSEND_ACTIVE_N', " checked=\"checked\"");
                define('_CFG_AUTOSEND_ACTIVE_Y', "");
        } else {
@@ -113,7 +114,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_AUTOSEND_ACTIVE_Y', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['send_prof_update'] == "N") {
+       if (getConfig('send_prof_update') == "N") {
                define('_CFG_SEND_UPDATE_N', " checked=\"checked\"");
                define('_CFG_SEND_UPDATE_Y', "");
        } else {
@@ -121,7 +122,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_SEND_UPDATE_Y', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['admin_notify'] == "N") {
+       if (getConfig('admin_notify') == "N") {
                define('_CFG_ADMIN_NOTIFY_N', " checked=\"checked\"");
                define('_CFG_ADMIN_NOTIFY_Y', "");
        } else {
@@ -129,7 +130,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_ADMIN_NOTIFY_Y', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['css_php'] == "DIRECT") {
+       if (getConfig('css_php') == "DIRECT") {
                define('_CFG_CSS_PHP_DIRECT', " checked=\"checked\"");
                define('_CFG_CSS_PHP_FILE', "");
        } else {
@@ -137,7 +138,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_CSS_PHP_FILE', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['guest_menu'] == "Y") {
+       if (getConfig('guest_menu') == "Y") {
                define('_CFG_GUEST_MENU_ACTIVE', " checked=\"checked\"");
                define('_CFG_GUEST_MENU_INACTIVE', "");
        } else {
@@ -145,7 +146,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_GUEST_MENU_INACTIVE', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['member_menu'] == "Y") {
+       if (getConfig('member_menu') == "Y") {
                define('_CFG_MEMBER_MENU_ACTIVE', " checked=\"checked\"");
                define('_CFG_MEMBER_MENU_INACTIVE', "");
        } else {
@@ -153,7 +154,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_MEMBER_MENU_INACTIVE', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['youre_here'] == "Y") {
+       if (getConfig('youre_here') == "Y") {
                define('_CFG_YOURE_HERE_ACTIVE', " checked=\"checked\"");
                define('_CFG_YOURE_HERE_INACTIVE', "");
        } else {
@@ -161,7 +162,7 @@ if (isset($_POST['ok'])) {
                define('_CFG_YOURE_HERE_INACTIVE', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['show_timings'] == "Y") {
+       if (getConfig('show_timings') == "Y") {
                define('_CFG_SHOW_TIMINGS_Y', " checked=\"checked\"");
                define('_CFG_SHOW_TIMINGS_N', "");
        } else {
@@ -169,7 +170,15 @@ if (isset($_POST['ok'])) {
                define('_CFG_SHOW_TIMINGS_N', " checked=\"checked\"");
        }
 
-       if ($_CONFIG['mailid_error_redirect'] == 'INDEX') {
+       if (getConfig('show_points_unconfirmed') == "Y") {
+               define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', " checked=\"checked\"");
+               define('_CFG_SHOW_POINTS_UNCONFIRMED_N', "");
+       } else {
+               define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', "");
+               define('_CFG_SHOW_POINTS_UNCONFIRMED_N', " checked=\"checked\"");
+       }
+
+       if (getConfig('mailid_error_redirect') == 'INDEX') {
                define('_CFG_MAILID_REDIRECT_INDEX', " checked=\"checked\"");
                define('_CFG_MAILID_REDIRECT_REJECT', "");
        } else {
@@ -179,7 +188,7 @@ if (isset($_POST['ok'])) {
 
        for ($i = 0; $i <= 5; $i++) {
                $eval = "define('_COMMA_DEF_".$i."', \"\");";
-               if ($_CONFIG['max_comma'] == $i) $eval = "define('_COMMA_DEF_".$i."', \" selected\");";
+               if (getConfig('max_comma') == $i) $eval = "define('_COMMA_DEF_".$i."', ' selected=\"selected\"');";
                eval($eval);
        }