New wrapper functions enableBlockMode() and isBlockModeEnabled() introduced

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

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

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

diff --git a/inc/modules/guest/action-sponsor.php b/inc/modules/guest/action-sponsor.php
index 948fbf7cdfe10b82e7e16d9588aaf19d86a6eb53..08efab2a619be9dbd3e3164e766c7f7698d42446 100644 (file)
--- a/inc/modules/guest/action-sponsor.php
+++ b/inc/modules/guest/action-sponsor.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE('sponsor')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('sponsor'));
        return;
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

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

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 67b049ad2e9abf09fce5cd3a8b75519c7a671627..3ce8c164ac0da36fab055c5cfcb68bf56bbff089 100644 (file)
--- a/inc/modules/login.php
+++ b/inc/modules/login.php
@@ -58,7 +58,7 @@ if ($GLOBALS['status'] != 'CONFIRMED') {
 define('__MEMBER_ADVERT', LOAD_TEMPLATE('member_banner', true));
 
 // Disable block mode by default
-$GLOBALS['block_mode'] = false;
+enableBlockMode(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 2fb0d256ca31e3418015293f1cc8250234a3dc1b..d044aa5db549f687667ce2b5f85bc57236bd8270 100644 (file)
--- a/inc/modules/member/action-account.php
+++ b/inc/modules/member/action-account.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-bank.php b/inc/modules/member/action-bank.php
index 6fb577f5fd5450cfe54684188d818539175f7bef..5d89820fc1d45a7a738fb76e559c95b6c447a9f1 100644 (file)
--- a/inc/modules/member/action-bank.php
+++ b/inc/modules/member/action-bank.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE('bank')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bank'));
        return;
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-extras.php b/inc/modules/member/action-extras.php
index 80760aee9b29e2734bff31bc8bc4202ac7ce5d97..fa0601962ef2f6b769ea221c5da2317d1e19b50a 100644 (file)
--- a/inc/modules/member/action-extras.php
+++ b/inc/modules/member/action-extras.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-logout.php b/inc/modules/member/action-logout.php
index 4c3ee1593394dd324ed731be08b5efdda57b3513..85a5775f14afa917f06dabf24d4f3059c09556c0 100644 (file)
--- a/inc/modules/member/action-logout.php
+++ b/inc/modules/member/action-logout.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-main.php b/inc/modules/member/action-main.php
index ad1179d4142538e272094b43ba7200b154971c0d..8f5950640fdbe1a428aa3c375e0cf9eb08343333 100644 (file)
--- a/inc/modules/member/action-main.php
+++ b/inc/modules/member/action-main.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-order.php b/inc/modules/member/action-order.php
index 71fb41b0b8a030f10cbf5af531d1a8e39e7599ec..37d2377e9e5dd39402deb92b0a6d1dfc7c07de9b 100644 (file)
--- a/inc/modules/member/action-order.php
+++ b/inc/modules/member/action-order.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE('order')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('order'));
        return;
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-rals.php b/inc/modules/member/action-rals.php
index 3a3c1681ecb610b9039cf8764330864ac51e90b2..779013e7c9d3a7088c5da4142d7d44276da19b90 100644 (file)
--- a/inc/modules/member/action-rals.php
+++ b/inc/modules/member/action-rals.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-stats.php b/inc/modules/member/action-stats.php
index 3e47e7fe834bd5c8f8b415372ffb7c9e12fad63f..edc8248f8c5e4c56a923affe2a4f20061d990a10 100644 (file)
--- a/inc/modules/member/action-stats.php
+++ b/inc/modules/member/action-stats.php
@@ -42,7 +42,7 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        redirectToUrl('modules.php?module=index');
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/modules/member/action-surfbar.php b/inc/modules/member/action-surfbar.php
index a1e5c7719b866d271b4da9b9311b71e8260ddc96..4470b082fcda984155777147ebb120860ead5563 100644 (file)
--- a/inc/modules/member/action-surfbar.php
+++ b/inc/modules/member/action-surfbar.php
@@ -45,7 +45,7 @@ if (!defined('__SECURITY')) {
 } elseif ((!EXT_IS_ACTIVE('surfbar')) && (!IS_ADMIN())) {
        addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('surfbar'));
        return;
-} elseif ($GLOBALS['block_mode']) {
+} elseif (isBlockModeEnabled()) {
        // Block mode detected
        return;
 }

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 91dc03e9e2bd6163f8f5c75467f20daae2b39560..57ee9fc67c3d8f992e92aa5aeb949ab1514d3ddd 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -57,6 +57,9 @@ foreach (array('request-functions', 'session-functions', 'config-functions', 'co
 // Set error handler
 set_error_handler('__errorHandler');
 
+// Disable block-mode by default
+enableBlockMode(false);
+
 // Init error handler
 initErrorHandler();
 

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index d0edc7d94fb381bb8337a3dae2ceedb09cd149a7..726ddbd2053f115cc376782e439317c299957269 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -410,8 +410,8 @@ function ADD_MENU ($mode, $act, $wht) {
        } // END - if
 
        // Load SQL data and add the menu to the output stream...
-       $result_main = SQL_QUERY_ESC("SELECT title, action FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
-       array($mode), __FUNCTION__, __LINE__);
+       $result_main = SQL_QUERY_ESC("SELECT `title`, `action` FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE (`what`='' OR `what` IS NULL)".$AND." ORDER BY `sort`",
+               array($mode), __FUNCTION__, __LINE__);
        //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$main_action.'/'.$sub_what.':'.getWhat()."*<br />\n";
        if (SQL_NUMROWS($result_main) > 0) {
                OUTPUT_HTML("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"".$mode."_menu\">");
@@ -419,11 +419,11 @@ function ADD_MENU ($mode, $act, $wht) {
                while ($content = SQL_FETCHARRAY($result_main)) {
                        //* DEBUG: */ echo __LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$sub_what.':'.getWhat()."*<br />\n";
                        // Init variables
-                       $GLOBALS['block_mode'] = false;
+                       enableBlockMode(false);
                        $act = $content['action'];
 
                        // Load menu header template
-                       LOAD_TEMPLATE($mode."_menu_title", false, $content);
+                       LOAD_TEMPLATE($mode . '_menu_title', false, $content);
 
                        // Sub menu
                        $result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`",
@@ -490,7 +490,7 @@ function ADD_MENU ($mode, $act, $wht) {
                                }
                        } else {
                                // This is a menu block... ;-)
-                               $GLOBALS['block_mode'] = true;
+                               enableBlockMode();
                                $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']);
                                if (isFileReadable($INC_BLOCK)) {
                                        // Load include file

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 1df653fb9bcd16d13e00ef9d72c7a603d651929a..7c721976e4202171f72af01ec5f3b3b2c746108f 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -593,5 +593,22 @@ function isOutputModeSet ($abortOnMiss =  false) {
        return $isset;
 }
 
+// Enables block-mode
+function enableBlockMode ($enabled = true) {
+       $GLOBALS['block_mode'] = $enabled;
+}
+
+// Checks wether block-mode is enabled
+function isBlockModeEnabled () {
+       // Abort if not set
+       if (!isset($GLOBALS['block_mode'])) {
+               // Needs to be fixed
+               debug_report_bug(__FUNCTION__ . ': block_mode is not set.');
+       } // END - if
+
+       // Return it
+       return $GLOBALS['block_mode'];
+}
+
 // [EOF]
 ?>