Security line in all includes changed

[mailer.git] / inc / modules / member / what-order.php

diff --git a/inc/modules/member/what-order.php b/inc/modules/member/what-order.php
index b4c2f9a8cb13b1253d7f5df3011ceb3447619c8d..0577688f285f31497906f59009f8ad233552a853 100644 (file)
--- a/inc/modules/member/what-order.php
+++ b/inc/modules/member/what-order.php
@@ -32,17 +32,12 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
-}
- elseif (!IS_MEMBER())
-{
+} elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("order")) && (!IS_ADMIN()))
-{
+} elseif (!EXT_IS_ACTIVE("order")) {
        ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "order");
        return;
 }
@@ -104,7 +99,7 @@ $HTML_EXT = EXT_IS_ACTIVE("html_mail");
 $result_p = SQL_QUERY_ESC("SELECT SUM(points) FROM "._MYSQL_PREFIX."_user_points WHERE userid=%s",
  array($GLOBALS['userid']), __FILE__, __LINE__);
 
-$TOTAL = "0";
+$TOTAL = 0;
 if (SQL_NUMROWS($result_p) > 0)
 {
        // Load points
@@ -112,12 +107,7 @@ if (SQL_NUMROWS($result_p) > 0)
        SQL_FREERESULT($result_p);
 
        // And subtract his used points...
-       $result_p = SQL_QUERY_ESC("SELECT used_points FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
-        array($GLOBALS['userid']), __FILE__, __LINE__);
-
-       list($p) = SQL_FETCHROW($result_p);
-       SQL_FREERESULT($result_p);
-       $TOTAL -= $p;
+       $TOTAL -= GET_TOTAL_DATA($GLOBALS['userid'], "user_data", "used_points");
 
        // Add (maybe) missing three zeros
        if (!ereg(".", $TOTAL)) $TOTAL .= ".00000";
@@ -137,7 +127,7 @@ if (($HOLIDAY == "Y") && (GET_EXT_VERSION("holiday") >= "0.1.3"))
        $result = SQL_QUERY_ESC("SELECT id, data_type FROM "._MYSQL_PREFIX."_pool WHERE sender=%s AND url='%s' AND timestamp > %s LIMIT 1",
         array($GLOBALS['userid'], $_POST['url'], bigintval(time() - $_CONFIG['url_tlock'])), __FILE__, __LINE__);
 
-       $type = "TEMP"; $id = "0";
+       $type = "TEMP"; $id = 0;
        if (SQL_NUMROWS($result) == 1)
        {
                list($id, $type) = SQL_FETCHROW($result);
@@ -485,7 +475,7 @@ array(
                                $result_uids = SQL_QUERY_ESC("SELECT userid FROM "._MYSQL_PREFIX."_user_cats WHERE cat_id=%s AND userid != '%s' ORDER BY userid",
                                 array(bigintval($id), $GLOBALS['userid']), __FILE__, __LINE__);
 
-                               $uid_cnt = "0";
+                               $uid_cnt = 0;
                                while (list($ucat) = SQL_FETCHROW($result_uids))
                                {
                                        // Check for holiday system