X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=7210f7814326c787a2a9d86743dca40d68a6f4f5;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=38c8ee8f842e209b8014d4afa9a08c51825b5a86;hpb=7586c35752d48803eb6f2df1609331a3ca799e9f;p=mailer.git diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php index 38c8ee8f84..7210f78143 100644 --- a/inc/modules/admin/what-list_bonus.php +++ b/inc/modules/admin/what-list_bonus.php @@ -14,8 +14,6 @@ * $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 * @@ -43,16 +41,16 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); -if (getConfig('bonus_active') == 'Y') { +if (isBonusRallyeActive()) { // Shall I withdraw now? if (isPostRequestParameterSet('withdraw')) { // Okay, let's prepare... - $curr = date('m', time()) - 1; + $curr = getMonth() - 1; if (strlen($curr) == 1) $curr = '0' . $curr; updateConfiguration('last_month', $curr); - loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED')); + loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}'); } // END - if if (isExtensionInstalledAndNewer('bonus', '0.6.9')) { @@ -66,84 +64,87 @@ if (getConfig('bonus_active') == 'Y') { $USE .= ')'; } else { // Old version ??? - $USE = 'turbo_bonus'; + $USE = '`turbo_bonus`'; } // Autopurge installed? - $lastOnline = "%s"; $ONLINE = ''; + $lastOnline = '%s'; $ONLINE = ''; if (isExtensionActive('autopurge')) { // Use last online timestamp to keep inactive members away from here - $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)"; - $ONLINE = getConfig('ap_inactive_since'); - } + $lastOnline = " AND `last_online` >= (UNIX_TIMESTAMP() - {?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` -FROM `{?_MYSQL_PREFIX?}_user_data` -WHERE `status`='CONFIRMED' AND ".$USE." > 0".$lastOnline." -ORDER BY `points` DESC, `last_online` DESC, `userid` ASC", - array($ONLINE), __FILE__, __LINE__); + $result = SQL_QUERY_ESC("SELECT + `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online` +FROM + `{?_MYSQL_PREFIX?}_user_data` +WHERE + `status`='CONFIRMED' AND + ".$USE." > 0 + ".$lastOnline." +ORDER BY + `points` DESC, + `last_online` DESC, + `userid` ASC", + array($ONLINE), __FILE__, __LINE__); - if (SQL_NUMROWS($result) > 0) { + if (!SQL_HASZERONUMS($result)) { // List users - $OUT = '';$SW = 2; $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 <= getConfig('bonus_ranks')) { // Maybe he can win his active bonus? $WIN1 = ''; $WIN2 = ''; } // END - if // Prepare content - $content['userid'] = generateUserProfileLink($content['userid']); $content['email'] = generateEmailLink($content['email'], 'user_data'); - $content['gender'] = translateGender($content['gender']); - $content['points'] = translateComma($content['points']); $content['last_online'] = generateDateTime($content['last_online'], 2); - $content['sw'] = $SW; $content['win1'] = $WIN1; $content['win2'] = $WIN2; - $content['cnt'] = $cnt; + $content['cnt'] = $count; // Load template and add it $OUT .= loadTemplate('admin_list_bonus_rows', true, $content); - $SW = 3 - $SW; $cnt++; + $count++; } // END - while $content['rows'] = $OUT; - $content['total'] = translateComma($total); + $content['total'] = $total; // Check if we need to display form or not with manuel withdraw - if (getConfig('last_month') == date('m', time())) { + 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, '