X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=06731189cccf177302244265ad27a9ed5bad26f6;hp=2605fa99e4bcb39782f32224b60b481caa67f95a;hb=391c98ab7233ff3e640d8b9fad8df92ce45e9b31;hpb=e2148142f8b1a8f40fd6e7ca32185569c5a9083e
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 2605fa99e4..06731189cc 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/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 - 2011 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,109 +38,113 @@
// Some security stuff...
if ((!defined('__SECURITY')) || (!isAdmin())) {
die();
-}
+} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('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;
+ $curr = getMonth() - 1;
if (strlen($curr) == 1) $curr = '0' . $curr;
updateConfiguration('last_month', $curr);
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
+ displayMessage('{--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 = ''; $count = 1; $total = '0';
while ($content = SQL_FETCHARRAY($result)) {
// Add total points
$total += $content['points'];
// Generate array fore the dynamic template
$WIN1 = ''; $WIN2 = '';
- if ($cnt <= getConfig('bonus_ranks')) {
+ if ($count <= getConfig('bonus_ranks')) {
// Maybe he can win his active bonus?
- $WIN1 = "";
- $WIN2 = "";
- }
+ $WIN1 = '';
+ $WIN2 = '';
+ } // 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;
+ $content['cnt'] = $count;
// Load template and add it
$OUT .= loadTemplate('admin_list_bonus_rows', true, $content);
- $SW = 3 - $SW; $cnt++;
+ $count++;
} // END - while
$content['rows'] = $OUT;
- $content['total'] = translateComma($total);
+ $content['total'] = $total;
// Check if we need to display form or not with manuel withdraw
- if (getConfig('last_month') == date('m', time())) {
+ if (getLastMonth() == 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, "{--ADMIN_BONUS_ALREADY_WITHDRAW--}
");
+ $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'));
+ displayMessage('{--ADMIN_BONUS_NO_ACTIVE_RALLYE--}');
}
} else {
// Aktive-Rallye not activated
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BONUS_RALLYE_DEACTIVATED'));
+ displayMessage('{--ADMIN_BONUS_RALLYE_DEACTIVATED--}');
}
// [EOF]