moved into

diff --git a/inc/databases.php b/inc/databases.php
index 0206c29ad8258bde4ec68f1b7b47a9ac7497d6d1..40d8bd35c8f9c36699f767adf8c34751c19190cb 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -98,7 +98,7 @@ define('SERVER_URL', "http://www.mxchange.org");
 
 // Current SVN revision
 //define('CURR_SVN_REVISION', getActualVersion(0));
-define('CURR_SVN_REVISION', "824");
+define('CURR_SVN_REVISION', "825");
 define('CURR_SVN_DATE'    , getActualVersion(1));
 define('CURR_SVN_VERSION' , getActualVersion(2));
 

diff --git a/inc/extensions/ext-sql_patches.php b/inc/extensions/ext-sql_patches.php
index dc98cdaf170f1c43b60e1ce4c9095320cc4e842e..bd5241fbce884da4ca2525cf9fef820634c43e12 100644 (file)
--- a/inc/extensions/ext-sql_patches.php
+++ b/inc/extensions/ext-sql_patches.php
@@ -574,8 +574,8 @@ PRIMARY KEY (id)
 
        case "0.4.6": // SQL queries for v0.4.6
                ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` ADD gender ENUM ('M','F') NOT NULL DEFAULT 'M'");
-               ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET gender=sex WHERE sex != 'M'");
-               ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP sex");
+               // @DEPRECATED ADD_SQL("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET gender=sex WHERE sex != 'M'");
+               // @DEPRECATED ADD_SQL("ALTER TABLE `{!_MYSQL_PREFIX!}_user_data` DROP sex");
 
                // Update notes (these will be set as task text!)
                EXT_SET_UPDATE_NOTES("Offensives Wort "Sex" gegen "Gender" ausgetauscht.");

diff --git a/inc/modules/guest/action-admin.php b/inc/modules/guest/action-admin.php
index 291d0a3ba2b863cb6cb2c5011fa9cb352cc8070d..038bf7cc91875671f489edb0363a6754ec36e918 100644 (file)
--- a/inc/modules/guest/action-admin.php
+++ b/inc/modules/guest/action-admin.php
@@ -35,7 +35,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/guest/action-main.php b/inc/modules/guest/action-main.php
index 5feddc567fe2b4c18f3d73e168b1ce700ab1480b..e5051a153070f24825991adae691d19296181b29 100644 (file)
--- a/inc/modules/guest/action-main.php
+++ b/inc/modules/guest/action-main.php
@@ -35,7 +35,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/guest/action-members.php b/inc/modules/guest/action-members.php
index f49de0caca1ca1b1179002d0058d7dadac0b85c9..facd4aec39bc852c26ed113420068f19db96262c 100644 (file)
--- a/inc/modules/guest/action-members.php
+++ b/inc/modules/guest/action-members.php
@@ -35,7 +35,7 @@
 if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 28266cf40a55db68765e0a4d1e2b7dd1e2258909..c9d49d4a8e664c978c242dc64c9aa1e0a69d6b5c 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("sponsor")) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "sponsor");
        return;
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/index.php b/inc/modules/index.php
index 823f1f3134b02d4c961216e3664333f0afab285c..b74d1a162738cf88a05bde2061b1839502e13a94 100644 (file)
--- a/inc/modules/index.php
+++ b/inc/modules/index.php
@@ -83,7 +83,7 @@ if ((getConfig('guest_menu') == "Y") || (!EXT_IS_ACTIVE("sql_patches", true))) {
 LOAD_TEMPLATE("guest_menu_content");
 
 // Disable block-mode by default
-$BLOCK_MODE = false;
+$GLOBALS['block_mode'] = false;
 
 // Construct FQFN
 $INC = sprintf("inc/modules/guest/action-%s.php", $GLOBALS['action']);

diff --git a/inc/modules/login.php b/inc/modules/login.php
index a4938ec811767e5525a6613757bb5b7f89773271..8c91530bd967f1f5d31ea9d8bb1633dae745db26 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -53,7 +53,7 @@ if ($status != "CONFIRMED") {
 define('__MEMBER_ADVERT', LOAD_TEMPLATE("member_banner", true));
 
 // Disable block mode by default
-$BLOCK_MODE = false;
+$GLOBALS['block_mode'] = false;
 
 // Generate a tableset for the menu title and content
 LOAD_TEMPLATE("member_header");

diff --git a/inc/modules/member/action-account.php b/inc/modules/member/action-account.php
index 0aa3d160aada6a4ef8870cb89eed8d68a4c096f5..b3808c85b785275f01c0a38d1f657d531f8b3ac5 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 32988f9b3682ad432efec0cda236cc43638a317f..07e2a3fbc755f347f93504f65b15038b34ab2387 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("bank")) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "bank");
        return;
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 3d8870110ee3e61a246950a92088f849b3a4a988..8b12b5640abd8c21a96848195f3f5892d0f82c28 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index a1ae3d952847a733388727b9ba87add687343497..186f716c5160a21011e501fa2b8158afe8e70052 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index 50874082abd3a61bcd758cb81e63313ac62dcf9a..190fd08e98183ff7d9b39257f8d9bf98a5cb521b 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 1428eed1787f0a08b9044142bdcead29e23343d4..f9670a4e9955f7b03650b8d250ac6ef4ccf45f16 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "order");
        return;
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 04f9dd695db1928e04ebae9d67af35e44d6b1617..a1a4594439fe4136e076b313dc6c77d3441d6700 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index 19587857c94052baf3ee910cf757e1679e2ff131..e644535360b5e2e2df44f16b4e87cffd1ddc88bc 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -37,7 +37,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index 2449adec38e10464af9a5c2af06f2ec89e872743..1ea33082b64f4ab9993bfbe18085a2a8951aa969 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE("surfbar")) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "surfbar");
        return;
-} elseif ($BLOCK_MODE) {
+} elseif ($GLOBALS['block_mode']) {
        // Block mode detected
        return;
 }

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 0f5051ae0ce704c8a693c3a072f81f766d8dc293..d25ae4c41425990ee99c1889570b07c66e4ecb8c 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -375,7 +375,7 @@ function ADD_MENU ($MODE, $act, $wht) {
                while (list($main_title, $main_action) = SQL_FETCHROW($result_main)) {
                        //* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*<br />\n";
                        // Init variables
-                       $BLOCK_MODE = false; $act = $main_action;
+                       $GLOBALS['block_mode'] = false; $act = $main_action;
 
                        // Prepare content
                        $content = array(
@@ -437,7 +437,7 @@ function ADD_MENU ($MODE, $act, $wht) {
                                }
                        } else {
                                // This is a menu block... ;-)
-                               $BLOCK_MODE = true;
+                               $GLOBALS['block_mode'] = true;
                                $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $MODE, $main_action);
                                if (FILE_READABLE($INC_BLOCK)) {
                                        // Load include file