X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_payouts.php;h=b312d6533852f3a03abe0704279273b99026544f;hb=11a9294db20070dc0c2f578d3a91b69cc7c1182d;hp=b846eb8b56352f3925ca4d6267d15375ff2ecb67;hpb=425acd4e0e78608016f9fc2872aafc0140f49b71;p=mailer.git

diff --git a/inc/modules/admin/what-list_payouts.php b/inc/modules/admin/what-list_payouts.php
index b846eb8b56..b312d65338 100644
--- a/inc/modules/admin/what-list_payouts.php
+++ b/inc/modules/admin/what-list_payouts.php
@@ -14,11 +14,9 @@
  * $Date::                                                            $ *
  * $Tag:: 0.2.1-FINAL                                                 $ *
  * $Author::                                                          $ *
- * Needs to be in all Files and every File needs "svn propset           *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (isGetRequestParameterSet('pid')) {
 	// First let's get the member's id
@@ -62,7 +60,7 @@ if (isGetRequestParameterSet('pid')) {
 		if (empty($taskId)) $taskId = '0';
 	} elseif ((empty($userid)) || ($userid == '0')) {
 		// Cannot obtain member id!
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
+		displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERID--}');
 	} else {
 		// Get task id from URL
 		$taskId = getRequestParameter('task');
@@ -145,14 +143,14 @@ LIMIT 1",
 						// Output message
 						if ($data['allow_url'] == 'Y') {
 							// Banner / Textlink request
-							loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
+							displayMessage('{--ADMIN_PAYOUT_BANNER_ACCEPTED_NOTIFIED--}');
 						} else {
 							// Normal request
-							loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
+							displayMessage('{--ADMIN_PAYOUT_ACCEPTED_NOTIFIED--}');
 						}
 
 						// Finally send mail
-						sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
+						sendEmail(getUserData('userid'), '{--MEMBER_PAYOUT_ACCEPTED_SUBJECT--}', $message);
 					} else {
 						// Something goes wrong... :-(
 						$content = implode('<br />', $ret);
@@ -160,14 +158,14 @@ LIMIT 1",
 					}
 				} else {
 					// Cannot load payout id
-					loadTemplate('admin_settings_saved', false, '<div class="admin_failed">{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}</div>');
+					loadTemplate('admin_settings_unsaved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_PAYOUT_ID--}');
 				}
 			} else {
 				// Prepare content
 				$content = array(
 					'task' => $taskId,
 					'pid'  => bigintval(getRequestParameter('pid')),
-					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
 				);
 
 				// Load template
@@ -189,16 +187,16 @@ LIMIT 1",
 				$message = loadEmailTemplate('member_payout_rejected', postRequestParameter('text'), $userid);
 
 				// Output message
-				loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
+				displayMessage('{--ADMIN_PAYOUT_REJECTED_NOTIFIED--}');
 
 				// Finally send mail
-				sendEmail(getUserData('email'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
+				sendEmail(getUserData('userid'), '{--MEMBER_PAYOUT_REJECTED_SUBJECT--}', $message);
 			} else {
 				// Prepare content
 				$content = array(
 					'task' => $taskId,
 					'pid'  => bigintval(getRequestParameter('pid')),
-					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">' . translateGender(getUserData('gender')) . ' ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
+					'user' => '<a href="' . generateEmailLink(getUserData('email'), 'user_data') . '">{%pipe,translateGender=' . getUserData('gender') . '%} ' . getUserData('surname') . ' ' . getUserData('family') . '</a>',
 				);
 
 				// Load template
@@ -206,11 +204,11 @@ LIMIT 1",
 			}
 		} else {
 			// Cannot load user data
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
+			displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_USERDATA--}');
 		}
 	} elseif ((empty($taskId)) || ($taskId == '0')) {
 		// Failed loading task id
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
+		displayMessage('{--ADMIN_PAYOUT_FAILED_OBTAIN_TASK_ID--}');
 	}
 } else {
 	if (getRequestParameter('do') == 'delete') {
@@ -274,7 +272,7 @@ ORDER BY
 		loadTemplate('admin_list_payouts', false, $OUT);
 	} else {
 		// No payout requests are sent so far
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
+		displayMessage('{--ADMIN_PAYOUT_NO_REQUESTS_FOUND--}');
 	}
 }