X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fdoubler_functions.php;h=5e331bd71e3873c224bf336c71f0eb6a12d973c1;hb=30ae22f62ae87c53a56baf0d134569ba91011111;hp=2a2100f59272ed2a4613f8525377ed613aa071ff;hpb=263a089d8a499e0e26d0af9e7aa7639f88b8ca60;p=mailer.git

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index 2a2100f592..5e331bd71e 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -50,11 +51,11 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
 		// Load entries only from a single user
 		$add = sprintf(" AND `userid`=%s", bigintval($userid));
 		$mode = 'member'; $COLS = 4; $DT_MODE = 2;
-		$message = getMessage('DOUBLER_MEMBER_NO_ENTRIES_FOUND');
+		$message = '{--DOUBLER_MEMBER_NO_ENTRIES_FOUND--}';
 	} else {
 		// Guest mode!
 		$mode = 'guest'; $COLS = 3; $DT_MODE = 3;
-		$message = getMessage('DOUBLER_GUEST_NO_ENTRIES_FOUND');
+		$message = '{--DOUBLER_GUEST_NO_ENTRIES_FOUND--}';
 	}
 
 	if (($done == 'Y') && ($sort == 'ASC')) {
@@ -69,58 +70,67 @@ function generateDoublerTable ($userid = '0', $done = 'N', $ref = 'N', $sort = '
 	}
 
 	// List entries
-	$result = SQL_QUERY("SELECT
+	$result = SQL_QUERY_ESC("SELECT
 	`userid`, `refid`, `points`, `timemark`
 FROM
 	`{?_MYSQL_PREFIX?}_doubler`
 WHERE
-	`completed`='".$done."' AND `is_ref`='".$ref."'".$add."
+	`completed`='%s' AND `is_ref`='%s'" . $add . "
 ORDER BY
-	`timemark` ".$sort."
-LIMIT ".$limit, __FUNCTION__, __LINE__);
+	`timemark` %s
+LIMIT %s",
+		array(
+			$done,
+			$ref,
+			$sort,
+			$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 ($content['userid'] > 0) { $content['userid'] = generateUserProfileLink($content['userid']); } else { $content['userid'] = '---'; }
-				if ($content['refid'] > 0)  { $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'   => translateComma($content['points']),
+				'points'   => $content['points'],
 				'timemark' => generateDateTime($content['timemark'], $DT_MODE),
-				'sw'       => $SW,
 			);
 
 			// Load template and switch color
 			$OUT .= loadTemplate($mode . '_doubler_list_rows', true, $content);
-			$SW = 3 - $SW;
-		}
+		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result);
 	} else {
 		// List no entries
-		$OUT = "<tr>
-  <td colspan=\"".$COLS."\" align=\"center\" class=\"doubler_big_row bottom2\">
-    ".loadTemplate('admin_settings_saved', true, $message)."
+		$OUT = '<tr>
+  <td colspan="' . $COLS . '" align="center" class="doubler_big_row bottom">
+    ' . loadTemplate('admin_settings_saved', true, $message) . '
   </td>
-</tr>\n";
+</tr>';
 	}
 
 	// Return template
 	return loadTemplate($mode . '_doubler_list', true, $OUT);
 }
 
-//
-function DOUBLER_GET_TOTAL_POINTS_LEFT() {
+// Get total points left in doubler pot
+function getDoublerTotalPointsLeft() {
 	// Initialize variables
 	$points = '0';
 
@@ -136,7 +146,7 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
 		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');
 		$points += $user;
@@ -145,5 +155,6 @@ function DOUBLER_GET_TOTAL_POINTS_LEFT() {
 	// Return value
 	return $points;
 }
-//
+
+// [EOF]
 ?>