Fix for missing array elements

[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 75a28ebbcc621cf6fba56da288204f1696ac6d1f..6a273ad932cef6662cbf60f95f631c90e46bb224 100644 (file)
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -47,7 +47,7 @@ addMenuDescription('admin', __FILE__);
 
 if (getConfig('bonus_active') == 'Y') {
        // Shall I withdraw now?
-       if (isPostRequestParameterSet(('withdraw'))) {
+       if (isPostRequestParameterSet('withdraw')) {
                // Okay, let's prepare...
                $curr = date('m', time()) - 1;
                if (strlen($curr) == 1) $curr = '0' . $curr;
@@ -55,7 +55,7 @@ if (getConfig('bonus_active') == 'Y') {
                loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
        } // END - if
 
-       if (getExtensionVersion('bonus') >= '0.6.9') {
+       if (isExtensionInstalledAndNewer('bonus', '0.6.9')) {
                // Add more bonus points here
                $USE = '(0';
                if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
@@ -100,11 +100,11 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
                        } // 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['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;
@@ -128,10 +128,11 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
                }
 
                // 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);
                } else {
-                       $content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge'));
+                       $content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge');
                }
 
                // Load final template