X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-add_points.php;h=82442de572a78905318ffdec2aa3800f06de4ca2;hp=5eb9a3d1b1380be408b525409143ad372b97e55f;hb=3f51c40f4fede87228216f9285b745a339e3891d;hpb=f97a999e0737c0007ae9c3c26dfef49f75a175ac

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 5eb9a3d1b1..82442de572 100644
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -50,13 +50,13 @@ if (!REQUEST_ISSET_GET('uid')) REQUEST_SET_GET('uid', '');
 
 if (REQUEST_GET('uid') == "all") {
 	// Add points to all accounts
-	if ((IS_FORM_SENT()) && (REQUEST_POST('points') > 0)) {
+	if ((isFormSent()) && (REQUEST_POST('points') > 0)) {
 		// @TODO Rewrite this constant
 		define('__POINTS_VALUE', REQUEST_POST('points'));
 
 		// Select all users
-		$result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid",
-			__FILE__, __LINE__);
+		$result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+		__FILE__, __LINE__);
 
 		// Process all entries
 		while ($content = SQL_FETCHARRAY($result_main)) {
@@ -66,7 +66,7 @@ if (REQUEST_GET('uid') == "all") {
 			$GLOBALS['ref_level'] = -1;
 
 			// Ok, add points and send an email to him...
-			ADD_POINTS_REFSYSTEM("admin_all", $content['userid'], bigintval(REQUEST_POST('points')), false, "0", false, "direct");
+			ADD_POINTS_REFSYSTEM_DIRECT('admin_all', $content['userid'], bigintval(REQUEST_POST('points')));
 
 			// Prepare content
 			$content['text']   = SQL_ESCAPE(REQUEST_POST('reason'));
@@ -74,7 +74,7 @@ if (REQUEST_GET('uid') == "all") {
 
 			// Load email template and send email away
 			$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval($content['userid']));
-			SEND_EMAIL(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $msg);
+			sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $msg);
 		} // END - while
 
 		// Free memory
@@ -88,21 +88,21 @@ if (REQUEST_GET('uid') == "all") {
 	}
 } elseif (REQUEST_ISSET_GET('uid')) {
 	// User ID found in URL so we use this give him some credits
-	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+	$result = SQL_QUERY_ESC("SELECT `surname`, `family`, `email` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
 		array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 1) {
 		// Selected user does exist
 		list($sname, $fname, $email) = SQL_FETCHROW($result);
 		SQL_FREERESULT($result);
 
-		if ((IS_FORM_SENT()) && (REQUEST_ISSET_POST(('points')))) {
+		if ((isFormSent()) && (REQUEST_ISSET_POST(('points')))) {
 			// Remove depth to prevent booking errors. This is a bad coding
 			// practice, thats also why we need to write this project from
 			// scratch...
 			unset($GLOBALS['ref_level']);
 
 			// Ok, add points and send an email to him...
-			ADD_POINTS_REFSYSTEM("admin_single", bigintval(REQUEST_GET('uid')), bigintval(REQUEST_POST('points')), false, "0", false, "direct");
+			ADD_POINTS_REFSYSTEM_DIRECT('admin_single', bigintval(REQUEST_GET('uid')), bigintval(REQUEST_POST('points')));
 
 			// Prepare content
 			$content = array(
@@ -113,14 +113,14 @@ if (REQUEST_GET('uid') == "all") {
 			// Message laden
 			$msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval(REQUEST_GET('uid')));
 
-			SEND_EMAIL(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_ADD_SUBJ'), $msg);
+			sendEmail(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_ADD_SUBJ'), $msg);
 			LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
 		} else {
 			// Opps, missing form here
 			// @TODO Rewrite these both constants
-			define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");
+			define('__USER_VALUE', "<a href=\"".generateEmailLink($email, 'user_data')."\">".$sname." ".$fname."</a>");
 			define('__UID'       , bigintval(REQUEST_GET('uid')));
-			LOAD_TEMPLATE("admin_add_points");
+			LOAD_TEMPLATE('admin_add_points');
 		}
 	} else {
 		// User not found!
@@ -128,7 +128,7 @@ if (REQUEST_GET('uid') == "all") {
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed
-	ADD_MEMBER_SELECTION_BOX("0", true);
+	ADD_MEMBER_SELECTION_BOX('0', true);
 }
 
 //