X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fwrapper-functions.php;h=055cf55b888473364fe3687fc25f61491d18439a;hb=07e126c776ca39d4e8d6a751af02b08221e664e2;hp=236300372037b127ae81da81092a936139fb5aa3;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669;p=mailer.git diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 2363003720..055cf55b88 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -1,7 +1,7 @@ '; - debug_print_backtrace(); - die(''; return ((isExtensionInstalled($ext_name)) && (getExtensionVersion($ext_name) >= $version)); } // Wrapper function for checking if extension is installed and older than given version function isExtensionInstalledAndOlder ($ext_name, $version) { // Return it + //* DEBUG: */ print __FUNCTION__.':'.$ext_name.'<'.$version.'
'; return ((isExtensionInstalled($ext_name)) && (isExtensionOlder($ext_name, $version))); } @@ -656,7 +706,17 @@ function setUsername ($userName) { // Get username function getUsername () { - return $GLOBALS['username']; + // default is guest + $username = getMessage('USERNAME_GUEST'); + + // User name set? + if (isset($GLOBALS['username'])) { + // Use the set name + $username = $GLOBALS['username']; + } // END - if + + // Return it + return $username; } // Wrapper function for installation phase @@ -676,15 +736,6 @@ function isDemoModeActive () { return ((isExtensionActive('demo')) && (getSession('admin_login') == 'demo')); } -// Wrapper function to redirect to de-refered URL -function redirectToDereferedUrl ($URL) { - // De-refer the URL - $URL = generateDerefererUrl($URL); - - // Redirect to to - redirectToUrl($URL); -} - // Getter for PHP caching value function getPhpCaching () { return $GLOBALS['php_caching']; @@ -692,6 +743,28 @@ function getPhpCaching () { // Checks wether the admin hash is set function isAdminHashSet ($admin) { + /** + * @TODO Do we really need this check? If yes, try to fix this: + * 1.:functions.php:2504, debug_get_mailable_backtrace(0) + * 2.:wrapper-functions.php:744, debug_report_bug(1) + * 3.:mysql-manager.php:728, isAdminHashSet(1) + * 4.:filters.php:384, isAdmin(0) + * 5.:debug_get_mailable_backtrace:2457, FILTER_DETERMINE_USERNAME(1) + * 6.:filter-functions.php:280, call_user_func_array(2) + * 7.:load_cache.php:74, runFilterChain(1) + * 8.:inc-functions.php:131, include(1) + * 9.:inc-functions.php:145, loadInclude(1) + * 10.:mysql-connect.php:104, loadIncludeOnce(1) + * 11.:inc-functions.php:131, include(1) + * 12.:inc-functions.php:145, loadInclude(1) + * 13.:config-global.php:106, loadIncludeOnce(1) + * 14.:js.php:57, require(1) + */ + if (!isset($GLOBALS['cache_array']['admin'])) { + debug_report_bug('Cache not set.'); + } // END - if + + // Check for admin hash return isset($GLOBALS['cache_array']['admin']['password'][$admin]); } @@ -700,5 +773,104 @@ function setAdminHash ($admin, $hash) { $GLOBALS['cache_array']['admin']['password'][$admin] = $hash; } +// Init user data array +function initUserData () { + // User id should not be zero + if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.'); + + // Init the user + $GLOBALS['user_data'][getCurrentUserId()] = array(); +} + +// Getter for user data +function getUserData ($column) { + // User id should not be zero + if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.'); + + // Return the value + return $GLOBALS['user_data'][getCurrentUserId()][$column]; +} + +// Geter for whole user data array +function getUserDataArray () { + // Get user id + $uid = getCurrentUserId(); + + // User id should not be zero + if ($uid < 1) debug_report_bug(__FUNCTION__.': User id is zero.'); + + // Get the whole array if found + if (isset($GLOBALS['user_data'][$uid])) { + // Found, so return it + return $GLOBALS['user_data'][$uid]; + } else { + // Return empty array + return array(); + } +} + +// Checks if the user data is valid, this may indicate that the user has logged +// in, but you should use isMember() if you want to find that out. +function isUserDataValid () { + // User id should not be zero so abort here + if (!isCurrentUserIdSet()) return false; + + // Is the array there and filled? + return ((isset($GLOBALS['user_data'][getCurrentUserId()])) && (count($GLOBALS['user_data'][getCurrentUserId()]) > 1)); +} + +// Setter for current userid +function setCurrentUserId ($userid) { + $GLOBALS['current_userid'] = bigintval($userid); +} + +// Getter for current userid +function getCurrentUserId () { + // Userid must be set before it can be used + if (!isCurrentUserIdSet()) { + // Not set + debug_report_bug('User id is not set.'); + } // END - if + + // Return the userid + return $GLOBALS['current_userid']; +} + +// Checks if current userid is set +function isCurrentUserIdSet () { + return isset($GLOBALS['current_userid']); +} + +// Checks wether we are debugging template cache +function isDebuggingTemplateCache () { + return (getConfig('DEBUG_TEMPLATE_CACHE') == 'Y'); +} + +// Wrapper for fetchUserData() and getUserData() calls +function getFetchedUserData ($keyColumn, $userId, $valueColumn) { + // Default is 'guest' + $data = getMessage('USERNAME_GUEST'); + + // Can we fetch the user data? + if (($userId > 0) && (fetchUserData($userId, $keyColumn))) { + // Now get the data back + $data = getUserData($valueColumn); + } // END - if + + // Return it + return $data; +} + +// Wrapper for strpos() to ease porting from deprecated ereg() function +function isInString ($needle, $haystack) { + return (strpos($haystack, $needle) !== false); +} + +// Wrapper for strpos() to ease porting from deprecated eregi() function +// This function is case-insensitive +function isInStringIgnoreCase ($needle, $haystack) { + return (isInString(strtolower($haystack), strtolower($needle))); +} + // [EOF] ?>