More globals rewritten, see ticket #100

[mailer.git] / inc / libs / bonus_functions.php

diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php
index f97467bf1bc37c71e0cec5d5fecb1215045ec220..20b488369ab28a33c3ff8dae9fc64e6e1746bbd8 100644 (file)
--- a/inc/libs/bonus_functions.php
+++ b/inc/libs/bonus_functions.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktion fuer bonus-Erweiterung        *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -43,7 +48,7 @@ function BONUS_ADD_TURBO_POINTS ($mid, $uid, $type) {
        if (getConfig('bonus_active') != "Y") return false;
 
        // Init variables
-       $SQL = ""; $bonys = 0; $mail = 0; $column = "";
+       $sql = ""; $bonys = 0; $mail = 0; $column = "";
 
        // Select SQL command
        switch ($type)
@@ -71,7 +76,7 @@ function BONUS_ADD_TURBO_POINTS ($mid, $uid, $type) {
 
        // Check for entry
        $result = SQL_QUERY_ESC("SELECT COUNT(id) AS cnt FROM  `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE userid=%s AND %s=%s LIMIT 1",
-               array($uid, $column, $mid), __FILE__, __LINE__);
+               array($uid, $column, $mid), __FUNCTION__, __LINE__);
 
        // Load clicks from table as current rank
        list($rank) = SQL_FETCHROW($result);
@@ -100,11 +105,11 @@ function BONUS_ADD_TURBO_POINTS ($mid, $uid, $type) {
 
        // Add points to his account directly
        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET turbo_bonus=turbo_bonus+".$points." WHERE userid=%s LIMIT 1",
-               array(bigintval($uid)), __FILE__, __LINE__);
+               array(bigintval($uid)), __FUNCTION__, __LINE__);
 
        // Rember this whole data for displaying ranking list
        SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_bonus_turbo` (userid, mail_id, bonus_id, level, points, timemark) VALUES ('%s', '%s', '%s', '%s', '%s', UNIX_TIMESTAMP())",
-               array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FILE__, __LINE__);
+               array(bigintval($uid), bigintval($mail), bigintval($bonus), $rank, $points), __FUNCTION__, __LINE__);
 
        if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD") && ($points > 0)) BONUS_POINTS_HANDLER($points);
 }
@@ -113,11 +118,11 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
        $self = false; $OUT = "";
 
        // How many ranks do we have?
-       $ranks = sizeof(explode(";", getConfig('turbo_rates'))) + 1;
+       $ranks = count(explode(";", getConfig('turbo_rates'))) + 1;
 
        // Load current user's data
        $result = SQL_QUERY_ESC("SELECT level, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND userid=%s LIMIT 1",
-               array($type, $data, $uid), __FILE__, __LINE__);
+               array($type, $data, $uid), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load data
                list($rank, $points, $mark) = SQL_FETCHROW($result);
@@ -136,7 +141,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
 
        // Load rankings
        $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s ORDER BY level LIMIT %s",
-               array($type, $data, getConfig('bonus_lines')), __FILE__, __LINE__);
+               array($type, $data, getConfig('bonus_lines')), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Start generating the ranking list
                $max = SQL_NUMROWS($result);
@@ -145,7 +150,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
                for ($rank = 1; $rank <= $max; $rank++) {
                        // Load data
                        $result_users = SQL_QUERY_ESC("SELECT userid, points, timemark FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE %s=%s AND level=%s LIMIT 1",
-                               array($type, $data, $rank), __FILE__, __LINE__);
+                               array($type, $data, $rank), __FUNCTION__, __LINE__);
 
                        // Nothing found by default
                        $userid = "---"; $points = "---";
@@ -176,7 +181,7 @@ function BONUS_MAKE_RANK_ROWS ($data, $type, $uid) {
                // No entries found!
                $OUT = "<tr>
   <td colspan=\"3\" align=\"center\" height=\"30\" class=\"bottom2\">
-    <div class=\"guest_failed\">".BONUS_NO_RANKS_1.$data.BONUS_NO_RANKS_2."</div>
+    <div class=\"guest_failed\">".sprintf(getMessage('BONUS_NO_RANKS'), $data)."</div>
   </td>
 </tr>\n";
                define('__YOUR_RANKING_LINE', "");
@@ -208,8 +213,8 @@ function BONUS_POINTS_HANDLER ($MODE) {
        case "JACKPOT": // ... jackpot
                if ((SUB_JACKPOT($points) == -1) && (getConfig('bonus_uid') > 0)) {
                        // Check points amount first...
-                       $TOTAL = GET_TOTAL_DATA(getConfig('bonus_uid'), "user_points", "points") - GET_TOTAL_DATA(getConfig('bonus_uid'), "user_data", "used_points");
-                       if ($TOTAL >= $points) {
+                       $total = GET_TOTAL_DATA(getConfig('bonus_uid'), "user_points", "points") - GET_TOTAL_DATA(getConfig('bonus_uid'), "user_data", "used_points");
+                       if ($total >= $points) {
                                // Subtract points from userid's account
                                SUB_POINTS("bonus_payout_jackpot", getConfig('bonus_uid'), $points);
                        } // END - if
@@ -218,8 +223,8 @@ function BONUS_POINTS_HANDLER ($MODE) {
 
        case "UID": // ... userid's account
                // Check his amount first
-               $TOTAL = GET_TOTAL_DATA(getConfig('bonus_uid'), "user_points", "points") - GET_TOTAL_DATA(getConfig('bonus_uid'), "user_data", "used_points");
-               if ($TOTAL >= $points) {
+               $total = GET_TOTAL_DATA(getConfig('bonus_uid'), "user_points", "points") - GET_TOTAL_DATA(getConfig('bonus_uid'), "user_data", "used_points");
+               if ($total >= $points) {
                        // Subtract points from userid's account
                        SUB_POINTS("bonus_payout_uid", getConfig('bonus_uid'), $points);
                } else {
@@ -233,7 +238,7 @@ function BONUS_POINTS_HANDLER ($MODE) {
 //
 function BONUS_PURGE_EXPIRED_TURBO_BONUS() {
        // Remove entries
-       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FILE__, __LINE__);
+       $result = SQL_QUERY("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_bonus_turbo` WHERE timemark < (UNIX_TIMESTAMP() - ".getConfig('bonus_timeout').")", __FUNCTION__, __LINE__);
        if (SQL_AFFECTEDROWS() > 0) {
                // Send out email to admin
                SEND_ADMIN_NOTIFICATION(AUTOPURGE_ADMIN_TURBO_SUBJECT, "admin_autopurge_turbo", SQL_AFFECTEDROWS(), "");