X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=64de25a6b412fda51a823974056520e87f249b0c;hb=c76a064ef78992c6eab593314d51f1841f8fb266;hp=01a9b8be9f2b3c3bbdd8758281ce889e3a44d452;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 01a9b8be9f..64de25a6b4 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -14,10 +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 - 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 *
@@ -42,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,7 +54,10 @@ if (getRequestParameter('userid') == 'all') {
 			__FILE__, __LINE__);
 
 		// Process all entries
-		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
+		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...
@@ -65,19 +67,22 @@ if (getRequestParameter('userid') == 'all') {
 			addPointsDirectly('admin_all', $content['userid'], bigintval(postRequestParameter('points')));
 
 			// Prepare content
-			$content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
-			$content['points'] = bigintval(postRequestParameter('points'));
+			$content = array(
+				'reason' => SQL_ESCAPE(postRequestParameter('reason')),
+				'points' => bigintval(postRequestParameter('points')),
+				'userid' => $row['userid']
+			);
 
 			// Load email template and send email away
-			$message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-			sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
+			$message = loadEmailTemplate('member_add_points', $content, bigintval($content['userid']));
+			sendEmail(bigintval($content['userid']), '{--ADMIN_ADD_SUBJECT--}', $message);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_main);
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_ADDED'));
+		displayMessage('{--ADMIN_ALL_POINTS_ADDED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_add_points_all');
@@ -94,26 +99,25 @@ if (getRequestParameter('userid') == 'all') {
 
 			// Prepare content
 			$content = array(
-				'text'   => SQL_ESCAPE(postRequestParameter('reason')),
+				'reason' => SQL_ESCAPE(postRequestParameter('reason')),
 				'points' => bigintval(postRequestParameter('points'))
 			);
 
 			// Message laden
-			$message = loadEmailTemplate('add-points', $content, bigintval(getRequestParameter('userid')));
+			$message = loadEmailTemplate('member_add_points', $content, bigintval(getRequestParameter('userid')));
 
-			sendEmail(bigintval(getRequestParameter('userid')), getMessage('ADMIN_ADD_SUBJ'), $message);
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
+			sendEmail(bigintval(getRequestParameter('userid')), '{--ADMIN_ADD_SUBJECT--}', $message);
+			displayMessage('{--ADMIN_POINTS_ADDED--}');
 		} else {
 			// Prepare content
-			$content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 			$content['userid'] = bigintval(getRequestParameter('userid'));
 
 			// Output template
 			loadTemplate('admin_add_points', false, $content);
 		}
 	} else {
-		// User not found!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+		// User not found
+		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed