X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fwrapper-functions.php;h=ed8fad086bb4ad58d4f96dedf18b521f6637ac89;hb=64ff2491fee39d74f3afd4b7cb29ecae4ebb3254;hp=9b27b66fee470c90631668d7dd5dce21a94b41ae;hpb=a44235215a481489b76a39269cf98b170901186b;p=mailer.git

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 9b27b66fee..ed8fad086b 100644
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -554,7 +554,7 @@ function isNicknameUsed ($userid) {
 	// Is the cache there
 	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__][$userid] = (('' . round($userid) . '') != $userid);
+		$GLOBALS[__FUNCTION__][$userid] = ((!empty($userid)) && (('' . round($userid) . '') != $userid));
 	} // END - if
 
 	// Return the result
@@ -740,7 +740,7 @@ function addPointsDirectly ($subject, $userid, $points) {
 	unset($GLOBALS['ref_level']);
 
 	// Call more complicated method (due to more parameters)
-	return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'direct');
+	return addPointsThroughReferalSystem($subject, $userid, $points, false, 0, 'DIRECT');
 }
 
 // Wrapper for redirectToUrl but URL comes from a configuration entry
@@ -752,7 +752,7 @@ function redirectToConfiguredUrl ($configEntry) {
 // Wrapper function to redirect from member-only modules to index
 function redirectToIndexMemberOnlyModule () {
 	// Do the redirect here
-	redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
+	redirectToUrl('modules.php?module=index&code=' . getCode('MODULE_MEMBER_ONLY') . '&mod=' . getModule());
 }
 
 // Wrapper function to redirect to current URL
@@ -761,9 +761,9 @@ function redirectToRequestUri () {
 }
 
 // Wrapper function to redirect to de-refered URL
-function redirectToDereferedUrl ($URL) {
+function redirectToDereferedUrl ($url) {
 	// Redirect to to
-	redirectToUrl(generateDerefererUrl($URL));
+	redirectToUrl(generateDerefererUrl($url));
 }
 
 // Wrapper function for checking if extension is installed and newer or same version
@@ -948,6 +948,18 @@ function getUserData ($column) {
 	return $GLOBALS['user_data'][getCurrentUserId()][$column];
 }
 
+// Checks wether given user data is set to 'Y'
+function isUserDataEnabled ($column) {
+	// Do we have cache?
+	if (!isset($GLOBALS[__FUNCTION__][getCurrentUserId()][$column]))
+		// Determine it
+		$GLOBALS[__FUNCTION__][getCurrentUserId()][$column] = (getUserData($column) == 'Y');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__][getCurrentUserId()][$column];
+}
+
 // Geter for whole user data array
 function getUserDataArray () {
 	// Get user id
@@ -1148,7 +1160,11 @@ function getTotalConfirmedUser () {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Then do it
-		$GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+		if (isExtensionActive('user')) {
+			$GLOBALS[__FUNCTION__] = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true);
+		} else {
+			$GLOBALS[__FUNCTION__] = 0;
+		}
 	} // END - if
 
 	// Return cached value
@@ -1160,7 +1176,11 @@ function getTotalUnconfirmedUser () {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Then do it
-		$GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+		if (isExtensionActive('user')) {
+			$GLOBALS[__FUNCTION__] = countSumTotalData('UNCONFIRMED', 'user_data', 'userid', 'status', true);
+		} else {
+			$GLOBALS[__FUNCTION__] = 0;
+		}
 	} // END - if
 
 	// Return cached value
@@ -1172,7 +1192,11 @@ function getTotalLockedUser () {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__])) {
 		// Then do it
-		$GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+		if (isExtensionActive('user')) {
+			$GLOBALS[__FUNCTION__] = countSumTotalData('LOCKED', 'user_data', 'userid', 'status', true);
+		} else {
+			$GLOBALS[__FUNCTION__] = 0;
+		}
 	} // END - if
 
 	// Return cached value
@@ -1220,7 +1244,9 @@ function getYear ($timestamp = null) {
 	// Is it cached?
 	if (!isset($GLOBALS[__FUNCTION__][$timestamp])) {
 		// null is time()
-		if (is_null($timestamp)) $timestamp = time();
+		if (is_null($timestamp)) {
+			$timestamp = time();
+		} // END - if
 
 		// Then create it
 		$GLOBALS[__FUNCTION__][$timestamp] = date('Y', $timestamp);
@@ -2333,8 +2359,17 @@ function isVerboseSqlEnabled () {
 function getTotalPoints ($userid) {
 	// Do we have cache?
 	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
+		// Init array for filter chain
+		$data = array(
+			'userid' => $userid,
+			'points' => 0
+		);
+
+		// Run filter chain for getting more point values
+		$data = runFilter('get_total_points', $data);
+
 		// Determine it
-		$GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+		$GLOBALS[__FUNCTION__][$userid] = $data['points']  - countSumTotalData($userid, 'user_data', 'used_points');
 	} // END - if
 
 	// Return cache
@@ -2471,5 +2506,29 @@ function convertCommaToDotInPostDataArray (array $postEntries) {
 	} // END - foreach
 }
 
+// Getter for 'check_double_email'
+function getCheckDoubleEmail () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = getConfig('check_double_email');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
+// Checks wether 'check_double_email' is "YES"
+function isCheckDoubleEmailEnabled () {
+	// Is the cache entry set?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// No, so determine it
+		$GLOBALS[__FUNCTION__] = (getCheckDoubleEmail() == 'Y');
+	} // END - if
+
+	// Return cached entry
+	return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>