X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=6a273ad932cef6662cbf60f95f631c90e46bb224;hp=e4fcf199f38d7664f252d59468b65db915678ab9;hb=d9f35786166902b9bc3f402d4f2abeed5ae0528d;hpb=a28637f0eb7975f2240c42d349e5f08a9722d9bb

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index e4fcf199f3..6a273ad932 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -46,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;
@@ -54,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`';
@@ -99,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;
@@ -127,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