X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_bonus.php;h=f7719b9a3227789d97ef047cbe85d673d15414c5;hb=77cdaff2afb97ed32985ced906a3a95ee078c2ef;hp=7b02b64a92348de6184214e81487d95ff74ce458;hpb=e521a48cf5d2a3090bd8d7a9cb21dfbc2dfda257;p=mailer.git
diff --git a/inc/modules/admin/what-list_bonus.php b/inc/modules/admin/what-list_bonus.php
index 7b02b64a92..f7719b9a32 100644
--- a/inc/modules/admin/what-list_bonus.php
+++ b/inc/modules/admin/what-list_bonus.php
@@ -32,33 +32,32 @@
************************************************************************/
// Some security stuff...
-if ((!defined('__SECURITY')) || (!is_admin())) {
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
require($INC);
}
// Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
-if ($_CONFIG['bonus_active'] == "Y") {
+if (getConfig('bonus_active') == "Y") {
// Shall I withdraw now?
if (isset($_POST['withdraw'])) {
// Okay, let's prepare...
$curr = date("m", time()) - 1;
if (strlen($curr) == 1) $curr = "0".$curr;
UPDATE_CONFIG("last_month", $curr);
- LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_BONUS_WITHDRAW_PREPARED);
- OUTPUT_HTML("
");
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_BONUS_WITHDRAW_PREPARED'));
}
if (GET_EXT_VERSION("bonus") >= "0.6.9") {
// Add more bonus points here
$USE = "(0";
- if ($_CONFIG['bonus_click_yn'] == "Y") $USE .= " + turbo_bonus";
- if ($_CONFIG['bonus_login_yn'] == "Y") $USE .= " + login_bonus";
- if ($_CONFIG['bonus_order_yn'] == "Y") $USE .= " + bonus_order";
- if ($_CONFIG['bonus_stats_yn'] == "Y") $USE .= " + bonus_stats";
- if ($_CONFIG['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 ???
@@ -69,79 +68,75 @@ if ($_CONFIG['bonus_active'] == "Y") {
$LAST = "%s"; $ONLINE = "";
if (EXT_IS_ACTIVE("autopurge")) {
// Use last online timestamp to keep inactive members away from here
- $LAST = " AND last_online >= %s";
- $ONLINE = bigintval(time() - $_CONFIG['ap_inactive_since']);
+ $LAST = " AND last_online >= (UNIX_TIMESTAMP() - %s)";
+ $ONLINE = getConfig('ap_inactive_since');
}
// Check if at least one is in the active rallye
- $result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, ".$USE." AS active_bonus, last_online
-FROM "._MYSQL_PREFIX."_user_data
-WHERE status='CONFIRMED' AND ".$USE." > 0".$LAST."
-ORDER BY active_bonus DESC, last_online DESC, userid",
+ $result = SQL_QUERY_ESC("SELECT userid AS uid, email, gender, surname, family, ".$USE." AS points, last_online AS last
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `status`='CONFIRMED' AND ".$USE." > 0".$LAST."
+ORDER BY points DESC, last_online DESC, userid",
array($ONLINE), __FILE__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
// List users
$OUT = "";$SW = 2; $cnt = 1; $total = 0;
- while(list($uid, $email, $gender, $sname, $fname, $turbo, $last) = SQL_FETCHROW($result)) {
+ while ($content = SQL_FETCHARRAY($result)) {
+ // Add total points
+ $total += $content['points'];
+
// Generate array fore the dynamic template
$WIN1 = ""; $WIN2 = "";
- if ($cnt <= $_CONFIG['bonus_ranks']) {
+ if ($cnt <= getConfig('bonus_ranks')) {
// Maybe he can win his active bonus?
- $WIN1 = "";
- $WIN2 = "";
+ $WIN1 = "";
+ $WIN2 = "";
}
// Prepare content
- $content = array(
- 'uid' => $uid,
- 'email' => CREATE_EMAIL_LINK($email, "user_data"),
- 'gender' => TRANSLATE_GENDER($gender),
- 'sname' => $sname,
- 'fname' => $fname,
- 'turbo' => TRANSLATE_COMMA($turbo),
- 'last' => MAKE_DATETIME($last, "2"),
- 'sw' => $SW,
- 'win1' => $WIN1,
- 'win2' => $WIN2,
- 'cnt' => $cnt,
- );
+ $content['uid'] = ADMIN_USER_PROFILE_LINK($content['uid']);
+ $content['email'] = CREATE_EMAIL_LINK($content['email'], "user_data");
+ $content['gender'] = TRANSLATE_GENDER($content['gender']);
+ $content['points'] = TRANSLATE_COMMA($content['points']);
+ $content['last'] = MAKE_DATETIME($content['last'], "2");
+ $content['sw'] = $SW;
+ $content['win1'] = $WIN1;
+ $content['win2'] = $WIN2;
+ $content['cnt'] = $cnt;
// Load template and add it
$OUT .= LOAD_TEMPLATE("admin_list_bonus_rows", true, $content);
- $SW = 3 - $SW; $cnt++; $total += $turbo;
+ $SW = 3 - $SW; $cnt++;
}
define('__BONUS_ROWS', $OUT);
define('__TOTAL', TRANSLATE_COMMA($total));
// Check if we need to display form or not with manuel withdraw
- if ($_CONFIG['last_month'] == date("m", time()))
- {
+ if (getConfig('last_month') == date("m", time())) {
// Load form
define('__BONUS_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_bonus_form", true));
- }
- else
- {
+ } else {
// Display message "no manual withdraw possible"
- define('__BONUS_WITHDRAW_FORM', "".ADMIN_BONUS_ALREADY_WITHDRAW."");
+ define('__BONUS_WITHDRAW_FORM', "