Some functions rewritten to hungarian notation, handling of array rewritten

[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 587abec41e0432e7b818392e385943d0009a2710..21ec6166ee0da2305aaaaa6fb909eb788c35835d 100644 (file)
--- a/inc/modules/admin/what-sub_points.php
+++ b/inc/modules/admin/what-sub_points.php
@@ -32,13 +32,13 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
+
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
 // Fix a notice
 if (!isset($_GET['u_id'])) $_GET['u_id'] = "";
@@ -49,11 +49,11 @@ if ($_GET['u_id'] == "all")
        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__);
+               $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",
+                       $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)
                        {
@@ -64,11 +64,17 @@ if ($_GET['u_id'] == "all")
                                if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
                                {
                                        // Ok, add points to used points and send an email to him...
-                                       SUB_POINTS($uid, $_POST['points']);
+                                       SUB_POINTS("admin_all", $uid, $_POST['points']);
+
+                                       // Prepare content
+                                       $content = array(
+                                               'text'   => SQL_ESCAPE($_POST['reason']),
+                                               'points' => bigintval($_POST['points'])
+                                       );
 
                                        // Load message and send it away
-                                       $msg = LOAD_EMAIL_TEMPLATE("sub-points", $_POST['reason'], $uid);
-                                       SEND_EMAIL($email, ADMIN_SUB_SUBJ, $msg);
+                                       $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($uid));
+                                       SEND_EMAIL(bigintval($uid), ADMIN_SUB_SUBJ, $msg);
                                }
                        }
                }
@@ -87,7 +93,7 @@ if ($_GET['u_id'] == "all")
  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",
+       $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)
        {
@@ -98,14 +104,17 @@ if ($_GET['u_id'] == "all")
                if ((isset($_POST['ok'])) && (!empty($_POST['points'])))
                {
                        // Ok, add to used points and send an email to him...
-                       SUB_POINTS(bigintval($_GET['u_id']), $_POST['points']);
+                       SUB_POINTS("admin_single", bigintval($_GET['u_id']), $_POST['points']);
 
-                       // Remember points in template
-                       define('__POINTS_VALUE', bigintval($_POST['points']));
+                       // Prepare content
+                       $content = array(
+                               'text'   => SQL_ESCAPE($_POST['reason']),
+                               'points' => bigintval($_POST['points'])
+                       );
 
                        // Load email and send it away
-                       $msg = LOAD_EMAIL_TEMPLATE("sub-points", $_POST['reason'], $_GET['u_id']);
-                       SEND_EMAIL($email, ADMIN_SUB_SUBJ, $msg);
+                       $msg = LOAD_EMAIL_TEMPLATE("sub-points", $content, bigintval($_GET['u_id']));
+                       SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_SUB_SUBJ, $msg);
 
                        // Output message
                        LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_POINTS_SUBTRACTED);
@@ -114,7 +123,7 @@ if ($_GET['u_id'] == "all")
                {
                        // Opps, missing form here
                        define('__USER_VALUE', "<A href=\"".CREATE_EMAIL_LINK($email, "user_data")."\">".$sname." ".$fname."</A>");
-                       define('__UID_VALUE', $_GET['u_id']);
+                       define('__UID', bigintval($_GET['u_id']));
                        LOAD_TEMPLATE("admin_sub_points");
                }
        }