A lot has been rewritten, ext-teams added, ext-forced continued:

[mailer.git] / inc / modules / admin / what-sub_points.php

diff --git a/inc/modules/admin/what-sub_points.php b/inc/modules/admin/what-sub_points.php
index da7bed7cce1d32e78f7f39a4c72c5609b63b64e3..3ade43b94026ec41d572d2ba0f41c1dbca191919 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -50,13 +50,13 @@ if (getRequestParameter('userid') == 'all') {
                $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",
+               $result_main = SQL_QUERY("SELECT `userid`,`email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
                        __FILE__, __LINE__);
                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...
+                       // Ok, add points to used points, send an email to him and ignore return status
                        subtractPoints('admin_all', $content['userid'], postRequestParameter('points'));
 
                        // Prepare content
@@ -66,8 +66,8 @@ if (getRequestParameter('userid') == 'all') {
                        );
 
                        // Load message and send it away
-                       $message = loadEmailTemplate('sub-points', $content, bigintval($content['userid']));
-                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
+                       $message = loadEmailTemplate('member_sub_points', $content, bigintval($content['userid']));
+                       sendEmail($row['userid'], '{--ADMIN_SUB_SUBJECT--}', $message);
                } // END - while
 
                // Free memory
@@ -86,7 +86,7 @@ if (getRequestParameter('userid') == 'all') {
                $content = getUserDataArray();
 
                if ((isFormSent()) && (isPostRequestParameterSet('points'))) {
-                       // Ok, add to used points and send an email to him...
+                       // Ok, add to used points, send an email to him and ignore return status
                        subtractPoints('admin_single', bigintval(getRequestParameter('userid')), postRequestParameter('points'));
 
                        // Prepare content
@@ -96,8 +96,8 @@ if (getRequestParameter('userid') == 'all') {
                        );
 
                        // Load email and send it away
-                       $message = loadEmailTemplate('sub-points', $content, bigintval(getRequestParameter('userid')));
-                       sendEmail($content['email'], '{--ADMIN_SUB_SUBJECT--}', $message);
+                       $message = loadEmailTemplate('member_sub_points', $content, bigintval(getRequestParameter('userid')));
+                       sendEmail(getRequestParameter('userid'), '{--ADMIN_SUB_SUBJECT--}', $message);
 
                        // Output message
                        displayMessage('{--ADMIN_POINTS_SUBTRACTED--}');
@@ -110,7 +110,7 @@ if (getRequestParameter('userid') == 'all') {
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_unsaved', false, getMaskedMessage('ADMIN_MEMBER_404', bigintval(getRequestParameter('userid'))));
+               loadTemplate('admin_settings_unsaved', false, '{%message,ADMIN_MEMBER_404=' . bigintval(getRequestParameter('userid')) . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed