X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=459ea16c3bb665db23eccef1eea5cacb46a0e7a8;hb=2272afc569a7b308e6c34a2d28457495e6b2483b;hp=1a2b8fefa2a4c8d8fa3e37233a66cf954c17a51e;hpb=9eef96ed2070a2ca0eefb1e1e6cc4a1c8bb3a919;p=mailer.git diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php index 1a2b8fefa2..459ea16c3b 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 * @@ -43,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) { } // END - if // Add description as navigation point -addMenuDescription('admin', __FILE__); +addYouAreHereLink('admin', __FILE__); if (isBegRallyeEnabled()) { // Shall I withdraw now? @@ -52,14 +50,16 @@ if (isBegRallyeEnabled()) { $curr = getMonth() - 1; if (strlen($curr) == 1) $curr = '0' . $curr; updateConfiguration('last_month', $curr); - loadTemplate('admin_settings_saved', false, '{--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 @@ -77,13 +77,13 @@ ORDER BY if (!SQL_HASZERONUMS($result)) { // List users - $OUT = ''; $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 = ''; @@ -98,42 +98,42 @@ ORDER BY 'last_online' => generateDateTime($content['last_online'], 2), 'win1' => $WIN1, 'win2' => $WIN2, - 'cnt' => $cnt, + 'cnt' => $count, ); // Load template and add it $OUT .= loadTemplate('admin_list_beg_rows', true, $content); - $cnt++; $total += $content['beg_points']; + $count++; $total += $content['beg_points']; } // 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_beg_form', true); } else { // Display message "no manual withdraw possible" - $content['withdraw_form'] = loadTemplate('admin_settings_saved', true, '