X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-sub_points.php;h=3ade43b94026ec41d572d2ba0f41c1dbca191919;hb=a636d6415605b148ba0989f51442145cd8361ee4;hp=4d894d8fdab7506b1ea7df217d600319fac0a36c;hpb=6914ebaaae909093df86d010e4c754a43d1a1aed;p=mailer.git

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 4d894d8fda..3ade43b940 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.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 (getRequestParameter('userid') == 'all') {
 	// Is the form sent?
@@ -52,13 +50,13 @@ if (getRequestParameter('userid') == 'all') {
 		$content['points'] = bigintval(postRequestParameter('points'));
 
 		// Load userid
-		$result_main = SQL_QUERY("SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+		$result_main = SQL_QUERY("SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
 			__FILE__, __LINE__);
 		while ($row = SQL_FETCHARRAY($result_main)) {
 			// Merge both arrays
 			$content = merge_array($content, $row);
 
-			// Ok, add points to used points and send an email to him...
+			// Ok, add points to used points, send an email to him and ignore return status
 			subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
 			// Prepare content
@@ -68,15 +66,15 @@ if (getRequestParameter('userid') == 'all') {
 			);
 
 			// Load message and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-			sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $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, '{--ADMIN_ALL_POINTS_SUBTRACTED--}');
+		displayMessage('{--ADMIN_ALL_POINTS_SUBTRACTED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_sub_points_all');
@@ -88,7 +86,7 @@ if (getRequestParameter('userid') == 'all') {
 		$content = getUserDataArray();
 
 		if ((isFormSent()) && (isPostRequestParameterSet('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(getRequestParameter('userid')), postRequestParameter('points'));
 
 			// Prepare content
@@ -98,11 +96,11 @@ if (getRequestParameter('userid') == 'all') {
 			);
 
 			// Load email and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-			sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
+			$message = loadEmailTemplate('member_sub_points', $content, bigintval(getRequestParameter('userid')));
+			sendEmail(getRequestParameter('userid'), '{--ADMIN_SUB_SUBJECT--}', $message);
 
 			// Output message
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}');
+			displayMessage('{--ADMIN_POINTS_SUBTRACTED--}');
 		} else {
 			// Prepare content
 			$content['userid'] = bigintval(getRequestParameter('userid'));
@@ -111,8 +109,8 @@ if (getRequestParameter('userid') == 'all') {
 			loadTemplate('admin_sub_points', false, $content);
 		}
 	} else {
-		// User not found!
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+		// User not found
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed