More misc fixes and rewrites (sorry, lame description)

[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..e446473121dac1d22424fcd599f91992401cc865 100644 (file)
--- 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,15 +66,15 @@ 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'));
                        $content['points'] = bigintval(REQUEST_POST('points'));
 
                        // 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);
+                       $message = LOAD_EMAIL_TEMPLATE('add-points', $content, bigintval($content['userid']));
+                       sendEmail(bigintval($content['userid']), getMessage('ADMIN_ADD_SUBJ'), $message);
                } // END - while
 
                // Free memory
@@ -84,25 +84,24 @@ if (REQUEST_GET('uid') == "all") {
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_POINTS_ADDED'));
        } else {
                // Display form add points
-               LOAD_TEMPLATE("admin_add_points_all");
+               LOAD_TEMPLATE('admin_add_points_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(
@@ -111,24 +110,27 @@ if (REQUEST_GET('uid') == "all") {
                        );
 
                        // Message laden
-                       $msg = LOAD_EMAIL_TEMPLATE("add-points", $content, bigintval(REQUEST_GET('uid')));
+                       $message = 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'), $message);
                        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!
                LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
        }
+
+       // Free result
+       SQL_FREERESULT($result);
 } else {
        // Output selection form with all confirmed user accounts listed
-       ADD_MEMBER_SELECTION_BOX("0", true);
+       ADD_MEMBER_SELECTION_BOX('0', true);
 }
 
 //