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

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index b50b650a79..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 *
@@ -39,14 +40,14 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
 if (getConfig('bonus_active') == 'Y') {
 	// Shall I withdraw now?
-	if (isPostRequestElementSet(('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`';
@@ -94,16 +95,16 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
 			$WIN1 = ''; $WIN2 = '';
 			if ($cnt <= getConfig('bonus_ranks')) {
 				// Maybe he can win his active bonus?
-				$WIN1 = "<strong>";
-				$WIN2 = "</strong>";
-			}
+				$WIN1 = '<strong>';
+				$WIN2 = '</strong>';
+			} // 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;
@@ -123,14 +124,15 @@ ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
 			$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_saved', true, '<div class="admin_failed">{--ADMIN_BONUS_ALREADY_WITHDRAW--}</div>');
 		}
 
 		// 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, sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
+			$content['autopurge_timeout'] = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'autopurge');
 		}
 
 		// Load final template