Title rows added to several table, naming convention applied:

[mailer.git] / inc / modules / admin / what-list_bonus.php

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index a2d500a129cfb1d8f052d811b7f85e6b87ba7e94..f1749a980b3969e315dc05e00ec259ce824d63a3 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.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,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, '{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
+               displayMessage('{--ADMIN_BONUS_WITHDRAW_PREPARED--}');
        } // END - if
 
        if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
@@ -78,7 +76,7 @@ if (getConfig('bonus_active') == 'Y') {
 
        // 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`
+       `userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS `points`, `last_online`
 FROM
        `{?_MYSQL_PREFIX?}_user_data`
 WHERE
@@ -91,16 +89,16 @@ ORDER BY
        `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 = '<strong>';
                                $WIN2 = '</strong>';
@@ -109,45 +107,44 @@ ORDER BY
                        // Prepare content
                        $content['email']       = generateEmailLink($content['email'], 'user_data');
                        $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, '<div class="admin_failed">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>');
+                       $content['withdraw_form'] = loadTemplate('admin_settings_unsaved', true, '{--ADMIN_BONUS_ALREADY_WITHDRAW--}');
                }
 
                // Prepare constant for timemark
                // @TODO Can't this be moved into our expression language?
                if (isExtensionActive('autopurge')) {
-                       $content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
+                       $content['autopurge_timeout'] = '{%message,ADMIN_BONUS_TIMEOUT=' . generateDateTime(time() - getApInactiveSince(), 2) . '%}';
                } else {
-                       $content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge');
+                       $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
                }
 
                // Load final template
                loadTemplate('admin_list_bonus', false, $content);
        } else {
                // No one has become an "activity bonus"...
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
+               displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
        }
 } else {
        // Aktive-Rallye not activated
-       loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
+       displayMessage('{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]