X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fdoubler_functions.php;h=427c74b326b06d4667dd049fef44e470bde2d426;hb=9553dbc9eed40bfa2beffa79813f2d5cd21fa8ac;hp=8a455f6ea04a2ff609cc791fa2dd8ed7e390e0e1;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc;p=mailer.git

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 8a455f6ea0..427c74b326 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -47,15 +47,15 @@ if (!defined('__SECURITY')) {
 function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = 'ASC') {
 	if (empty($cnt)) $cnt = '0';
 	$add = ''; $DT_MODE = '0';
-	if ($userid > 0) {
+	if (isValidUserId($userid)) {
 		// Load entries only from a single user
 		$add = sprintf(" AND `userid`=%s", bigintval($userid));
 		$mode = 'member'; $COLS = 4; $DT_MODE = 2;
-		$message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}';
+		$message = '{--MEMBER_DOUBLER_NO_ENTRIES_FOUND--}';
 	} else {
 		// Guest mode!
 		$mode = 'guest'; $COLS = 3; $DT_MODE = 3;
-		$message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}';
+		$message = '{--GUEST_DOUBLER_NO_ENTRIES_FOUND--}';
 	}
 
 	if (($done == 'Y') && ($sort == 'ASC')) {
@@ -86,30 +86,27 @@ LIMIT %s",
 			$limit
 		), __FUNCTION__, __LINE__);
 
-	if (SQL_NUMROWS($result) > 0) {
+	if (!SQL_HASZERONUMS($result)) {
 		// List entries
-		$OUT = ''; $SW = 2;
+		$OUT = '';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Rewrite userid/refid only if admin is in
 			// @TODO Can't this be moved into EL?
 			if (isAdmin()) {
+				// Set empty userid/refid
+				$content['userid'] = '---';
+				$content['refid']  = '---';
+
 				// Set links to admin area
-				if (isValidUserId($content['userid'])) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-				if (isValidUserId($content['refid']))  { $content['refid']  = generateUserProfileLink($content['refid']);  } else { $content['refid']  = '---'; }
+				if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']);
+				if (isValidUserId($content['refid']))  $content['refid']  = generateUserProfileLink($content['refid']);
 			} // END - if
 
 			// Prepare data for the row template
-			$content = array(
-				'userid'   => $content['userid'],
-				'rid'      => $content['refid'],
-				'points'   => $content['points'],
-				'timemark' => generateDateTime($content['timemark'], $DT_MODE),
-				'sw'       => $SW,
-			);
+			$content['timemark'] = generateDateTime($content['timemark'], $DT_MODE);
 
 			// Load template and switch color
 			$OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
-			$SW = 3 - $SW;
 		} // END - while
 
 		// Free memory
@@ -117,7 +114,7 @@ LIMIT %s",
 	} else {
 		// List no entries
 		$OUT = '<tr>
-  <td colspan="' . $COLS . '" align="center" class="doubler_big_row bottom">
+  <td colspan="' . $COLS . '" align="center" class="bottom">
     ' . loadTemplate('admin_settings_saved', true, $message) . '
   </td>
 </tr>';
@@ -144,9 +141,9 @@ function getDoublerTotalPointsLeft() {
 		if (!empty($jackpot)) $points += $jackpot;
 	} // END - if
 
-	if (getConfig('doubler_userid') > 0) {
+	if (isValidUserId(getConfig('doubler_userid'))) {
 		// Get user's points
-		$user = countSumTotalData(getConfig('doubler_userid'), 'user_points', 'points');
+		$user = getTotalPoints(getConfig('doubler_userid'));
 		$points += $user;
 	} // END - if
 
@@ -154,5 +151,17 @@ function getDoublerTotalPointsLeft() {
 	return $points;
 }
 
+// "Getter" for doubler_userid
+function getDoublerUserid () {
+	// Is it cached?
+	if (!isset($GLOBALS['doubler_userid'])) {
+		// Get it
+		$GLOBALS['doubler_userid'] = getConfig('doubler_userid');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS['doubler_userid'];
+}
+
 // [EOF]
 ?>