Login form for guests in surfbar added, some trigger_error() added, misc rewrites

[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 71971c0521d5b6f890c2bc96f885584e46182bb3..d6bca2db091f8db0c22bee6df6aca071a76d3303 100644 (file)
--- a/inc/modules/admin/what-config_other.php
+++ b/inc/modules/admin/what-config_other.php
@@ -42,7 +42,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        require($INC);
 } elseif (!EXT_IS_ACTIVE('other')) {
        // Missing extension!
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'other'));
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('other'));
        return;
 }
 
@@ -50,7 +50,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR('admin', __FILE__);
 
 // Stop saving data if one input field is !isset
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Calculate stamps and set calculated stamps
        REQUEST_POST('online_timeout')        = createTimestampFromSelections('ip_timeout'           , REQUEST_POST_ARRAY());
        REQUEST_POST('url_tlock')             = createTimestampFromSelections('url_tlock'            , REQUEST_POST_ARRAY());
@@ -73,7 +73,7 @@ if (IS_FORM_SENT()) {
        if (!REQUEST_ISSET_POST(('reject_url')))            { REQUEST_UNSET_POST('ok'); }
 }
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
        // Update stamps directly
        ADMIN_SAVE_SETTINGS_POST();
 } else {
@@ -92,91 +92,91 @@ if (IS_FORM_SENT()) {
        define('_CFG_PROF_REUPDATE' , createTimeSelections(getConfig('resend_profile_update') , 'resend_profile_update', 'MWD'));
 
        if (getConfig('order_multi_page') != 'Y') {
-               define('_CFG_ORDER_MULTI_N', ' chkecked="checked"');
+               define('_CFG_ORDER_MULTI_N', ' checked="checked"');
                define('_CFG_ORDER_MULTI_Y', '');
        } else {
                define('_CFG_ORDER_MULTI_N', '');
-               define('_CFG_ORDER_MULTI_Y', ' chkecked="checked"');
+               define('_CFG_ORDER_MULTI_Y', ' checked="checked"');
        }
 
        if (getConfig('autosend_active') != 'Y') {
-               define('_CFG_AUTOSEND_ACTIVE_N', ' chkecked="checked"');
+               define('_CFG_AUTOSEND_ACTIVE_N', ' checked="checked"');
                define('_CFG_AUTOSEND_ACTIVE_Y', '');
        } else {
                define('_CFG_AUTOSEND_ACTIVE_N', '');
-               define('_CFG_AUTOSEND_ACTIVE_Y', ' chkecked="checked"');
+               define('_CFG_AUTOSEND_ACTIVE_Y', ' checked="checked"');
        }
 
        if (getConfig('send_prof_update') != 'Y') {
-               define('_CFG_SEND_UPDATE_N', ' chkecked="checked"');
+               define('_CFG_SEND_UPDATE_N', ' checked="checked"');
                define('_CFG_SEND_UPDATE_Y', '');
        } else {
                define('_CFG_SEND_UPDATE_N', '');
-               define('_CFG_SEND_UPDATE_Y', ' chkecked="checked"');
+               define('_CFG_SEND_UPDATE_Y', ' checked="checked"');
        }
 
        if (getConfig('admin_notify') != 'Y') {
-               define('_CFG_ADMIN_NOTIFY_N', ' chkecked="checked"');
+               define('_CFG_ADMIN_NOTIFY_N', ' checked="checked"');
                define('_CFG_ADMIN_NOTIFY_Y', '');
        } else {
                define('_CFG_ADMIN_NOTIFY_N', '');
-               define('_CFG_ADMIN_NOTIFY_Y', ' chkecked="checked"');
+               define('_CFG_ADMIN_NOTIFY_Y', ' checked="checked"');
        }
 
-       if (getConfig('css_php') == "DIRECT") {
-               define('_CFG_CSS_PHP_DIRECT', ' chkecked="checked"');
+       if (getConfig('css_php') == 'DIRECT') {
+               define('_CFG_CSS_PHP_DIRECT', ' checked="checked"');
                define('_CFG_CSS_PHP_FILE', '');
        } else {
                define('_CFG_CSS_PHP_DIRECT', '');
-               define('_CFG_CSS_PHP_FILE', ' chkecked="checked"');
+               define('_CFG_CSS_PHP_FILE', ' checked="checked"');
        }
 
        if (getConfig('guest_menu') == 'Y') {
-               define('_CFG_GUEST_MENU_ACTIVE', ' chkecked="checked"');
+               define('_CFG_GUEST_MENU_ACTIVE', ' checked="checked"');
                define('_CFG_GUEST_MENU_INACTIVE', '');
        } else {
                define('_CFG_GUEST_MENU_ACTIVE', '');
-               define('_CFG_GUEST_MENU_INACTIVE', ' chkecked="checked"');
+               define('_CFG_GUEST_MENU_INACTIVE', ' checked="checked"');
        }
 
        if (getConfig('member_menu') == 'Y') {
-               define('_CFG_MEMBER_MENU_ACTIVE', ' chkecked="checked"');
+               define('_CFG_MEMBER_MENU_ACTIVE', ' checked="checked"');
                define('_CFG_MEMBER_MENU_INACTIVE', '');
        } else {
                define('_CFG_MEMBER_MENU_ACTIVE', '');
-               define('_CFG_MEMBER_MENU_INACTIVE', ' chkecked="checked"');
+               define('_CFG_MEMBER_MENU_INACTIVE', ' checked="checked"');
        }
 
        if (getConfig('youre_here') == 'Y') {
-               define('_CFG_YOURE_HERE_ACTIVE', ' chkecked="checked"');
+               define('_CFG_YOURE_HERE_ACTIVE', ' checked="checked"');
                define('_CFG_YOURE_HERE_INACTIVE', '');
        } else {
                define('_CFG_YOURE_HERE_ACTIVE', '');
-               define('_CFG_YOURE_HERE_INACTIVE', ' chkecked="checked"');
+               define('_CFG_YOURE_HERE_INACTIVE', ' checked="checked"');
        }
 
        if (getConfig('show_timings') == 'Y') {
-               define('_CFG_SHOW_TIMINGS_Y', ' chkecked="checked"');
+               define('_CFG_SHOW_TIMINGS_Y', ' checked="checked"');
                define('_CFG_SHOW_TIMINGS_N', '');
        } else {
                define('_CFG_SHOW_TIMINGS_Y', '');
-               define('_CFG_SHOW_TIMINGS_N', ' chkecked="checked"');
+               define('_CFG_SHOW_TIMINGS_N', ' checked="checked"');
        }
 
        if (getConfig('show_points_unconfirmed') == 'Y') {
-               define('_CFG_SHOW_POINTS_UNCONFIRMED_Y', ' chkecked="checked"');
+               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', ' chkecked="checked"');
+               define('_CFG_SHOW_POINTS_UNCONFIRMED_N', ' checked="checked"');
        }
 
        if (getConfig('mailid_error_redirect') == 'INDEX') {
-               define('_CFG_MAILID_REDIRECT_INDEX', ' chkecked="checked"');
+               define('_CFG_MAILID_REDIRECT_INDEX', ' checked="checked"');
                define('_CFG_MAILID_REDIRECT_REJECT', '');
        } else {
                define('_CFG_MAILID_REDIRECT_INDEX', '');
-               define('_CFG_MAILID_REDIRECT_REJECT', ' chkecked="checked"');
+               define('_CFG_MAILID_REDIRECT_REJECT', ' checked="checked"');
        }
 
        for ($i = 0; $i <= 5; $i++) {