X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-payout.php;h=dadbf5b6bac0df4a1d6b94285e98ee8f95cca539;hp=3a7c048194f9b94eae3ec4ab7cc61cb739a7d850;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6

diff --git a/inc/modules/member/what-payout.php b/inc/modules/member/what-payout.php
index 3a7c048194..dadbf5b6ba 100644
--- a/inc/modules/member/what-payout.php
+++ b/inc/modules/member/what-payout.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 *
@@ -99,7 +100,7 @@ ORDER BY
 			$OUT = ''; $SW = 2;
 			while ($content = SQL_FETCHARRAY($result_payouts)) {
 				// Translate status
-				$content['status'] = getMessage('PAYOUT_MEMBER_STATUS_'.strtoupper($content['status']).'');
+				$content['status'] = translatePayoutStatus();
 				$content['status'] = '<div class="member_failed">' . $content['status'] . '</div>';
 
 				// Nothing entered must be secured in member/what-payputs.php !
@@ -107,7 +108,7 @@ ORDER BY
 					// Banner/Textlink views/clicks request
 					if (!empty($content['banner'])) {
 						// Banner
-						$content['target_account'] = "<img src=\"".$content['banner']."\" alt=\"".$content['alt']."\" title=\"".$content['alt']."\" border=\"0\" />";
+						$content['target_account'] = '<img src="' . $content['banner'] . '" alt="' . $content['alt'] . '" title="' . $content['alt'] . '" border="0" />';
 					} else {
 						// Textlink
 						$content['target_account'] = $content['alt'];
@@ -123,10 +124,11 @@ ORDER BY
 				$content = array(
 					'sw'               => $SW,
 					'target_account'   => $content['target_account'],
-					'points'           => translateComma($content['payout_total']) . ' ' . $content['type'],
+					'payout_total'     => $content['payout_total'],
 					'target_bank'      => $content['target_bank'],
 					'payout_timestamp' => generateDateTime($content['payout_timestamp'], 2),
-					'status'           => $content['status']
+					'status'           => $content['status'],
+					'type'             => $content['type'],
 				);
 
 				// Load row template and switch colors
@@ -145,7 +147,7 @@ ORDER BY
 		outputPayoutList($totalPoints);
 	} else {
 		// No payout types setup
-		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_NO_PAYOUT_TYPES'));
+		loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_SETUP_INCOMPLETE--}');
 	}
 } else {
 	// Chedk if he can get paid by selected type
@@ -194,7 +196,7 @@ VALUES (%s,%s,%s, UNIX_TIMESTAMP(), 'NEW','%s','%s','%s')",
 
 					// Load templates
 					$message_mem = loadEmailTemplate('member_payout_request_banner', postRequestArray(), getMemberId());
-					if (getExtensionVersion('admins') >= '0.4.1') {
+					if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
 						$adm_tpl = 'admin_payout_request_banner';
 					} else {
 						$message_adm = loadEmailTemplate('admin_payout_request_banner', postRequestArray(), getMemberId());
@@ -218,22 +220,22 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 					$admin_tpl = '';
 
 					// @TODO Rewrite this to a filter
-					if (getExtensionVersion('admins') >= '0.4.1') {
+					if (isExtensionInstalledAndNewer('admins', '0.4.1')) {
 						$admin_tpl = 'admin_payout_request';
 					} // END - if
 				}
 
 				// Generate task
-				createNewTask('[payout:] {--PAYOUT_REQUEST_ADMIN--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
+				createNewTask('[payout:] {--ADMIN_PAYOUY_REQUEST_SUBJ--}', $message_adm, 'PAYOUT_REQUEST', getMemberId());
 
 				// Send out mails
-				sendEmail(getMemberId(), getMessage('PAYOUT_REQUEST_MEMBER'), $message_mem);
+				sendEmail(getMemberId(), getMessage('MEMBER_PAYOUT_REQUEST_SUBJ'), $message_mem);
 
 				// To admin(s)
-				sendAdminNotification(getMessage('PAYOUT_REQUEST_ADMIN'), $admin_tpl, postRequestArray(), getMemberId());
+				sendAdminNotification(getMessage('ADMIN_PAYOUY_REQUEST_SUBJ'), $admin_tpl, postRequestArray(), getMemberId());
 
 				// Load template and output it
-				loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_REQUEST_SENT'));
+				loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_REQUEST_SENT--}');
 			} elseif ($content['allow'] == 'Y') {
 				// Prepare content
 				$content = array(
@@ -257,11 +259,11 @@ VALUES (%s,%s,%s,'%s',%s, UNIX_TIMESTAMP(), 'NEW','%s')",
 			}
 		} else {
 			// Not enougth points
-			loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_POINTS_NOT_ENOUGTH'));
+			loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_POINTS_NOT_ENOUGTH--}');
 		}
 	} else {
 		// id is invalid
-		loadTemplate('admin_settings_saved', false, getMessage('PAYOUT_ID_INVALID'));
+		loadTemplate('admin_settings_saved', false, '{--MEMBER_PAYOUT_ID_INVALID--}');
 	}
 
 	// Free result