X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fdoubler_functions.php;h=4e312104a49ad68fe62b0580d1d75380edcbe135;hb=b5e396d81912f97a5752b4a4e61ae08f7c1efbd5;hp=fc13a2f44c16d3c023b673253c39cae3ab6f7246;hpb=32f930539d6b5cb5e603bece41277f3e5cca8fa9;p=mailer.git

diff --git a/inc/libs/doubler_functions.php b/inc/libs/doubler_functions.php
index fc13a2f44c..4e312104a4 100644
--- a/inc/libs/doubler_functions.php
+++ b/inc/libs/doubler_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 // @TODO Lame description
 function generateDoublerTable ($userid = NULL, $done = 'N', $ref = 'N', $sort = 'ASC') {
 	$add = ''; $DT_MODE = '0';
-	if (isValidUserId($userid)) {
+	if (isValidId($userid)) {
 		// Load entries only from a single user
 		$add = sprintf(" AND `userid`=%s", bigintval($userid));
 		$mode = 'member'; $COLS = 4; $DT_MODE = 2;
@@ -67,7 +67,7 @@ function generateDoublerTable ($userid = NULL, $done = 'N', $ref = 'N', $sort =
 	}
 
 	// List entries
-	$result = SQL_QUERY_ESC("SELECT
+	$result = sqlQueryEscaped("SELECT
 	`userid`,
 	`refid`,
 	`points`,
@@ -88,10 +88,10 @@ LIMIT %s",
 			$limit
 		), __FUNCTION__, __LINE__);
 
-	if (!SQL_HASZERONUMS($result)) {
+	if (!ifSqlHasZeroNums($result)) {
 		// List entries
 		$OUT = '';
-		while ($content = SQL_FETCHARRAY($result)) {
+		while ($content = sqlFetchArray($result)) {
 			// Rewrite userid/refid only if admin is in
 			// @TODO Can't this be moved into EL?
 			if (isAdmin()) {
@@ -100,8 +100,8 @@ LIMIT %s",
 				$content['refid']  = '---';
 
 				// Set links to admin area
-				if (isValidUserId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']);
-				if (isValidUserId($content['refid']))  $content['refid']  = generateUserProfileLink($content['refid']);
+				if (isValidId($content['userid'])) $content['userid'] = generateUserProfileLink($content['userid']);
+				if (isValidId($content['refid']))  $content['refid']  = generateUserProfileLink($content['refid']);
 			} // END - if
 
 			// Prepare data for the row template
@@ -112,7 +112,7 @@ LIMIT %s",
 		} // END - while
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} else {
 		// List no entries
 		$OUT = '<tr>
@@ -127,6 +127,7 @@ LIMIT %s",
 }
 
 // Get total points left in doubler pot
+// @TODO This could be rewritten to a filter
 function getDoublerTotalPointsLeft() {
 	// Initialize variables
 	$points = '0';
@@ -137,16 +138,13 @@ function getDoublerTotalPointsLeft() {
 	} // END - if
 
 	if ((getConfig('doubler_jackpot') == 'Y') && (isExtensionActive('jackpot'))) {
-		// Load jackpot
-		$jackpot = getJackpotPoints();
-
-		if (!empty($jackpot)) $points += $jackpot;
+		// Get+add jackpot points
+		$points += getJackpotPoints();
 	} // END - if
 
-	if (isValidUserId(getDoublerUserid())) {
+	if (isValidId(getDoublerUserid())) {
 		// Get user's points
-		$user = getTotalPoints(getDoublerUserid());
-		$points += $user;
+		$points += getTotalPoints(getDoublerUserid());
 	} // END - if
 
 	// Return value
@@ -265,5 +263,17 @@ function getDoublerCharge () {
 	return $GLOBALS[__FUNCTION__];
 }
 
+// "Getter" for doubler_max_sent
+function getDoublerMaxSent () {
+	// Is there cache?
+	if (!isset($GLOBALS[__FUNCTION__])) {
+		// Determine it
+		$GLOBALS[__FUNCTION__] = getConfig('doubler_max_sent');
+	} // END - if
+
+	// Return cache
+	return $GLOBALS[__FUNCTION__];
+}
+
 // [EOF]
 ?>