X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=ee9965faafac13e0fb95628ef8cdcc88a4c19f6a;hp=ddd819bbaec902cb13ef4cb003dbf0d8572664fd;hb=c78089215285d52d483760699d07a96dfbbe0671;hpb=7f104f6fe558bb56b4205241435a2357c2feece1 diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php index ddd819bbae..ee9965faaf 100644 --- a/inc/modules/member/what-bonus.php +++ b/inc/modules/member/what-bonus.php @@ -38,60 +38,56 @@ if (!defined('__SECURITY')) { } elseif (!IS_MEMBER()) { LOAD_URL("modules.php[5~?module=index"); } elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN())) { - ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus"); + addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), "bonus"); return; } // Add description as navigation point -ADD_DESCR("member", basename(__FILE__)); +ADD_DESCR("member", __FILE__); -if (GET_EXT_VERSION("bonus") >= "0.6.9") -{ +if (GET_EXT_VERSION("bonus") >= "0.6.9") { // Add more bonus points here + // @TODO Rewrite this to a filter $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 -{ +} else { // Old version ??? $USE = "turbo_bonus"; } // Autopurge installed? -$LAST = "%s"; $ONLINE = ""; +$lastOnline = "%s"; $ONLINE = ""; if (EXT_IS_ACTIVE("autopurge")) { // Use last online timestamp to keep inactive members away from here - $LAST = " AND last_online >= (UNIX_TIMESTAMP() - %s)"; - $ONLINE = $_CONFIG['ap_inactive_since']; + $lastOnline = " AND last_online >= (UNIX_TIMESTAMP() - %s)"; + $ONLINE = getConfig('ap_inactive_since'); } // Let's check if there are some points left we can "pay"... -$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS active_bonus, last_online FROM "._MYSQL_PREFIX."_user_data -WHERE ".$USE." > 0 AND status='CONFIRMED'".$LAST." -ORDER BY active_bonus DESC, last_online DESC, userid LIMIT %s", - array($ONLINE, $_CONFIG['bonus_ranks']), __FILE__, __LINE__); +$result = SQL_QUERY_ESC("SELECT userid, ".$USE." AS points, last_online FROM `{!_MYSQL_PREFIX!}_user_data` +WHERE ".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline." +ORDER BY points DESC, last_online DESC, userid +LIMIT %s", + array($ONLINE, getConfig('bonus_ranks')), __FILE__, __LINE__); // Reset temporary variable and check for users $OUT = ""; -if (SQL_NUMROWS($result) > 0) -{ +if (SQL_NUMROWS($result) > 0) { // Load our winners... $SW = 2; $cnt = 1; - while(list($uid, $turbo, $last) = SQL_FETCHROW($result)) - { + while ($content = SQL_FETCHARRAY($result)) { // Prepare data for the template $content = array( - 'sw' => $SW, - 'cnt' => $cnt, - 'uid' => bigintval($uid), - 'points' => TRANSLATE_COMMA($turbo), - 'last' => MAKE_DATETIME($last, "2"), - ); + $content['sw'] = $SW; + $content['cnt'] = $cnt; + $content['uid'] = bigintval($content['uid']); + $content['points'] = TRANSLATE_COMMA($content['points']); + $content['last'] = MAKE_DATETIME($content['last'], "2"); // Load row template $OUT .= LOAD_TEMPLATE("member_bonus_row", true, $content); @@ -99,9 +95,7 @@ if (SQL_NUMROWS($result) > 0) // Count one up and switch colors $cnt++;$SW = 3 - $SW; } -} - else -{ +} else { // No one is interested in our "active rallye" ! :-( $OUT = LOAD_TEMPLATE("member_bonus_404", true); }