Code rewritings, load base config improved and many minor fixes...

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

diff --git a/0.2.1/inc/modules/admin/what-config_other.php b/0.2.1/inc/modules/admin/what-config_other.php
index 60145df453fafb0dbcb2e609381ea5a6628f6ce2..d2bf210552c98b478022dac222737873e3de6860 100644 (file)
--- a/0.2.1/inc/modules/admin/what-config_other.php
+++ b/0.2.1/inc/modules/admin/what-config_other.php
@@ -34,7 +34,7 @@
 // Some security stuff...\r
 if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))\r
 {\r
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4)."/security.php";\r
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";\r
        require($INC);\r
 } elseif ((!EXT_IS_ACTIVE("other")) || (GET_EXT_VERSION("other") == "")) {\r
        // Missing extension!\r
@@ -88,7 +88,7 @@ if (isset($_POST['ok']))
        define('_CFG_UNCONFIRMED'   , $CONFIG['unconfirmed']);\r
        define('_CFG_MAX_TLENGTH'   , $CONFIG['max_tlength']);\r
        define('_CFG_CODE_LENGTH'   , $CONFIG['code_length']);\r
-       define('_CFG_ACT_SYSTEM'    , $CONFIG['activate_system']);\r
+       define('_CFG_ACT_SYSTEM'    , $CONFIG['activate_xchange']);\r
        define('_CFG_MAX_SEND'      , $CONFIG['max_send']);\r
        define('_CFG_REJECT_URL'    , $CONFIG['reject_url']);\r
 \r
@@ -100,7 +100,7 @@ if (isset($_POST['ok']))
                define('_CFG_URL_TLOCK'     , CREATE_TIME_SELECTIONS($CONFIG['url_tlock']     , "url_tlock"            , "WDh"));\r
                define('_CFG_PROFILE_LOCK'  , CREATE_TIME_SELECTIONS($CONFIG['profile_lock']  , "profile_lock"         , "WDh"));\r
                define('_CFG_PROFILE_UPDATE', CREATE_TIME_SELECTIONS($CONFIG['profile_update'], "profile_update"       , "YM"));\r
-               define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($CONFIG['prof_reupdate'] , "resend_profile_update", "MWD"));\r
+               define('_CFG_PROF_REUPDATE' , CREATE_TIME_SELECTIONS($CONFIG['resend_profile_update'] , "resend_profile_update", "MWD"));\r
        }\r
         else\r
        {\r
@@ -109,7 +109,7 @@ if (isset($_POST['ok']))
                define('_CFG_URL_TLOCK'     , "<INPUT type=\"text\" name=\"url_tlock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$CONFIG['url_tlock']     ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");\r
                define('_CFG_PROFILE_LOCK'  , "<INPUT type=\"text\" name=\"profile_lock\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$CONFIG['profile_lock']  ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");\r
                define('_CFG_PROFILE_UPDATE', "<INPUT type=\"text\" name=\"profile_update\" class=\"admin_normal\" size=\"10\" maxlength=\"255\" value=\"".$CONFIG['profile_update']."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");\r
-               define('_CFG_PROF_REUPDATE' , "<INPUT type=\"text\" name=\"resend_profile_update\" class=\"admin_normal\" size=\"6\"  maxlength=\"255\" value=\"".$CONFIG['prof_reupdate'] ."\"> <FONT class=\"tiny\">(".SECS.")</FONT>");\r
+               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\">(".SECS.")</FONT>");\r
        }\r
 \r
        if ($CONFIG['test_text'] == "N")\r
@@ -142,7 +142,7 @@ if (isset($_POST['ok']))
                define('_CFG_URL_BLIST_N', "");\r
                define('_CFG_URL_BLIST_Y', " checked");\r
        }\r
-       if ($CONFIG['order_multi'] == "N")\r
+       if ($CONFIG['order_multi_page'] == "N")\r
        {\r
                define('_CFG_ORDER_MULTI_N', " checked");\r
                define('_CFG_ORDER_MULTI_Y', "");\r
@@ -162,7 +162,7 @@ if (isset($_POST['ok']))
                define('_CFG_AUTOSEND_ACTIVE_N', "");\r
                define('_CFG_AUTOSEND_ACTIVE_Y', " checked");\r
        }\r
-       if ($CONFIG['send_update'] == "N")\r
+       if ($CONFIG['send_prof_update'] == "N")\r
        {\r
                define('_CFG_SEND_UPDATE_N', " checked");\r
                define('_CFG_SEND_UPDATE_Y', "");\r