X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-sub_points.php;h=3ade43b94026ec41d572d2ba0f41c1dbca191919;hb=ad16f516e254e67b221dd72d518821e9a0853610;hp=5c5dc6c4e97c8fa5d34c2603499cd8356360bf75;hpb=2ede2488c926695e022e33fa40fe74584831990f;p=mailer.git

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 5c5dc6c4e9..3ade43b940 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -50,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
@@ -66,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');
@@ -86,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
@@ -96,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'));
@@ -110,7 +110,7 @@ if (getRequestParameter('userid') == 'all') {
 		}
 	} else {
 		// User not found
-		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+		loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed