X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-transfer.php;h=a141f3009a907bc2e0cbd3e6180508b89802c91f;hb=4cc62618b7a59c6641b057c34047b2dd531c16ad;hp=e0d8f1fbc9a49c8e3f989163cc5ca07ce84f4d21;hpb=29385a0483bbcbbe940a32a49d488b1d5add15c5;p=mailer.git

diff --git a/inc/modules/member/what-transfer.php b/inc/modules/member/what-transfer.php
index e0d8f1fbc9..a141f3009a 100644
--- a/inc/modules/member/what-transfer.php
+++ b/inc/modules/member/what-transfer.php
@@ -62,7 +62,7 @@ if ((getUserData('opt_in') != 'Y') && ($mode == 'new')) $mode = '';
 switch ($mode) {
 	case 'new': // Start new transfer
 		// Get total points and subtract the balance amount from it = maximum transferable points
-		$total = countSumTotalData(getMemberId(), 'user_points', 'points')  - countSumTotalData(getMemberId(), 'user_data', 'used_points');
+		$total = getTotalPoints(getMemberId());
 
 		// Remember maximum value for template
 		$content['max_transferable'] = round($total - getConfig('transfer_balance') - 0.5);
@@ -88,7 +88,7 @@ switch ($mode) {
 			$valid_reason = (isPostRequestParameterSet('reason'));
 
 			// Test if a recipient is selected
-			$valid_recipient = (postRequestParameter('to_userid') > 0);
+			$valid_recipient = isValidUserId(postRequestParameter('to_userid'));
 
 			// Check for nickname extension and set additional data
 			// @TODO Rewrite this to a filter
@@ -215,15 +215,15 @@ switch ($mode) {
 					array(getMemberId()), __FILE__, __LINE__);
 			}
 
-			if (SQL_NUMROWS($result) > 0) {
+			if (!SQL_HASZERONUMS($result)) {
 				// Load list
-				$OUT  = "<select name=\"to_userid\" size=\"1\" class=\"member_select\">
-	<option value=\"0\">{--SELECT_NONE--}</option>\n";
+				$OUT  = '<select name="to_userid" size="1" class="member_select">
+	<option value="0">{--SELECT_NONE--}</option>';
 				// @TODO Try to rewrite his to $content = SQL_FETCHARRAY(), see some lines above for two different queries
 				while (list($userid, $nick) = SQL_FETCHROW($result)) {
-					$OUT .= "	<option value=\"".$userid."\"";
-					if ((isPostRequestParameterSet(('to_userid'))) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
-					$OUT .= ">";
+					$OUT .= '	<option value="' . $userid . '"';
+					if ((isPostRequestParameterSet('to_userid')) && (postRequestParameter('to_userid') == $userid)) $OUT .= ' selected="selected"';
+					$OUT .= '>';
 					if (($nick != $userid) && (!empty($nick))) {
 						// Output nickname
 						$OUT .= $nick;
@@ -231,9 +231,9 @@ switch ($mode) {
 						// Output userid
 						$OUT .= $userid;
 					}
-					$OUT .= "</option>\n";
+					$OUT .= '</option>';
 				}
-				$OUT .= "</select>\n";
+				$OUT .= '</select>';
 				$content['to_disabled'] = '';
 
 				// Free memory
@@ -299,8 +299,8 @@ switch ($mode) {
 		$result = SQL_QUERY_ESC($sql, array(getMemberId()), __FILE__, __LINE__);
 
 		// Do we have entries?
-		if (SQL_NUMROWS($result) > 0) {
-			$OUT = ''; $SW = 2;
+		if (!SQL_HASZERONUMS($result)) {
+			$OUT = '';
 			// @TODO This should be somehow rewritten to $row = SQL_FETCHARRAY(), see switch() block above for SQL queries
 			while (list($tid, $userid, $points, $reason, $stamp) = SQL_FETCHROW($result)) {
 				// Rewrite points
@@ -309,7 +309,6 @@ switch ($mode) {
 				// Prepare content for template
 				// @TODO Rewrite: tid->trans_id,stamp->time_trans
 				$row = array(
-					'sw'       => $SW,
 					'trans_id' => $tid,
 					'stamp'    => generateDateTime($stamp, 3),
 					'userid'   => $userid,
@@ -322,18 +321,17 @@ switch ($mode) {
 
 				// Add points and switch color
 				$totalPoints += $points;
-				$SW = 3 - $SW;
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 		} else {
 			// Nothing for in or out
-			$OUT = "<tr>
-  <td colspan=\"5\" align=\"center\" class=\"bottom\">
-    ".loadTemplate('admin_settings_saved', true, $nothingMessage)."
+			$OUT = '<tr>
+  <td colspan="5" align="center" class="bottom">
+    ' . loadTemplate('admin_settings_saved', true, $nothingMessage) . '
   </td>
-</tr>";
+</tr>';
 		}
 
 		// ... and add them to a constant for the template
@@ -387,19 +385,18 @@ KEY (`party_userid`)
 		SQL_FREERESULT($result);
 
 		$total = '0';
-		if (SQL_NUMROWS($result) > 0) {
+		if (!SQL_HASZERONUMS($result)) {
 			// Search for entries
 			$result = SQL_QUERY("SELECT `party_userid`, `trans_id`, `points`, `reason`, `time_trans`, `trans_type` FROM `{?_MYSQL_PREFIX?}_transfers_tmp` ORDER BY `time_trans` DESC",
 				__FILE__, __LINE__);
 
 			// Output rows
-			$OUT = ''; $SW = 2;
+			$OUT = '';
 			while ($content = SQL_FETCHARRAY($result)) {
 				// Rewrite points
 				if ($content['trans_type'] == 'OUT') $content['points'] = '-'.$content['points']."";
 
 				// Prepare content for template
-				$content['sw']     = $SW;
 				$content['time']   = generateDateTime($content['time_trans'], 3);
 				$content['points'] = translateComma($content['points']);
 
@@ -408,7 +405,6 @@ KEY (`party_userid`)
 
 				// Add points and switch color
 				$total += $content['points'];
-				$SW = 3 - $SW;
 			} // END - while
 
 			// Free memory