X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fbonus_functions.php;h=57d2dc975e1f4e4fa25b72b06fd3d4b9240101ac;hb=ccd86939ba30aba70497c73264333f2fe4d786e8;hp=556cb910184134fdab79b7b15db096a6cde2043c;hpb=76250a0ea13d7958bc30723cfc540c016cc18318;p=mailer.git diff --git a/inc/libs/bonus_functions.php b/inc/libs/bonus_functions.php index 556cb91018..57d2dc975e 100644 --- a/inc/libs/bonus_functions.php +++ b/inc/libs/bonus_functions.php @@ -14,12 +14,10 @@ * $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 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * + * 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 * @@ -42,10 +40,12 @@ if (!defined('__SECURITY')) { die(); } // END - if -// This function must be run *BEFORE* a link is removed from table 'mxchange_user_links' ! +// This function must be run *BEFORE* a link is removed from table 'mailer_user_links' ! function addTurboBonus ($mid, $userid, $type) { // Shall we add bonus points? - if (!isBonusRallyeActive()) return false; + if (!isBonusRallyeActive()) { + return false; + } // END - if // Init variables $sql = ''; $bonus = '0'; $mail = '0'; $column = ''; @@ -65,7 +65,7 @@ function addTurboBonus ($mid, $userid, $type) { default: logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid type %s detected.", $type)); break; - } + } // END - switch // Is a column name set? if (empty($column)) { @@ -82,12 +82,12 @@ 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]; } else { - // Level not found! + // Level not found $points = '0.00000'; } } @@ -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), @@ -109,7 +109,9 @@ function addTurboBonus ($mid, $userid, $type) { $points ), __FUNCTION__, __LINE__); - if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD') && ($points > 0)) handleBonusPoints($points); + if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD') && ($points > 0)) { + handleBonusPoints($points, $userid); + } // END - if } // @@ -121,14 +123,14 @@ 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, - $userid + bigintval($userid) ), __FUNCTION__, __LINE__); // Entry found? @@ -140,9 +142,7 @@ function addBonusRanks ($data, $type, $userid) { $self = true; // Transfer data to template - $GLOBALS['ranking_content']['yr_level'] = $GLOBALS['ranking_content']['level']; - $GLOBALS['ranking_content']['yr_points'] = translateComma($GLOBALS['ranking_content']['points']); - $GLOBALS['ranking_content']['yr_tmark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1); + $GLOBALS['ranking_content']['timemark'] = generateDateTime($GLOBALS['ranking_content']['timemark'], 1); // Load template $GLOBALS['ranking_content']['own'] = loadTemplate('show_bonus_yr', true, $GLOBALS['ranking_content']); @@ -152,14 +152,11 @@ function addBonusRanks ($data, $type, $userid) { $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_bonus_turbo` WHERE `%s`=%s ORDER BY `level` ASC LIMIT {?bonus_lines?}", array($type, $data), __FUNCTION__, __LINE__); if (!SQL_HASZERONUMS($result)) { - // Start generating the ranking list - $max = SQL_NUMROWS($result); - // Output all ranks (levels) - for ($rank = 1; $rank <= $max; $rank++) { + 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 @@ -176,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 @@ -199,14 +187,14 @@ LIMIT 1", if ($self === false) { // If current user was not found set constant - $GLOBALS['ranking_content']['rankings'] = '{--BONUS_RANK_YOU_ARE_404--}'; + $GLOBALS['ranking_content']['rankings'] = '{--MEMBER_BONUS_RANK_YOU_ARE_404--}'; } // END - if } else { - // No entries found! + // No entries found // @TODO Move this HTML to a template $OUT = '