X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=7b3524d3cdba3dfb0b3a7374b6c47be13cccc593;hb=11c7c0215361456e0fe975901d43f3c834d7044b;hp=029b357bf7805e3c95169da9e865a07ba1ee5ab2;hpb=9eef96ed2070a2ca0eefb1e1e6cc4a1c8bb3a919;p=mailer.git diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 029b357bf7..7b3524d3cd 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.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 * @@ -43,64 +41,68 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); if (isBonusRallyeActive()) { // Shall I withdraw now? - if (isPostRequestParameterSet('withdraw')) { + if (isPostRequestElementSet('withdraw')) { // Okay, let's prepare... $curr = getMonth() - 1; if (strlen($curr) == 1) $curr = '0' . $curr; updateConfiguration('last_month', $curr); - loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}'); + displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}'); } // END - if - if (isExtensionInstalledAndNewer('bonus', '0.6.9')) { + // Old version ??? + $USE = '`turbo_bonus`'; + + // Run filter chain to find more columns + $add = runFilterChain('add_bonus_points_user_columns', ''); + + // Add them, if some where configured + if (!empty($add)) { // Add more bonus points here - $USE = '(0'; - if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`'; - if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`'; - if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`'; - if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`'; - if (getConfig('bonus_ref_yn') == 'Y') $USE .= ' + `bonus_ref`'; - $USE .= ')'; - } else { - // Old version ??? - $USE = '`turbo_bonus`'; - } + $USE = '(0' . $add . ')'; + } // END - if + + // Init variables + $lastOnline = ''; // Autopurge installed? - $lastOnline = '%s'; $ONLINE = ''; - if (isExtensionActive('autopurge')) { + if ((isExtensionActive('autopurge')) && ((getApInactiveSince() > 0))) { // Use last online timestamp to keep inactive members away from here - $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})"; + $lastOnline = ' AND (UNIX_TIMESTAMP() - `last_online`) < {?ap_inactive_since?}'; } // END - if // Check if at least one is in the active rallye - $result = SQL_QUERY_ESC("SELECT - `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online` + $result = SQL_QUERY("SELECT + `userid`, + `email`, + " . $USE . " AS `points`, + `last_online` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `status`='CONFIRMED' AND - ".$USE." > 0 - ".$lastOnline." + " . $USE . " > 0 + " . $lastOnline . " ORDER BY `points` DESC, `last_online` DESC, - `userid` ASC", - array($ONLINE), __FILE__, __LINE__); + `userid` ASC", __FILE__, __LINE__); if (!SQL_HASZERONUMS($result)) { // List users - $OUT = ''; $cnt = 1; $total = '0'; + $OUT = ''; + $count = 1; + $total = '0'; while ($content = SQL_FETCHARRAY($result)) { // Add total points $total += $content['points']; // Generate array fore the dynamic template $WIN1 = ''; $WIN2 = ''; - if ($cnt <= getConfig('bonus_ranks')) { + if ($count <= getBonusRanks()) { // Maybe he can win his active bonus? $WIN1 = ''; $WIN2 = ''; @@ -109,44 +111,44 @@ ORDER BY // Prepare content $content['email'] = generateEmailLink($content['email'], 'user_data'); $content['last_online'] = generateDateTime($content['last_online'], 2); - $content['win1'] = $WIN1; - $content['win2'] = $WIN2; - $content['cnt'] = $cnt; + $content['win1'] = $WIN1; + $content['win2'] = $WIN2; + $content['count'] = $count; // Load template and add it $OUT .= loadTemplate('admin_list_bonus_rows', true, $content); - $cnt++; + $count++; } // END - while $content['rows'] = $OUT; - $content['total'] = translateComma($total); + $content['total_points'] = $total; // Check if we need to display form or not with manuel withdraw - if (getConfig('last_month') == getMonth()) { + if (getLastMonth() == getMonth()) { // Load form $content['withdraw_form'] = loadTemplate('admin_list_bonus_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '