X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=13a0fce739768900e76644b92ae6df18134708f4;hp=236300372037b127ae81da81092a936139fb5aa3;hb=3bcb292dd0b55177499600c226d5d2aa8a932ce7;hpb=7fabfadce30a7bea7ce3ad1f1e2e7e5e616f2669 diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php index 2363003720..13a0fce739 100644 --- a/inc/wrapper-functions.php +++ b/inc/wrapper-functions.php @@ -137,25 +137,10 @@ function decodeString ($str, $decompress = true) { return $str; } -// Smartly adds slashes -function smartAddSlashes ($unquoted) { - // Do we have cache? - if (!isset($GLOBALS['smart_addslashes'][$unquoted])) { - // Remove slashe - $unquoted = str_replace("\\", '', $unquoted); - - // Put it in cache and add slashes - $GLOBALS['smart_addslashes'][$unquoted] = addslashes($unquoted); - } // END - if - - // Return result - return $GLOBALS['smart_addslashes'][$unquoted]; -} - // Decode entities in a nicer way -function decodeEntities ($str) { +function decodeEntities ($str, $quote = ENT_NOQUOTES) { // Decode the entities to UTF-8 now - $decodedString = html_entity_decode($str, ENT_NOQUOTES, 'UTF-8'); + $decodedString = html_entity_decode($str, $quote, 'UTF-8'); // Return decoded string return $decodedString; @@ -286,7 +271,13 @@ function isInstalled () { $GLOBALS['is_installed'] = ( ( // First is config - getConfig('MXCHANGE_INSTALLED') == 'Y' + ( + ( + isConfigEntrySet('MXCHANGE_INSTALLED') + ) && ( + getConfig('MXCHANGE_INSTALLED') == 'Y' + ) + ) ) || ( // New config file found and loaded isIncludeReadable(getConfig('CACHE_PATH') . 'config-local.php') @@ -312,7 +303,7 @@ function isInstalled () { // Check wether an admin is registered function isAdminRegistered () { - return (getConfig('ADMIN_REGISTERED') == 'Y'); + return ((isConfigEntrySet('ADMIN_REGISTERED')) && (getConfig('ADMIN_REGISTERED') == 'Y')); } // Checks wether the reset mode is active @@ -324,13 +315,13 @@ function isResetModeEnabled () { // Checks wether the debug mode is enabled function isDebugModeEnabled () { // Simply check it - return (getConfig('DEBUG_MODE') == 'Y'); + return ((isConfigEntrySet('DEBUG_MODE')) && (getConfig('DEBUG_MODE') == 'Y')); } // Checks wether we shall debug regular expressions function isDebugRegExpressionEnabled () { // Simply check it - return (getConfig('DEBUG_REGEX') == 'Y'); + return ((isConfigEntrySet('DEBUG_REGEX')) && (getConfig('DEBUG_REGEX') == 'Y')); } // Checks wether the cache instance is valid @@ -422,8 +413,15 @@ function removeFile ($FQFN) { } // Wrapper for $_POST['sel'] -function countPostSelection () { - return countSelection(postRequestElement('sel')); +function countPostSelection ($element = 'sel') { + // Is it set? + if (isPostRequestElementSet($element)) { + // Return counted elements + return countSelection(postRequestElement($element)); + } else { + // Return zero if not found + return 0; + } } // Checks wether the config-local.php is loaded @@ -437,15 +435,15 @@ function isNicknameUsed ($userid) { $isUsed = false; // Is the cache there - if (isset($GLOBALS['cache_probe_nicknames'][$userid])) { + if (isset($GLOBALS['is_nickname_used'][$userid])) { // Then use it - $isUsed = $GLOBALS['cache_probe_nicknames'][$userid]; + $isUsed = $GLOBALS['is_nickname_used'][$userid]; } else { // Determine it $isUsed = ((isExtensionActive('nickname')) && (('' . round($userid) . '') != $userid)); // And write it to the cache - $GLOBALS['cache_probe_nicknames'][$userid] = $isUsed; + $GLOBALS['is_nickname_used'][$userid] = $isUsed; } // Return the result @@ -482,12 +480,12 @@ function setWhatFromConfig ($configEntry) { } // Checks wether what is set and optionally aborts on miss -function isWhatSet ($abortOnMiss = false) { +function isWhatSet ($strict = false) { // Check for it $isset = (isset($GLOBALS['what'])); // Should we abort here? - if (($abortOnMiss === true) && ($isset === false)) { + if (($strict === true) && ($isset === false)) { // Output backtrace debug_report_bug('what is empty.'); } // END - if @@ -517,12 +515,12 @@ function setAction ($newAction) { } // Checks wether action is set and optionally aborts on miss -function isActionSet ($abortOnMiss = false) { +function isActionSet ($strict = false) { // Check for it $isset = (isset($GLOBALS['action'])); // Should we abort here? - if (($abortOnMiss === true) && ($isset === false)) { + if (($strict === true) && ($isset === false)) { // Output backtrace debug_report_bug('action is empty.'); } // END - if @@ -532,12 +530,12 @@ function isActionSet ($abortOnMiss = false) { } // Getter for 'module' value -function getModule () { +function getModule ($strict = true) { // Default is null $module = null; // Is the value set? - if (isModuleSet(true)) { + if (isModuleSet($strict)) { // Then use it $module = $GLOBALS['module']; } // END - if @@ -553,14 +551,14 @@ function setModule ($newModule) { } // Checks wether module is set and optionally aborts on miss -function isModuleSet ($abortOnMiss = false) { +function isModuleSet ($strict = false) { // Check for it $isset = (!empty($GLOBALS['module'])); // Should we abort here? - if (($abortOnMiss === true) && ($isset === false)) { + if (($strict === true) && ($isset === false)) { // Output backtrace - print '
';
+		print 'Module not set!
';
 		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)));
 }
 
@@ -700,5 +700,64 @@ 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 () {
+	// User id should not be zero
+	if (getCurrentUserId() < 1) debug_report_bug(__FUNCTION__.': User id is zero.');
+
+	// Get the whole array
+	return $GLOBALS['user_data'][getCurrentUserId()];
+}
+
+// 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']);
+}
+
 // [EOF]
 ?>