Previous fix fixed, a lot constants rewritten (unfinished)

[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 04f1fd51de30a7b657eea6edb2344fd74d5734cf..4a2f0269567bffa248738897bbb61c5fb0524845 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -43,26 +43,25 @@ ADD_DESCR("admin", __FILE__);
 // Fix a notice
 if (!isset($_GET['u_id'])) $_GET['u_id'] = "";
 
-if ($_GET['u_id'] == "all")
-{
+if ($_GET['u_id'] == "all") {
        // Add points to all accounts
        define('__POINTS_VALUE', $_POST['points']);
-       if ((isset($_POST['ok'])) && ($_POST['points'] > 0))
-       {
-               $result_main = SQL_QUERY("SELECT userid FROM `{!MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
-               while (list($uid) = SQL_FETCHROW($result_main))
-               {
+       if ((isset($_POST['ok'])) && ($_POST['points'] > 0)) {
+               $result_main = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+               while (list($uid) = SQL_FETCHROW($result_main)) {
                        // 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($uid)), __FILE__, __LINE__);
-                       if (SQL_NUMROWS($result) == 1)
-                       {
+                       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                               array(bigintval($uid)), __FILE__, __LINE__);
+
+                       // Entry found?
+                       if (SQL_NUMROWS($result) == 1) {
                                // Selected user does exist
                                list($sname, $fname, $email) = SQL_FETCHROW($result);
+
+                               // Free result
                                SQL_FREERESULT($result);
 
-                               if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
-                               {
+                               if ((isset($_POST['ok'])) && (!empty($_POST['points']))) {
                                        // Ok, add points to used points and send an email to him...
                                        SUB_POINTS("admin_all", $uid, $_POST['points']);
 
@@ -74,7 +73,7 @@ if ($_GET['u_id'] == "all")
 
                                        // Load message and send it away
                                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($uid));
-                                       SEND_EMAIL(bigintval($uid), ADMIN_SUB_SUBJ, $msg);
+                                       SEND_EMAIL(bigintval($uid), getMessage('ADMIN_SUB_SUBJ'), $msg);
                                }
                        }
                }
@@ -82,19 +81,15 @@ if ($_GET['u_id'] == "all")
                SQL_FREERESULT($result_main);
 
                // Output message
-               LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_ALL_POINTS_SUBTRACTED);
-       }
-        else
-       {
+               LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_POINTS_SUBTRACTED'));
+       } else {
                // Display form add points
                LOAD_TEMPLATE("admin_sub_points_all");
        }
-}
- elseif (!empty($_GET['u_id']))
-{
+} elseif (!empty($_GET['u_id'])) {
        // 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($_GET['u_id'])),__FILE__, __LINE__);
+       $result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+               array(bigintval($_GET['u_id'])),__FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Selected user does exist
                list($sname, $fname, $email) = SQL_FETCHROW($result);
@@ -112,10 +107,10 @@ if ($_GET['u_id'] == "all")
 
                        // Load email and send it away
                        $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($_GET['u_id']));
-                       SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_SUB_SUBJ, $msg);
+                       SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_SUB_SUBJ'), $msg);
 
                        // Output message
-                       LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_SUBTRACTED);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_POINTS_SUBTRACTED'));
                } else {
                        // Opps, missing form here
                        define('__USER_VALUE', "<a href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</a>");