X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=bd85411cbfe3da86516ff2b471dcd849e9a3136c;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hp=f3465c23017eb1cecaa1e8dada4eecba212d2638;hpb=aa1fa67e62e0d175d5d801becaea4362a5b50e2a;p=mailer.git

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index f3465c2301..bd85411cbf 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -14,8 +14,6 @@
  * $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                    *
@@ -57,9 +55,6 @@ if (getRequestParameter('userid') == 'all') {
 
 		// Process all entries
 		while ($row = SQL_FETCHARRAY($result_main)) {
-			// Merge both arrays
-			$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...
@@ -69,19 +64,21 @@ 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'))
+			);
 
 			// Load email template and send email away
 			$message = loadEmailTemplate('add-points', $content, bigintval($content['userid']));
-			sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
+			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'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_ADDED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_add_points_all');
@@ -98,18 +95,17 @@ 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')));
 
-			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);
+			loadTemplate('admin_settings_saved', false, '{--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
@@ -117,7 +113,7 @@ if (getRequestParameter('userid') == 'all') {
 		}
 	} else {
 		// User not found!
-		loadTemplate('admin_settings_saved', false, '<div class="admin_failed">' . getMaskedMessage('ADMIN_MEMBER_404', getRequestParameter('userid')) . '</div>');
+		loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed