X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=18b9be1b48bf06c2a706ec29932637bf6465c705;hb=2710fcbafc1d3866e75cba4b96a5ca0457b9e327;hp=33bbd3fd13af8fa5cd3d58d1d4c7fa5b96341bfc;hpb=dc648adadd6549e7416938a8d26bedf3ec519f99;p=mailer.git

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 33bbd3fd13..18b9be1b48 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -371,10 +371,10 @@ function isMember () {
 	if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
 
 	// is the cache entry there?
-	if (isset($GLOBALS['is_member'])) {
+	if (isset($GLOBALS[__FUNCTION__])) {
 		// Then return it
-		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
-		return $GLOBALS['is_member'];
+		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
+		return $GLOBALS[__FUNCTION__];
 	} elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
 		// No member
 		//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
@@ -424,7 +424,7 @@ function isMember () {
 	}
 
 	// Cache status
-	$GLOBALS['is_member'] = $ret;
+	$GLOBALS[__FUNCTION__] = $ret;
 
 	// Return status
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
@@ -442,7 +442,7 @@ function fetchUserData ($userid, $column = 'userid') {
 		setCurrentUserId($userid);
 
 		// Don't look for invalid userids...
-		if ($userid < 1) {
+		if (!isValidUserId($userid)) {
 			// Invalid, so abort here
 			debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
 		} elseif (isUserDataValid()) {
@@ -540,9 +540,9 @@ function isAdmin () {
 	} // END - if
 
 	// Do we have cache?
-	if (!isset($GLOBALS['is_admin'][$adminId])) {
+	if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
 		// Init it with failed
-		$GLOBALS['is_admin'][$adminId] = false;
+		$GLOBALS[__FUNCTION__][$adminId] = false;
 
 		// Search in array for entry
 		if (isset($GLOBALS['admin_hash'])) {
@@ -568,12 +568,12 @@ function isAdmin () {
 		if (!empty($valPass)) {
 			// Check if password is valid
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
-			$GLOBALS['is_admin'][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
+			$GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
 		} // END - if
 	} // END - if
 
 	// Return result of comparision
-	return $GLOBALS['is_admin'][$adminId];
+	return $GLOBALS[__FUNCTION__][$adminId];
 }
 
 // Generates a list of "max receiveable emails per day"
@@ -716,7 +716,7 @@ function getActionFromModuleWhat ($module, $what) {
 	// Init status
 	$data['action'] = '';
 
-	//* DEBUG: */ debugOutput(__LINE__.'='.$module.'/'.$what.'/'.getAction().'=');
+	//* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
 	if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
 		// sql_patches is missing so choose depending on mode
 		if (isWhatSet()) {
@@ -1063,7 +1063,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
 
 			// Determine wether the user has some mails to click before he/she gets the points
 			$locked = false;
-			if ((getUserData('ref_payout') > 0) && (!isDirectPaymentAllowed())) $locked = true;
+			if ((getUserData('ref_payout') > 0) && (!isDirectPaymentEnabled())) $locked = true;
 
 			// Prepare data for the filter
 			$filterData = array(
@@ -1379,11 +1379,11 @@ function getAdminDefaultAcl ($adminId) {
 }
 
 // Generates an option list from various parameters
-function generateOptionList ($table, $id, $name, $default='', $special='', $where='', $disabled=array()) {
+function generateOptionList ($table, $id, $name, $default = '', $special = '', $where = '', $disabled = array(), $callback = '') {
 	$ret = '';
 	if ($table == '/ARRAY/') {
 		// Selection from array
-		if ((is_array($id)) && (is_array($name)) && (count($id)) == (count($name))) {
+		if ((is_array($id)) && (is_array($name)) && ((count($id)) == (count($name)) || (!empty($callback)))) {
 			// Both are arrays
 			foreach ($id as $idx => $value) {
 				$ret .= '<option value="' . $value . '"';
@@ -1394,11 +1394,19 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 					// Disabled!
 					$ret .= ' disabled="disabled"';
 				}
+
+				// Is the call-back function set?
+				if (!empty($callback)) {
+					// Call it
+					$name[$idx] = call_user_func_array($callback, array($id[$idx]));
+				} // END - if
+
+				// Finish option tag
 				$ret .= '>' . $name[$idx] . '</option>';
 			} // END - foreach
 		} else {
 			// Problem in request
-			debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name));
+			debug_report_bug(__FUNCTION__, __LINE__, 'Not all are arrays: id[' . count($id) . ']=' . gettype($id) . ',name[' . count($name) . ']=' . gettype($name) . ',callback=' . $callback);
 		}
 	} else {
 		// Data from database
@@ -1428,7 +1436,17 @@ function generateOptionList ($table, $id, $name, $default='', $special='', $wher
 					// Disabled!
 					$ret .= ' disabled="disabled"';
 				}
+
+				// Add it, if set
 				if (!empty($add)) $add = ' ('.$add.')';
+
+				// Is the call-back function set?
+				if (!empty($callback)) {
+					// Call it
+					$title = call_user_func_array($callback, array($title));
+				} // END - if
+
+				// Finish option list
 				$ret .= '>' . $title . $add . '</option>';
 			} // END - while
 		} else {