X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fbonus_functions.php;h=57d2dc975e1f4e4fa25b72b06fd3d4b9240101ac;hb=ccd86939ba30aba70497c73264333f2fe4d786e8;hp=9033627032e8fa88e1a83ae2ef46af2fa7ccaf7e;hpb=5c4d360166de238420eec3e5f4e694befb09ab5d;p=mailer.git diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 9033627032..57d2dc975e 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -17,7 +17,7 @@ * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -82,7 +82,7 @@ function addTurboBonus ($mid, $userid, $type) { $points = getConfig('turbo_bonus'); } else { // Anything else so let's explode all entered rank points - $test = explode(';', getConfig('turbo_rates')); + $test = explode(';', getTurboRates()); if (!empty($test[$rank - 2])) { // Level found $points = $test[$rank - 2]; @@ -95,12 +95,12 @@ function addTurboBonus ($mid, $userid, $type) { // Add points to his account directly SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `turbo_bonus`=`turbo_bonus`+%s WHERE `userid`=%s LIMIT 1", array( - bigintval($userid), - $points + $points, + bigintval($userid) ), __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())", + 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($userid), bigintval($mail), @@ -110,7 +110,7 @@ function addTurboBonus ($mid, $userid, $type) { ), __FUNCTION__, __LINE__); if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) { - handleBonusPoints($points); + handleBonusPoints($points, $userid); } // END - if } @@ -123,10 +123,10 @@ function addBonusRanks ($data, $type, $userid) { $GLOBALS['ranking_content']['rankings'] = ''; // How many ranks do we have? - $ranks = count(explode(';', getConfig('turbo_rates'))) + 1; + $ranks = count(explode(';', getTurboRates())) + 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", + $result = SQL_QUERY_ESC("SELECT `level`,`points`,`timemark` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s AND `userid`=%s LIMIT 1", array( $type, $data, @@ -156,7 +156,7 @@ function addBonusRanks ($data, $type, $userid) { for ($rank = 1; $rank <= SQL_NUMROWS($result); $rank++) { // Load data $result_users = SQL_QUERY_ESC("SELECT - `userid`, `points` + `userid`,`points` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE @@ -173,15 +173,6 @@ LIMIT 1", if (SQL_NUMROWS($result_users) == 1) { // Load data $rows = merge_array($rows, SQL_FETCHARRAY($result_users)); - - // Is ext-nickname active? - if (isExtensionActive('nickname')) { - // Then get the nickname - $nick = getNickname($rows['userid']); - - // Is it not empty? Then use it - if (!empty($nick)) $rows['userid'] = $nick; - } // END - if } // END - if // Free result @@ -203,7 +194,7 @@ LIMIT 1", // @TODO Move this HTML to a template $OUT = '