X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=64de25a6b412fda51a823974056520e87f249b0c;hb=8d0ed5ed9a9ca0e07b9582f2311b44bdcc5a95ea;hp=bd85411cbfe3da86516ff2b471dcd849e9a3136c;hpb=6b13c5c64eebedd56683c78d799879e0dc618b21;p=mailer.git

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index bd85411cbf..64de25a6b4 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * 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 *
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (getRequestParameter('userid') == 'all') {
 	// Add points to all accounts
@@ -55,6 +55,9 @@ if (getRequestParameter('userid') == 'all') {
 
 		// Process all entries
 		while ($row = SQL_FETCHARRAY($result_main)) {
+			// Merge $row into $content
+			$content = merge_array($content, $row);
+
 			// Remove depth to prevent booking errors. This is a bad coding
 			// practice, thats also why we need to write this project from
 			// scratch...
@@ -66,11 +69,12 @@ if (getRequestParameter('userid') == 'all') {
 			// Prepare content
 			$content = array(
 				'reason' => SQL_ESCAPE(postRequestParameter('reason')),
-				'points' => bigintval(postRequestParameter('points'))
+				'points' => bigintval(postRequestParameter('points')),
+				'userid' => $row['userid']
 			);
 
 			// Load email template and send email away
-			$message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
+			$message = loadEmailTemplate('member_add_points', $content, bigintval($content['userid']));
 			sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message);
 		} // END - while
 
@@ -78,7 +82,7 @@ if (getRequestParameter('userid') == 'all') {
 		SQL_FREERESULT($result_main);
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_ADDED--}');
+		displayMessage('{--ADMIN_ALL_POINTS_ADDED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_add_points_all');
@@ -100,10 +104,10 @@ if (getRequestParameter('userid') == 'all') {
 			);
 
 			// Message laden
-			$message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
+			$message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestParameter('userid')));
 
 			sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
-			loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_ADDED--}');
+			displayMessage('{--ADMIN_POINTS_ADDED--}');
 		} else {
 			// Prepare content
 			$content['userid'] = bigintval(getRequestParameter('userid'));
@@ -112,7 +116,7 @@ if (getRequestParameter('userid') == 'all') {
 			loadTemplate('admin_add_points', false, $content);
 		}
 	} else {
-		// User not found!
+		// User not found
 		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {