From 1e8b13eed299bc1fce44f44e01361de6d025092a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 4 Mar 2009 20:29:17 +0000 Subject: [PATCH] moved into --- inc/databases.php | 2 +- inc/extensions/ext-sql_patches.php | 4 ++-- inc/modules/guest/action-admin.php | 2 +- inc/modules/guest/action-main.php | 2 +- inc/modules/guest/action-members.php | 2 +- inc/modules/guest/action-sponsor.php | 2 +- inc/modules/index.php | 2 +- inc/modules/login.php | 2 +- inc/modules/member/action-account.php | 2 +- inc/modules/member/action-bank.php | 2 +- inc/modules/member/action-extras.php | 2 +- inc/modules/member/action-logout.php | 2 +- inc/modules/member/action-main.php | 2 +- inc/modules/member/action-order.php | 2 +- inc/modules/member/action-rals.php | 2 +- inc/modules/member/action-stats.php | 2 +- inc/modules/member/action-surfbar.php | 2 +- inc/mysql-manager.php | 4 ++-- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/inc/databases.php b/inc/databases.php index 0206c29ad8..40d8bd35c8 100644 --- 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 dc98cdaf17..bd5241fbce 100644 --- 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 291d0a3ba2..038bf7cc91 100644 --- 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 5feddc567f..e5051a1530 100644 --- 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 f49de0caca..facd4aec39 100644 --- 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 28266cf40a..c9d49d4a8e 100644 --- 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 823f1f3134..b74d1a1627 100644 --- 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 a4938ec811..8c91530bd9 100644 --- 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 0aa3d160aa..b3808c85b7 100644 --- 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 32988f9b36..07e2a3fbc7 100644 --- 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 3d8870110e..8b12b5640a 100644 --- 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 a1ae3d9528..186f716c51 100644 --- 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 50874082ab..190fd08e98 100644 --- 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 1428eed178..f9670a4e99 100644 --- 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 04f9dd695d..a1a4594439 100644 --- 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 19587857c9..e644535360 100644 --- 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 2449adec38..1ea33082b6 100644 --- 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 0f5051ae0c..d25ae4c414 100644 --- 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']."*
\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 -- 2.30.2