Naming convention applied to language strings, new API function added:

[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 5b295dd7e5f2eccc921701dc3e65a265c5fa7d3b..9fc35e7e6b2c70a19dffa20e3d5a59c651af038f 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -45,11 +45,11 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('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--}');
@@ -91,7 +91,7 @@ ORDER BY
        `userid` ASC",
                array($ONLINE), __FILE__, __LINE__);
 
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // List users
                $OUT = ''; $cnt = 1; $total = '0';
                while ($content = SQL_FETCHARRAY($result)) {
@@ -122,20 +122,20 @@ ORDER BY
                $content['total'] = translateComma($total);
 
                // Check if we need to display form or not with manuel withdraw
-               if (getConfig('last_month') == date('m', time())) {
+               if (getConfig('last_month') == 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'] = generateDateTime(time() - getApInactiveSince(), 2);
                } else {
-                       $content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'autopurge');
+                       $content['autopurge_timeout'] = generateExtensionInactiveNotInstalledMessage('autopurge');
                }
 
                // Load final template