X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fwhat-sub_points.php;h=1580c6a11b24a7e2f8bcc752d0ace6466c9fad2f;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hp=661dd3ff4dd601f941974601881df09c2e7efb14;hpb=09f5758c42a33a56bdd461c946ffe759a59c54aa;p=mailer.git

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 661dd3ff4d..1580c6a11b 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_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                    *
@@ -40,37 +38,43 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (getRequestParameter('userid') == 'all') {
-	// Add points to all accounts
-	$content['points'] = bigintval(postRequestParameter('points'));
-
 	// Is the form sent?
 	if ((isFormSent()) && (postRequestParameter('points') > 0)) {
+		// Add points to all accounts
+		$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",
 			__FILE__, __LINE__);
-		while ($content = merge_array($content, SQL_FETCHARRAY($result_main))) {
+		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...
 			subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
-			$content['points'] = bigintval(postRequestParameter('points'));
+			// Prepare content
+			$content = array(
+				'reason' => SQL_ESCAPE(postRequestParameter('reason')),
+				'points' => bigintval(postRequestParameter('points'))
+			);
 
 			// Load message and send it away
 			$message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
 		} // END - while
 
 		// Free memory
 		SQL_FREERESULT($result_main);
 
 		// Output message
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_POINTS_SUBTRACTED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_sub_points_all');
@@ -85,19 +89,20 @@ if (getRequestParameter('userid') == 'all') {
 			// Ok, add to used points and send an email to him...
 			subtractPoints('admin_single', bigintval(getRequestParameter('userid')), postRequestParameter('points'));
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestParameter('reason'));
-			$content['points'] = bigintval(postRequestParameter('points'));
+			// Prepare content
+			$content = array(
+				'reason' => SQL_ESCAPE(postRequestParameter('reason')),
+				'points' => bigintval(postRequestParameter('points'))
+			);
 
 			// Load email and send it away
 			$message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
 
 			// Output message
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
+			loadTemplate('admin_settings_saved', false, '{--ADMIN_POINTS_SUBTRACTED--}');
 		} else {
 			// Prepare content
-			$content['user']   = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
 			$content['userid'] = bigintval(getRequestParameter('userid'));
 
 			// Load form
@@ -105,7 +110,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