Old config.php is now automatically updated to new config-local.php format, several...

[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 6652c11631330f5302f350e49c2b7d880d6bdd5d..804e29413fef74ece1565f4e33fa47970c5eafa5 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -38,7 +38,7 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
@@ -55,8 +55,8 @@ if (REQUEST_GET('uid') == "all") {
 
        // Is the form sent?
        if ((IS_FORM_SENT()) && (REQUEST_POST('points') > 0)) {
-               $result_main = SQL_QUERY("SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid",
-                       __FILE__, __LINE__);
+               $result_main = SQL_QUERY("SELECT userid, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY `userid` ASC",
+               __FILE__, __LINE__);
                while ($content = SQL_FETCHARRAY($result_main)) {
                        // Ok, add points to used points and send an email to him...
                        SUB_POINTS("admin_all", $content['userid'], REQUEST_POST('points'));
@@ -67,7 +67,7 @@ if (REQUEST_GET('uid') == "all") {
 
                        // Load message and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($content['userid']));
-                       SEND_EMAIL($content['email'], getMessage('ADMIN_SUB_SUBJ'), $msg);
+                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $msg);
                } // END - while
 
                // Free memory
@@ -82,7 +82,7 @@ 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",
-               array(bigintval(REQUEST_GET('uid'))),__FILE__, __LINE__);
+       array(bigintval(REQUEST_GET('uid'))),__FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist
                $content = SQL_FETCHARRAY($result);
@@ -97,13 +97,13 @@ if (REQUEST_GET('uid') == "all") {
 
                        // Load email and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval(REQUEST_GET('uid')));
-                       SEND_EMAIL($content['email'], getMessage('ADMIN_SUB_SUBJ'), $msg);
+                       sendEmail($content['email'], getMessage('ADMIN_SUB_SUBJ'), $msg);
 
                        // Output message
                        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_POINTS_SUBTRACTED'));
                } else {
                        // @TODO Rewrite these constants
-                       define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($content['email'], "user_data")."\">".$content['surname']." ".$content['family']."</a>");
+                       define('__USER_VALUE', "<a href=\"".generateMemberEmailLink($content['email'], "user_data")."\">".$content['surname']." ".$content['family']."</a>");
                        define('__UID', bigintval(REQUEST_GET('uid')));
 
                        // Load form
@@ -118,7 +118,7 @@ if (REQUEST_GET('uid') == "all") {
        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);
 }
 
 //