X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-bonus.php;h=5960bd49a694a7798d759f3abfb9539b38735b32;hb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb;hp=e99e0c64f0047ef81d5ddb5942358efeb647c77a;hpb=3f51c40f4fede87228216f9285b745a339e3891d;p=mailer.git

diff --git a/inc/modules/member/what-bonus.php b/inc/modules/member/what-bonus.php
index e99e0c64f0..5960bd49a6 100644
--- a/inc/modules/member/what-bonus.php
+++ b/inc/modules/member/what-bonus.php
@@ -17,7 +17,7 @@
  * 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                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,36 +38,37 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-} elseif (!IS_MEMBER()) {
-	redirectToUrl('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('bonus')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('bonus'));
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('bonus')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('bonus'));
+	return;
+} // END - if
 
-if (GET_EXT_VERSION('bonus') >= '0.6.9') {
+if (getExtensionVersion('bonus') >= '0.6.9') {
 	// Add more bonus points here
 	// @TODO Rewrite this to a filter
-	$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";
-	$USE .= ")";
+	$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`';
+	$USE .= ')';
 } else {
 	// Old version ???
-	$USE = "turbo_bonus";
+	$USE = '`turbo_bonus`';
 }
 
 // Autopurge installed?
 $lastOnline = "%s"; $ONLINE = '';
-if (EXT_IS_ACTIVE('autopurge')) {
+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');
@@ -75,11 +76,11 @@ if (EXT_IS_ACTIVE('autopurge')) {
 
 // Let's check if there are some points left we can 'pay'...
 $result = SQL_QUERY_ESC("SELECT
-	`userid`, `".$USE."` AS points, `last_online`
+	`userid`, ".$USE." AS points, `last_online`
 FROM
-	`{!_MYSQL_PREFIX!}_user_data`
+	`{?_MYSQL_PREFIX?}_user_data`
 WHERE
-	`".$USE."` > 0 AND `status`='CONFIRMED'".$lastOnline."
+	".$USE." > 0 AND `status`='CONFIRMED'".$lastOnline."
 ORDER BY
 	`points` DESC,
 	last_online DESC,
@@ -100,30 +101,30 @@ if (SQL_NUMROWS($result) > 0) {
 		$content = array(
 			'sw'     => $SW,
 			'cnt'    => $cnt,
-			'uid'    => bigintval($content['uid']),
+			'userid'    => bigintval($content['userid']),
 			'points' => translateComma($content['points']),
-			'last'   => generateDateTime($content['last'], '2')
+			'last_online'   => generateDateTime($content['last_online'], 2)
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE('member_bonus_row', true, $content);
+		$OUT .= loadTemplate('member_bonus_row', true, $content);
 
 		// Count one up and switch colors
 		$cnt++; $SW = 3 - $SW;
 	}
 } else {
 	// No one is interested in our "active rallye" ! :-(
-	$OUT = LOAD_TEMPLATE('member_bonus_404', true);
+	$OUT = loadTemplate('member_bonus_404', true);
 }
 
 // Free memory
 SQL_FREERESULT($result);
 
-// Remeber row(s) for the template
-define('__BONUS_ROWS', $OUT);
+// Prepare content array
+$content['rows'] = $OUT;
 
 // Load final template
-LOAD_TEMPLATE('member_bonus');
+loadTemplate('member_bonus', false, $content);
 
-//
+// [EOF]
 ?>