New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/admin/what-add_points.php b/inc/modules/admin/what-add_points.php
index 5eb9a3d1b1380be408b525409143ad372b97e55f..b8ddd1adcb231e1e2ff8be0cceedfc06f28ad21b 100644 (file)
--- a/inc/modules/admin/what-add_points.php
+++ b/inc/modules/admin/what-add_points.php
@@ -55,7 +55,7 @@ if (REQUEST_GET('uid') == "all") {
                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",
+               $result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
                        __FILE__, __LINE__);
 
                // Process all entries
@@ -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
@@ -102,7 +102,7 @@ if (REQUEST_GET('uid') == "all") {
                        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,12 +113,12 @@ 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=\"".generateMemberEmailLink($email, "user_data")."\">".$sname." ".$fname."</a>");
                        define('__UID'       , bigintval(REQUEST_GET('uid')));
                        LOAD_TEMPLATE("admin_add_points");
                }
@@ -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);
 }
 
 //