X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-sub_points.php;h=f894c1934ba19a3373872aea6e57a44214d4fb8a;hb=ffc8edeb9f05685c42ffa01e030e66436bd1d3c1;hp=2414889a9c4a3986ac7f9714d744f8ed280c8410;hpb=9f6c30cc0e06098171d773d671292081ecee3d29;p=mailer.git

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index 2414889a9c..f894c1934b 100644
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 11/23/2003 *
- * ===============                              Last change: 09/23/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 11/23/2003 *
+ * ===================                          Last change: 09/23/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-sub_points.php                              *
@@ -14,11 +14,10 @@
  * $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                           *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -39,37 +38,44 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 if (getRequestElement('userid') == 'all') {
-	// Add points to all accounts
-	$content['points'] = bigintval(postRequestElement('points'));
-
 	// Is the form sent?
 	if ((isFormSent()) && (postRequestElement('points') > 0)) {
-		$result_main = SQL_QUERY("SELECT userid, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+		// Add points to all accounts
+		$content['points'] = bigintval(postRequestElement('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))) {
-			// Ok, add points to used points and send an email to him...
-			subtractPoints('admin_all', $content['userid'], postRequestElement('points'));
+		while ($row = SQL_FETCHARRAY($result_main)) {
+			// Merge both arrays
+			$content = merge_array($content, $row);
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-			$content['points'] = bigintval(postRequestElement('points'));
+			// Ok, add points to used points, send an email to him and ignore return status
+			subtractPoints('admin_sub_all', $content['userid'], postRequestElement('points'));
+
+			// Prepare content
+			$content = array(
+				'reason'  => SQL_ESCAPE(postRequestElement('reason')),
+				'points'  => bigintval(postRequestElement('points')),
+				'subject' => 'admin_sub_all',
+			);
 
 			// Load message and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $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, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+		displayMessage('{--ADMIN_ALL_POINTS_SUBTRACTED--}');
 	} else {
 		// Display form add points
 		loadTemplate('admin_sub_points_all');
@@ -80,35 +86,37 @@ if (getRequestElement('userid') == 'all') {
 		// Selected user does exist
 		$content = getUserDataArray();
 
-		if ((isFormSent()) && (isPostRequestElementSet(('points')))) {
-			// Ok, add to used points and send an email to him...
-			subtractPoints('admin_single', bigintval(getRequestElement('userid')), postRequestElement('points'));
+		if ((isFormSent()) && (isPostRequestElementSet('points'))) {
+			// Ok, add to used points, send an email to him and ignore return status
+			subtractPoints('admin_sub_single', bigintval(getRequestElement('userid')), postRequestElement('points'));
 
-			// Add more content
-			$content['text']   = SQL_ESCAPE(postRequestElement('reason'));
-			$content['points'] = bigintval(postRequestElement('points'));
+			// Prepare content
+			$content = array(
+				'reason'  => SQL_ESCAPE(postRequestElement('reason')),
+				'points'  => bigintval(postRequestElement('points')),
+				'subject' => 'admin_sub_single',
+			);
 
 			// Load email and send it away
-			$message = loadEmailTemplate('sub-points', $content, bigintval(getRequestElement('userid')));
-			sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $message);
+			$message = loadEmailTemplate('member_sub_points', $content, bigintval(getRequestElement('userid')));
+			sendEmail(getRequestElement('userid'), '{--ADMIN_SUB_SUBJECT--}', $message);
 
 			// Output message
-			loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
+			displayMessage('{--ADMIN_POINTS_SUBTRACTED--}');
 		} else {
 			// Prepare content
-			$content['user']   = "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$content['surname']." ".$content['family']."</a>";
 			$content['userid'] = bigintval(getRequestElement('userid'));
 
 			// Load form
-			loadTemplate('admin_sub_points', false, $content);
+			loadTemplate('admin_sub_points', FALSE, $content);
 		}
 	} else {
-		// User not found!
-		loadTemplate('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), getRequestElement('userid'))."</div>");
+		// User not found
+		loadTemplate('admin_settings_unsaved', FALSE, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestElement('userid')) . '%}');
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed
-	addMemberSelectionBox(0, true);
+	addMemberSelectionBox(0, TRUE);
 }
 
 // [EOF]