Cast added due to API changes in PHP 5.3.1

[mailer.git] / inc / wrapper-functions.php

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index c81d9d09d30ff956b334d6c60580579376e254d3..218bab23d89a1898550aac7930a50e4b42f1bdcd 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -356,11 +356,18 @@ function isDebugModeEnabled () {
 
 // Checks wether SQL debugging is enabled
 function isSqlDebuggingEnabled () {
-       return ((isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y'));
+       // Is cache set?
+       if (!isset($GLOBALS['is_sql_debug_enabled'])) {
+               // Determine if SQL debugging is enabled
+               $GLOBALS['is_sql_debug_enabled'] = ((isConfigEntrySet('DEBUG_SQL')) && (getConfig('DEBUG_SQL') == 'Y'));
+       } // END - if
+
+       // Return it
+       return $GLOBALS['is_sql_debug_enabled'];
 }
 
 // Checks wether we shall debug regular expressions
-function isDebugRegExpressionEnabled () {
+function isDebugRegularExpressionEnabled () {
        // Simply check it
        return ((isConfigEntrySet('DEBUG_REGEX')) && (getConfig('DEBUG_REGEX') == 'Y'));
 }
@@ -837,7 +844,11 @@ function isUserDataValid () {
 
 // Setter for current userid
 function setCurrentUserId ($userid) {
+       // Set userid
        $GLOBALS['current_userid'] = bigintval($userid);
+
+       // Unset it to re-determine the actual state
+       unset($GLOBALS['is_userdata_valid'][$userid]);
 }
 
 // Getter for current userid
@@ -854,7 +865,7 @@ function getCurrentUserId () {
 
 // Checks if current userid is set
 function isCurrentUserIdSet () {
-       return isset($GLOBALS['current_userid']);
+       return ((isset($GLOBALS['current_userid'])) && ($GLOBALS['current_userid'] > 0));
 }
 
 // Checks wether we are debugging template cache
@@ -863,14 +874,14 @@ function isDebuggingTemplateCache () {
 }
 
 // Wrapper for fetchUserData() and getUserData() calls
-function getFetchedUserData ($keyColumn, $userId, $valueColumn) {
+function getFetchedUserData ($keyColumn, $userid, $valueColumn) {
        // Is it cached?
        if (!isset($GLOBALS['user_data_cache'][$userid][$keyColumn][$valueColumn])) {
                // Default is 'guest'
                $data = getMessage('USERNAME_GUEST');
 
                // Can we fetch the user data?
-               if (($userId > 0) && (fetchUserData($userId, $keyColumn))) {
+               if (($userid > 0) && (fetchUserData($userid, $keyColumn))) {
                        // Now get the data back
                        $data = getUserData($valueColumn);
                } // END - if