X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fpayout_functions.php;h=c8a9f304de4c355802378fdb7e052a895dc3b798;hb=150ed402878985508f10f4e06d25831e0fb3a1f8;hp=e388bb0222e0a75babb959c816d0f4ab72597dee;hpb=20741b93fd58620af677a7f1039ffd16ea6ec689;p=mailer.git

diff --git a/inc/libs/payout_functions.php b/inc/libs/payout_functions.php
index e388bb0222..c8a9f304de 100644
--- a/inc/libs/payout_functions.php
+++ b/inc/libs/payout_functions.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2011 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 *
@@ -45,40 +45,48 @@ function outputPayoutList ($points) {
 	// Enougth points?
 	if ($points > 0) {
 		// Pay this out!
-		$result = SQL_QUERY_ESC("SELECT
-	`id`,`type`,`rate`,`min_points`
+		$result = sqlQueryEscaped('SELECT
+	`id`,
+	`type`,
+	`rate`,
+	`min_points`
 FROM
 	`{?_MYSQL_PREFIX?}_payout_types`
 WHERE
 	%s >= `min_points`
 ORDER BY
-	`type` ASC",
+	`type` ASC',
 			array($points), __FUNCTION__, __LINE__);
-		if (!SQL_HASZERONUMS($result)) {
+
+		// Some entries found?
+		if (!ifSqlHasZeroNums($result)) {
+			// Init output
+			$OUT = '';
+
 			// Now let's check
-			while ($content = SQL_FETCHARRAY($result)) {
+			while ($content = sqlFetchArray($result)) {
 				// Are these points enougth?
 				if ($points >= $content['min_points']) {
 					// Prepare content for template
 					$content['points'] = translateComma($points * $content['rate'] - 0.5);
 
 					// Load row template
-					$OUT .= loadTemplate('member_payout_li', true, $content);
+					$OUT .= loadTemplate('member_payout_li', TRUE, $content);
 				} // END - if
 			} // END - while
 
 			// Load main template
-			loadTemplate('member_payout_list', true, $OUT);
+			loadTemplate('member_payout_list', TRUE, $OUT);
 		} else {
 			// No payout types setup so far
-			loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
+			displayErrorMessage('{--MEMBER_PAYOUT_SETUP_INCOMPLETE_LOW_POINTS--}');
 		}
 
 		// Free memory
-		SQL_FREERESULT($result);
+		sqlFreeResult($result);
 	} else {
 		// Points is empty
-		loadTemplate('admin_settings_unsaved', false, '{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}');
+		displayErrorMessage('{--MEMBER_PAYOUT_NO_POINTS_ENTERED--}');
 	}
 }
 
@@ -93,10 +101,10 @@ function translatePayoutStatus ($status) {
 
 // "Getter" for payoutable user points
 function getPayoutPoints ($userid) {
-	// Do we have cache?
+	// Is there cache?
 	if (!isset($GLOBALS[__FUNCTION__][$userid])) {
 		// Determine it
-		$GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - countSumTotalData($userid, 'user_data', 'used_points');
+		$GLOBALS[__FUNCTION__][$userid] = countSumTotalData($userid, 'user_points', 'points') - getUserUsedPoints($userid);
 	} // END - if
 
 	// Return it