X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-sub_points.php;h=52da92ab38a6595d28bdb508b3ecb2b2c0e22e14;hb=20741b93fd58620af677a7f1039ffd16ea6ec689;hp=813cf06a9252ad8bbd0b139ad2cf1b0c0a18b906;hpb=039203d5428c9c6a3bed61fb3a9a16958c6fd44c;p=mailer.git

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 813cf06a92..52da92ab38 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,37 +38,43 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (getRequestElement('userid') == 'all') {
-	// Add points to all accounts
-	$content['points'] = bigintval(postRequestElement('points'));
-
 	// Is the form sent?
 	if ((isFormSent()) && (postRequestElement('points') > 0)) {
-		$result_main = SQL_QUERY("SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+		// Add points to all accounts
+		$content['points'] = bigintval(postRequestElement('points'));
+
+		// Load userid
+		$result_main = SQL_QUERY("SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
 			__FILE__, __LINE__);
-		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
-			// Ok, add points to used points and send an email to him...
+		while ($row = SQL_FETCHARRAY($result_main)) {
+			// Merge both arrays
+			$content = merge_array($content, $row);
+
+			// Ok, add points to used points, send an email to him and ignore return status
 			subtractPoints('admin_all', $content['userid'], postRequestElement('points'));
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-			$content['points'] = bigintval(postRequestElement('points'));
+			// Prepare content
+			$content = array(
+				'reason' => SQL_ESCAPE(postRequestElement('reason')),
+				'points' => bigintval(postRequestElement('points'))
+			);
 
 			// Load message and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			$message = loadEmailTemplate('member_sub_points', $content, bigintval($content['userid']));
+			sendEmail($row['userid'], '{--ADMIN_SUB_SUBJECT--}', $message);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_main);
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+		displayMessage('{--ADMIN_ALL_POINTS_SUBTRACTED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_sub_points_all');
@@ -81,30 +86,31 @@ if (getRequestElement('userid') == 'all') {
 		$content = getUserDataArray();
 
 		if ((isFormSent()) && (isPostRequestElementSet('points'))) {
-			// Ok, add to used points and send an email to him...
+			// Ok, add to used points, send an email to him and ignore return status
 			subtractPoints('admin_single', bigintval(getRequestElement('userid')), postRequestElement('points'));
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-			$content['points'] = bigintval(postRequestElement('points'));
+			// Prepare content
+			$content = array(
+				'reason' => SQL_ESCAPE(postRequestElement('reason')),
+				'points' => bigintval(postRequestElement('points'))
+			);
 
 			// Load email and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval(getRequestElement('userid')));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			$message = loadEmailTemplate('member_sub_points', $content, bigintval(getRequestElement('userid')));
+			sendEmail(getRequestElement('userid'), '{--ADMIN_SUB_SUBJECT--}', $message);
 
 			// Output message
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
+			displayMessage('{--ADMIN_POINTS_SUBTRACTED--}');
 		} else {
 			// Prepare content
-			$content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 			$content['userid'] = bigintval(getRequestElement('userid'));
 
 			// Load form
 			loadTemplate('admin_sub_points', false, $content);
 		}
 	} else {
-		// User not found!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestElement('userid')) . '</div>');
+		// User not found
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed