X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_beg.php;h=51657ac194f1600809c70817477e95bf4b9aaa05;hb=5d19dadb6834777451aff1e0d89e6c8d5ceb8cd1;hp=0ffdfb9a074ded4aa4ccc7796d0850aec9f7e608;hpb=3f51c40f4fede87228216f9285b745a339e3891d;p=mailer.git

diff --git a/inc/modules/admin/what-list_beg.php b/inc/modules/admin/what-list_beg.php
index 0ffdfb9a07..51657ac194 100644
--- a/inc/modules/admin/what-list_beg.php
+++ b/inc/modules/admin/what-list_beg.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 10/22/2005 *
- * ================                             Last change: 10/22/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 10/22/2005 *
+ * ===================                          Last change: 10/22/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_beg.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 *
@@ -37,26 +37,26 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
 }
+
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
 if (getConfig('beg_rallye') == 'Y') {
 	// Shall I withdraw now?
-	if (REQUEST_ISSET_POST(('withdraw'))) {
+	if (isPostRequestElementSet(('withdraw'))) {
 		// Okay, let's prepare...
 		$curr = date('m', time()) - 1;
-		if (strlen($curr) == 1) $curr = '0'.$curr;
+		if (strlen($curr) == 1) $curr = '0' . $curr;
 		updateConfiguration('last_month', $curr);
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_WITHDRAW_PREPARED'));
 	} // END - if
 
 	// 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');
@@ -64,73 +64,74 @@ if (getConfig('beg_rallye') == 'Y') {
 
 	// Check if at least one is in the active rallye
 	$result = SQL_QUERY_ESC("SELECT userid, email, gender, surname, family, beg_points, last_online
-FROM `{!_MYSQL_PREFIX!}_user_data`
+FROM `{?_MYSQL_PREFIX?}_user_data`
 WHERE `status`='CONFIRMED' AND beg_points > 0".$lastOnline."
 ORDER BY beg_points DESC, last_online DESC, userid",
 	array($ONLINE), __FILE__, __LINE__);
 
 	if (SQL_NUMROWS($result) > 0) {
 		// List users
-		$OUT = '';$SW = 2; $cnt = 1; $total = 0;
+		$OUT = '';$SW = 2; $cnt = 1; $total = '0';
 		while ($content = SQL_FETCHARRAY($result)) {
 			// Init variables
 			$WIN1 = ''; $WIN2 = '';
+
+			// Maybe he can win his active beg?
 			if ($cnt <= getConfig('beg_ranks')) {
-				// Maybe he can win his active beg?
-				$WIN1 = "<strong>";
-				$WIN2 = "</strong>";
+				// Mark him
+				$WIN1 = '<strong>';
+				$WIN2 = '</strong>';
 			} // END - if
 
 			// Prepare content
-			// @TODO Rewrite templates so s/fname will be replaced by surname/family
-			// @TODO to shorten this block. Please also do so with uid->userid
 			$content = array(
-				'uid'    => $content['userid'],
-				'email'  => generateEmailLink($content['email'], 'user_data'),
-				'gender' => translateGender($content['gender']),
-				'sname'  => $content['surname'],
-				'fname'  => $content['family'],
-				'turbo'  => translateComma($content['beg_points']),
-				'last'   => generateDateTime($content['last_online'], '2'),
-				'sw'     => $SW,
-				'win1'   => $WIN1,
-				'win2'   => $WIN2,
-				'cnt'    => $cnt,
+				'userid'      => $content['userid'],
+				'email'       => generateEmailLink($content['email'], 'user_data'),
+				'gender'      => translateGender($content['gender']),
+				'surname'     => $content['surname'],
+				'family'      => $content['family'],
+				'turbo'       => translateComma($content['beg_points']),
+				'last_online' => generateDateTime($content['last_online'], 2),
+				'sw'          => $SW,
+				'win1'        => $WIN1,
+				'win2'        => $WIN2,
+				'cnt'         => $cnt,
 			);
 
 			// Load template and add it
-			$OUT .= LOAD_TEMPLATE("admin_list_beg_rows", true, $content);
+			$OUT .= loadTemplate('admin_list_beg_rows', true, $content);
 			$SW = 3 - $SW; $cnt++; $total += $content['beg_points'];
 		}
-		define('__BEG_ROWS', $OUT);
-		define('__TOTAL', translateComma($total));
+
+		$content['rows']  = $OUT;
+		$content['total'] = translateComma($total);
 
 		// Check if we need to display form or not with manuel withdraw
 		if (getConfig('last_month') == date('m', time())) {
 			// Load form
-			define('__BEG_WITHDRAW_FORM', LOAD_TEMPLATE("admin_list_beg_form", true));
+			$content['withdraw_form'] = loadTemplate('admin_list_beg_form', true);
 		} else {
 			// Display message "no manual withdraw possible"
-			define('__BEG_WITHDRAW_FORM', "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
+			$content['withdraw_form'] = loadTemplate('admin_settings_saved', true, "<div class=\"admin_failed\">{--ADMIN_BEG_ALREADY_WITHDRAW--}</div>");
 		}
 
 		// Prepare constant for timemark
-		if (EXT_IS_ACTIVE('autopurge')) {
-			define('__AUTOPURGE_TIMEOUT', generateDateTime(time() - getConfig('ap_inactive_since'), '2'));
+		if (isExtensionActive('autopurge')) {
+			$content['autopurge_timeout'] = generateDateTime(time() - getConfig('ap_inactive_since'), 2);
 		} else {
-			define('__AUTOPURGE_TIMEOUT', sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
+			$content['autopurge_timeout'] = loadTemplate('admin_settings_saved', true, sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'autopurge'));
 		}
 
 		// Load final template
-		LOAD_TEMPLATE("admin_list_beg");
+		loadTemplate('admin_list_beg', false, $content);
 	} else {
 		// No one has joined the begging rallye...
-		LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
+		loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_NO_RALLYE'));
 	}
 } else {
 	// Rallye deactivated
-	LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
+	loadTemplate('admin_settings_saved', false, getMessage('ADMIN_BEG_RALLYE_DEACTIVATED'));
 }
 
-//
+// [EOF]
 ?>