X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fmember%2Fwhat-beg2.php;h=b37ce184463f3864f713a15acaeed21b90e464ff;hb=d92d8b4ddd219b65df8e0bba5e4354c0bbfba5c9;hp=4de9d086f0a0a104f5777c0b61950e1d33347507;hpb=5071030af40e69ca4284642f44758964e18f5be8;p=mailer.git

diff --git a/inc/modules/member/what-beg2.php b/inc/modules/member/what-beg2.php
index 4de9d086f0..b37ce18446 100644
--- a/inc/modules/member/what-beg2.php
+++ b/inc/modules/member/what-beg2.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,31 +38,42 @@
 
 // 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('beg')) && (!IS_ADMIN())) {
-	addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'beg'));
-	return;
+	die();
+} elseif (!isMember()) {
+	redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('beg')) && (!isAdmin())) {
+	loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('beg'));
+	return;
+} // END - if
 
 // Autopurge installed?
-$lastOnline = "%s"; $ONLINE = '';
-if (EXT_IS_ACTIVE('autopurge')) {
+$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');
-}
+} // END - if
 
-// Let's check if there are some points left we can "pay"...
-$result = SQL_QUERY_ESC("SELECT userid, beg_points AS beg, last_online FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE beg_points > 0 AND `status`='CONFIRMED'".$lastOnline."
-ORDER BY beg_points DESC, last_online DESC, userid LIMIT %s",
-array($ONLINE, getConfig('beg_ranks')), __FILE__, __LINE__);
+// Let's check if there are some points left we can 'pay'...
+$result = SQL_QUERY_ESC("SELECT
+	`userid`, `beg_points` AS beg, `last_online`
+FROM
+	`{?_MYSQL_PREFIX?}_user_data`
+WHERE
+	`beg_points` > 0 AND `status`='CONFIRMED'".$lastOnline."
+ORDER BY
+	`beg_points` DESC, `last_online` DESC, `userid` ASC LIMIT %s",
+	array(
+		$ONLINE,
+		getConfig('beg_ranks')
+	), __FILE__, __LINE__);
 
 // Reset temporary variable and check for users
 $OUT = '';
@@ -74,30 +85,30 @@ if (SQL_NUMROWS($result) > 0) {
 		$content = array(
 			'sw'     => $SW,
 			'cnt'    => $cnt,
-			'uid'    => bigintval($content['userid']),
+			'userid'    => bigintval($content['userid']),
 			'points' => translateComma($content['beg']),
-			'last'   => generateDateTime($content['last_online'], '2'),
+			'last_online'   => generateDateTime($content['last_online'], '2'),
 		);
 
 		// Load row template
-		$OUT .= LOAD_TEMPLATE("member_list_beg_row", true, $content);
+		$OUT .= loadTemplate('member_list_beg_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_beg_404", true);
+	$OUT = loadTemplate('member_beg_404', true);
 }
 
+// Prepare content
+$content['rows'] = $OUT;
+
 // Free memory
 SQL_FREERESULT($result);
 
-// Remeber row(s) for the template
-define('__BEG_ROWS', $OUT);
-
 // Load final template
-LOAD_TEMPLATE("member_list_beg");
+loadTemplate('member_list_beg', false, $content);
 
 //
 ?>