X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=654f7eccca0a90e6a3598fdfeb5bb7f17af8bf4b;hb=1410e014d23f244e73d3a7916a61c2473416bab9;hp=7bf2f906c7b85ec460f966c8382d8df716c3b74d;hpb=4bd3e0bc483e982bc2e000337372a0e3fd4ca212;p=mailer.git diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 7bf2f906c7..654f7eccca 100644 --- a/inc/modules/admin/what-list_beg.php +++ b/inc/modules/admin/what-list_beg.php @@ -14,11 +14,9 @@ * $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 * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -40,26 +38,28 @@ // Some security stuff... if ((!defined('__SECURITY')) || (!isAdmin())) { die(); -} +} // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); -if (getConfig('beg_rallye') == 'Y') { +if (isBegRallyeEnabled()) { // 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_BEG_WITHDRAW_PREPARED')); + displayMessage('{--ADMIN_BEG_WITHDRAW_PREPARED--}'); } // END - if - // Autopurge installed? + // Init variable $lastOnline = ''; - if (isExtensionActive('autopurge')) { + + // Autopurge installed? + if ((isExtensionActive('autopurge')) && (isBegActiveEnabled()) && ((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 @@ -67,21 +67,23 @@ if (getConfig('beg_rallye') == 'Y') { FROM `{?_MYSQL_PREFIX?}_user_data` WHERE - `status`='CONFIRMED' AND beg_points > 0".$lastOnline." + `status`='CONFIRMED' AND + `beg_points` > 0 + " . $lastOnline . " ORDER BY `beg_points` DESC, `last_online` DESC, `userid` ASC", __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)) { // Init variables $WIN1 = ''; $WIN2 = ''; // Maybe he can win his active beg? - if ($cnt <= getConfig('beg_ranks')) { + if ($count <= getBegRanks()) { // Mark him $WIN1 = ''; $WIN2 = ''; @@ -94,45 +96,44 @@ ORDER BY 'gender' => $content['gender'], 'turbo' => $content['beg_points'], 'last_online' => generateDateTime($content['last_online'], 2), - 'sw' => $SW, 'win1' => $WIN1, 'win2' => $WIN2, - 'cnt' => $cnt, + 'cnt' => $count, ); // Load template and add it $OUT .= loadTemplate('admin_list_beg_rows', true, $content); - $SW = 3 - $SW; $cnt++; $total += $content['beg_points']; + $count++; $total += $content['beg_points']; } // 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_beg_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '