X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=0344efecca1179f53e941b17be6bc5dd0f57c615;hp=00faebcc6bcbd5bff7d2c7cf7820f4c1d6b3bcd0;hb=5071030af40e69ca4284642f44758964e18f5be8;hpb=5ef6ed7373ae85e5635e39e2a0adf9496a8add05

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index 00faebcc6b..0344efecca 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Bonusseiten fuer ein paar Extrapunkte            *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -32,83 +37,71 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+if (!defined('__SECURITY')) {
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
-}
- elseif (!IS_LOGGED_IN())
-{
-	LOAD_URL(URL."/modules.php[5~?module=index");
-}
- elseif ((!EXT_IS_ACTIVE("bonus")) && (!IS_ADMIN()))
-{
-	ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "bonus");
+} elseif (!IS_MEMBER()) {
+	redirectToUrl('modules.php?module=index');
+} elseif ((!EXT_IS_ACTIVE('bonus')) && (!IS_ADMIN())) {
+	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'bonus'));
 	return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", basename(__FILE__));
-OUTPUT_HTML("</FONT><BR>");
+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 = "";
-if (EXT_IS_ACTIVE("autopurge"))
-{
+$lastOnline = "%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_in_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)
-{
+$OUT = '';
+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"),
+			'uid'    => bigintval($content['uid']),
+			'points' => translateComma($content['points']),
+			'last'   => generateDateTime($content['last'], '2')
 		);
 
 		// Load row template
 		$OUT .= LOAD_TEMPLATE("member_bonus_row", true, $content);
 
 		// Count one up and switch colors
-		$cnt++;$SW = 3 - $SW;
+		$cnt++; $SW = 3 - $SW;
 	}
-}
- else
-{
+} else {
 	// No one is interested in our "active rallye" ! :-(
 	$OUT = LOAD_TEMPLATE("member_bonus_404", true);
 }