X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=492f1a0311119005003c3fe466823f40be2c43b2;hp=9e3167b567516feff326271b66ed095b0a9b8a9c;hb=c8d76610eb94093d4eed4fcd8a6cb72e74c8f6d8;hpb=64c8349613addc3da2242c5cd6b99d64e3fb5f8e

diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 9e3167b567..492f1a0311 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 02/04/2005 *
- * ================                             Last change: 11/19/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 02/04/2005 *
+ * ===================                          Last change: 11/19/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_bonus.php                              *
@@ -14,10 +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                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,53 +38,60 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (getConfig('bonus_active') == 'Y') {
+if (isBonusRallyeActive()) {
 	// 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;
+		$curr = getMonth() - 1;
+		if (strlen($curr) == 1) $curr = '0' . $curr;
 		updateConfiguration('last_month', $curr);
-		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
+		loadTemplate('admin_settings_saved', false, '{--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`";
-		if (getConfig('bonus_login_yn') == 'Y') $USE .= " + `login_bonus`";
-		if (getConfig('bonus_order_yn') == 'Y') $USE .= " + `bonus_order`";
-		if (getConfig('bonus_stats_yn') == 'Y') $USE .= " + `bonus_stats`";
-		if (getConfig('bonus_ref_yn')   == 'Y') $USE .= " + `bonus_ref`";
+		if (getConfig('bonus_click_yn') == 'Y') $USE .= ' + `turbo_bonus`';
+		if (getConfig('bonus_login_yn') == 'Y') $USE .= ' + `login_bonus`';
+		if (getConfig('bonus_order_yn') == 'Y') $USE .= ' + `bonus_order`';
+		if (getConfig('bonus_stats_yn') == 'Y') $USE .= ' + `bonus_stats`';
+		if (getConfig('bonus_ref_yn')   == 'Y') $USE .= ' + `bonus_ref`';
 		$USE .= ')';
 	} else {
 		// Old version ???
-		$USE = 'turbo_bonus';
+		$USE = '`turbo_bonus`';
 	}
 
 	// Autopurge installed?
-	$lastOnline = "%s"; $ONLINE = '';
+	$lastOnline = '%s'; $ONLINE = '';
 	if (isExtensionActive('autopurge')) {
 		// Use last online timestamp to keep inactive members away from here
-		$lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - %s)";
-		$ONLINE = getConfig('ap_inactive_since');
-	}
+		$lastOnline   = " AND `last_online` >= (UNIX_TIMESTAMP() - {?ap_inactive_since?})";
+	} // END - if
 
 	// 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`
-FROM `{?_MYSQL_PREFIX?}_user_data`
-WHERE `status`='CONFIRMED' AND ".$USE." > 0".$lastOnline."
-ORDER BY `points` DESC, `last_online` DESC, `userid` ASC",
-	array($ONLINE), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT
+	`userid`, `email`, `gender`, `surname`, `family`, ".$USE." AS points, `last_online`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`status`='CONFIRMED' AND
+	".$USE." > 0
+	".$lastOnline."
+ORDER BY
+	`points` DESC,
+	`last_online` DESC,
+	`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 = ''; $cnt = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Add total points
 			$total += $content['points'];
@@ -94,54 +100,51 @@ 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['sw']     = $SW;
+			$content['email']       = generateEmailLink($content['email'], 'user_data');
+			$content['last_online'] = generateDateTime($content['last_online'], 2);
 			$content['win1']   = $WIN1;
 			$content['win2']   = $WIN2;
 			$content['cnt']    = $cnt;
 
 			// Load template and add it
 			$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
-			$SW = 3 - $SW; $cnt++;
+			$cnt++;
 		} // END - while
 
 		$content['rows']  = $OUT;
 		$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'] = loadTemplate('admin_settings_saved', true, sprintf(getMessage('EXTENSION_PROBLEM_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, getMessage('ADMIN_BONUS_NO_ACTIVE_RALLYE'));
+		loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
 	}
 } else {
 	// Aktive-Rallye not activated
-	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
+	loadTemplate('admin_settings_saved', false, '{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
 }
 
 // [EOF]