X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=205d3c2139a6aaad6a355e25f2d37723be094e78;hp=8c46526b68a11e427e5761a2568366779245ae30;hb=04b69ac9f33369cbf654396c4a42cb1fff710ff4;hpb=b73179774f08d52b76fe1836ab80f085f05f8e46

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 8c46526b68..205d3c2139 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/29/2004 *
- * ================                             Last change: 02/11/2005 *
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 02/11/2005 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-list_rallyes.php                            *
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -39,72 +40,83 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
 	die();
-}
+} // END - if
 
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-if (!isGetRequestElementSet('sub')) setRequestGetElement('sub', '');
+// Init message
 $message = '';
 
 // Quick actions on a rallye
-if (isGetRequestElementSet('rallye')) {
+if (isGetRequestParameterSet('rallye')) {
 	// Init SQL queries
 	initSqls();
 
-	if (isGetRequestElementSet('activate')) {
+	if (isGetRequestParameterSet('activate')) {
 		// Activate / deactivate
-		switch (getRequestElement('activate')) {
-			case 1: // Activate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1");
+		switch (getRequestParameter('activate')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='Y' WHERE `id`=%s AND `is_active`='N' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
 
-			case 0: // Deactivate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1");
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `is_active`='N' WHERE `id`=%s AND `is_active`='Y' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
-		}
-	} elseif (isGetRequestElementSet('notify')) {
+		} // END - switch
+	} elseif (isGetRequestParameterSet('notify')) {
 		// Automatic notification
-		switch (getRequestElement('notify')) {
-			case 1: // Activate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1");
+		switch (getRequestParameter('notify')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='Y' WHERE `id`=%s AND `send_notify`='N' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
 
-			case 0: // Deactivate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1");
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `send_notify`='N' WHERE `id`=%s AND `send_notify`='Y' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
-		}
-	} elseif (isGetRequestElementSet('auto')) {
+		} // END - switch
+	} elseif (isGetRequestParameterSet('auto')) {
 		// Automatic adding of new members
-		switch (getRequestElement('auto')) {
-			case 1: // Activate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1");
+		switch (getRequestParameter('auto')) {
+			case '1': // Activate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='Y' WHERE `id`=%s AND `auto_add_new_user`='N' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
 
-			case 0: // Deactivate
-				addSql("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1");
+			case '0': // Deactivate
+				addSql(SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_rallye_data` SET `auto_add_new_user`='N' WHERE `id`=%s AND `auto_add_new_user`='Y' LIMIT 1",
+					array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__, false)
+				);
 				break;
-		}
+		} // END - switch
 	}
 
 	// Run SQL command
 	runFilterChain('run_sqls');
-} elseif (isPostRequestElementSet('remove')) {
+} elseif (isFormSent('remove')) {
 	// Delete rallyes
-	$SEL = countPostSelection();
-	if ($SEL > 0) {
+	if (countPostSelection() > 0) {
 		// Init SQLs
 		initSqls();
 
 		// Delete selected rallyes and all it's data
-		foreach (postRequestElement('sel') as $id => $selected) {
+		foreach (postRequestParameter('sel') as $id => $selected) {
 			// Remove selected rallye entirely...
 			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_data` WHERE `id`=%s LIMIT 1",
-			array(bigintval($id)), __FILE__, __LINE__, false));
-			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE rallye_id=%s",
-			array(bigintval($id)), __FILE__, __LINE__, false));
-			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE rallye_id=%s",
-			array(bigintval($id)), __FILE__, __LINE__, false));
+				array(bigintval($id)), __FILE__, __LINE__, false));
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_prices` WHERE `rallye_id`=%s",
+				array(bigintval($id)), __FILE__, __LINE__, false));
+			addSql(SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s",
+				array(bigintval($id)), __FILE__, __LINE__, false));
 		} // END - foreach
 
 		// Run SQLS
@@ -116,21 +128,20 @@ if (isGetRequestElementSet('rallye')) {
 		// No rallye selected to delete!
 		$message = getMessage('RALLYE_DELETE_NOTHING_SELECTED');
 	}
-} elseif (isPostRequestElementSet('change')) {
+} elseif (isFormSent('change')) {
 	// Change rallye
-	$SEL = countSelection(postRequestElement('title'));
-	if ($SEL > 0) {
+	if (countSelection(postRequestParameter('title')) > 0) {
 		// Init SQLs
 		initSqls();
 
 		// Change selected rallyes and all it's data
-		foreach (postRequestElement('title') as $id => $title) {
+		foreach (postRequestParameter('title') as $id => $title) {
 			// Secure id number
 			$id = bigintval($id);
 
 			// Generate timestamps
-			$START = mktime(postRequestElement('start_hour', $id), postRequestElement('start_min', $id), postRequestElement('start_sec', $id), postRequestElement('start_month', $id), postRequestElement('start_day', $id), postRequestElement('start_year', $id));
-			$END   = mktime(postRequestElement('end_hour', $id)  , postRequestElement('end_min', $id)  , postRequestElement('end_sec', $id)  , postRequestElement('end_month', $id)  , postRequestElement('end_day', $id)  , postRequestElement('end_year', $id)  );
+			$START = mktime(postRequestParameter('start_hour', $id), postRequestParameter('start_min', $id), postRequestParameter('start_sec', $id), postRequestParameter('start_month', $id), postRequestParameter('start_day', $id), postRequestParameter('start_year', $id));
+			$END   = mktime(postRequestParameter('end_hour', $id)  , postRequestParameter('end_min', $id)  , postRequestParameter('end_sec', $id)  , postRequestParameter('end_month', $id)  , postRequestParameter('end_day', $id)  , postRequestParameter('end_year', $id)  );
 
 			// Update entry
 			addSql(SQL_QUERY_ESC("UPDATE
@@ -139,21 +150,21 @@ SET
 	`title`='%s',
 	`descr`='%s',
 	`template`='%s',
-	`start_time`='%s',
-	`end_time`='%s',
-	`min_users`='%s',
-	`min_prices`='%s'
+	`start_time`=%s,
+	`end_time`=%s,
+	`min_users`=%s,
+	`min_prices`=%s
 WHERE
-	`id`='%s'
+	`id`=%s
 LIMIT 1",
 			array(
 				$title,
-				postRequestElement('descr', $id),
-				postRequestElement('templ', $id),
+				postRequestParameter('descr', $id),
+				postRequestParameter('templ', $id),
 				bigintval($START),
 				bigintval($END),
-				bigintval(postRequestElement('min_users', $id)),
-				bigintval(postRequestElement('min_prices', $id)),
+				bigintval(postRequestParameter('min_users', $id)),
+				bigintval(postRequestParameter('min_prices', $id)),
 				$id
 			), __FILE__, __LINE__, false));
 		}
@@ -166,13 +177,12 @@ LIMIT 1",
 	}
 }
 
-if (isPostRequestElementSet('edit')) {
+if (isFormSent('edit')) {
 	// Check for selections
-	$SEL = countPostSelection();
-	if ($SEL > 0) {
+	if (countPostSelection() > 0) {
 		// Make all selected and deactivated rallyes editable
 		$OUT = ''; $SW = 2;
-		foreach (postRequestElement('sel') as $id => $selected) {
+		foreach (postRequestParameter('sel') as $id => $selected) {
 			// Load rallye basic data
 			$result = SQL_QUERY_ESC("SELECT
 	`title`, `descr`, `template`, `start_time`, `end_time`, `min_users`, `min_prices`
@@ -214,21 +224,28 @@ LIMIT 1",
 
 			// Color switching
 			$SW = 3 - $SW;
-		}
+		} // END - foreach
 
 		// Load final template
 		loadTemplate('admin_edit_rallyes', false, $OUT);
 	} else {
 		// Nothing selected to edit
-		loadTemplate('admin_settings_saved', false, loadTemplate('admin_list_rallye_noselect', true));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
 	}
-} elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
+} elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
 	// List users and their refs before start and current
-	$result = SQL_QUERY_ESC("SELECT `userid`, `refs`, `curr_points` FROM `{?_MYSQL_PREFIX?}_rallye_users` WHERE `rallye_id`=%s ORDER BY `userid` ASC",
-		array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
+	$result = SQL_QUERY_ESC("SELECT
+	`userid`, `refs`, `curr_points`
+FROM
+	`{?_MYSQL_PREFIX?}_rallye_users`
+WHERE
+	`rallye_id`=%s
+ORDER BY
+	`userid` ASC",
+		array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) > 0) {
 		$OUT = ''; $SW = 2;
-		$content['rallye'] = getRequestElement('rallye');
+		$content['rallye'] = getRequestParameter('rallye');
 		while ($row = SQL_FETCHARRAY($result)) {
 			// Check for referal count
 			$cnt = getReferalRallyeRefsCount($row['userid'], $row['refs']);
@@ -238,28 +255,21 @@ LIMIT 1",
 			$br = '';
 
 			// Output row
-			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = "<strong>"; $br = "</strong>"; }
-			if (($row['refs'] > 0) || ($cnt > 0)) {
-				// Insert link to referal list
-				//* DEBUG: */ outputHtml('-'.$row['userid'].'/'.$cnt.'/'.$row['refs']."-<br />");
-				$cnt = generateUserProfileLink($row['userid'], $cnt, 'list_refs');
-				$row['refs'] = generateUserProfileLink($row['userid'], $row['refs'], 'list_refs');
-			} // END - if
+			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = '<strong>'; $br = '</strong>'; }
 
 			// Get user points
 			$points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
-			//* DEBUG: */ outputHtml(basename(__FILE__).":userid={$row['userid']},points={$points},opoints={$row['curr_points']}<br />");
+			//* DEBUG: */ debugOutput(basename(__FILE__).':userid='.$row['userid'].',points='.$points.',opoints='.$row['curr_points']);
 
 			// Prepare content
-			// @TODO Rewritings: userid->userid,opoints->curr_points,old->refs in template
 			$row = array(
 				'sw'      => $SW ,
-				'userid'     => $row['userid'],
+				'userid'  => $row['userid'],
 				'bold_l'  => $bl ,
 				'bold_r'  => $br ,
-				'old'     => $row['refs'],
+				'rews'    => $row['refs'],
 				'cnt'     => $cnt,
-				'opoints' => translateComma($points - $row['curr_points']),
+				'opoints' => ($points - $row['curr_points']),
 			);
 
 			// Load row template and switch color
@@ -267,19 +277,24 @@ LIMIT 1",
 			$SW = 3 - $SW;
 		} // END - while
 
+		// Remember rows
+		$content['rows']   = $OUT;
+		$content['rallye'] = getRequestParameter('rallye');
+
 		// Free memory
 		SQL_FREERESULT($result);
 
 		// Load template
-		loadTemplate('admin_list_rallye_usr', false, $OUT);
+		loadTemplate('admin_list_rallye_usr', false, $content);
 	} else {
 		// No entries found?
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_ADMIN_USERS_404'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
 	}
 } else {
 	// Start listing rallyes
 	$result = SQL_QUERY("SELECT
-	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`, `auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
+	`id`, `admin_id`, `title`, `descr`, `template`, `start_time`, `end_time`,
+	`auto_add_new_user`, `is_active`, `send_notify`, `notified`, `min_users`, `min_prices`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_data`
 ORDER BY
@@ -294,12 +309,12 @@ ORDER BY
 			$data['login'] = getAdminLogin($data['admin_id']);
 
 			// Count joined userids
-			$joined = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
+			$users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
 			// Did some users joined this rallye?
-			if ($joined > 0) {
+			if ($users > 0) {
 				// List joined users
-				$joined = "<a href=\"{?URL?}/modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=".$data['id']."\" title=\"{--RALLYE_LIST_USERS_TITLE--}\">".$joined."</a>";
+				$users = '<a href="{%url=modules.php?module=admin&amp;what=list_rallyes&amp;sub=users&amp;rallye=' . $data['id'] . '%}" title="{--RALLYE_LIST_USERS_TITLE--}">' . $users . '</a>';
 			} // END - if
 
 			// Alter some variables
@@ -309,67 +324,66 @@ ORDER BY
 
 			// Transfer data into array for the template
 			$row = array(
-				'select'     => "<input type=\"checkbox\" name=\"sel[".$data['id']."]\" class=\"admin_normal\" value=\"1\" />",
-				'admin_id'   => $data['admin_id'],
-				'email_link' => generateEmailLink($data['admin_id']),
-				'login'      => $data['login'],
-				'id'         => $data['id'],
-				'sw'         => $SW,
-				'title'      => $data['title'],
-				'template'   => $data['template'],
-				'joined'     => $joined,
-				'start_date' => generateDateTime($data['start_time'], 2),
-				'end_date'   => generateDateTime($data['end_time']  , 2),
-				'active_lnk' => translateYesNo($data['is_active']),
-				'notify_lnk' => translateYesNo($data['send_notify']),
-				'auto_lnk'   => translateYesNo($data['auto_add_new_user']),
-				'notified'   => translateYesNo($data['notified']),
-				'prices_cnt' => translateComma(countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true)),
-				'descr'      => $data['descr'],
-				'min_users'  => $data['min_users'],
-				'min_prices' => $data['min_prices'],
+				'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
+				'admin_id'          => $data['admin_id'],
+				'login'             => $data['login'],
+				'id'                => $data['id'],
+				'sw'                => $SW,
+				'title'             => $data['title'],
+				'template'          => $data['template'],
+				'users_content'     => $users,
+				'start_date'        => generateDateTime($data['start_time'], 2),
+				'end_date'          => generateDateTime($data['end_time']  , 2),
+				'is_active'         => $data['is_active'],
+				'send_notify'       => $data['send_notify'],
+				'auto_add_new_user' => $data['auto_add_new_user'],
+				'notified'          => $data['notified'],
+				'prices_cnt'        => countSumTotalData($data['id'], 'rallye_prices', 'id', 'rallye_id', true),
+				'descr'             => $data['descr'],
+				'min_users'         => $data['min_users'],
+				'min_prices'        => $data['min_prices'],
 			);
 
 			// Is the rallye active or not?
 			switch ($data['is_active']) {
 				case 'Y':
 					// Rallye is active so do not edit it!
-					$row['select'] = "<div class=\"big\">".$row['id']."</div>";
+					$row['select']       = '<div class="big">' . $row['id'] . '</div>';
 					$row['active_title'] = getMessage('RALLYE_DEACTIVATE_NOW');
-					$row['active'] = 0;
+					$row['active']       = '0';
 					break;
 
 				case 'N':
 					$row['active_title'] = getMessage('RALLYE_ACTIVATE_NOW');
-					$row['active'] = 1;
+					$row['active']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Notification to members?
 			switch ($data['send_notify']) {
 				case 'Y':
 					$row['notify_title'] = getMessage('RALLYE_STOP_NOTIFY_NOW');
-					$row['notify'] = 0;
+					$row['notify']       = '0';
 					break;
 
 				case 'N':
 					$row['notify_title'] = getMessage('RALLYE_START_NOTIFY_NOW');
-					$row['notify'] = 1;
+					$row['notify']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Auto-add of new joined members?
 			switch ($data['auto_add_new_user']) {
 				case 'Y':
 					$row['auto_title'] = getMessage('RALLYE_STOP_AUTO_ADD_NOW');
-					$row['auto'] = 0;
+					$row['auto']       = '0';
 					break;
 
 				case 'N':
 					$row['auto_title'] = getMessage('RALLYE_START_AUTO_ADD_NOW');
-					$row['auto'] = 1;
+					$row['auto']       = 1;
 					break;
-			}
+			} // END - switch
 
 			// Output row
 			$OUT .= loadTemplate('admin_list_rallyes_row', true, $row);
@@ -386,7 +400,7 @@ ORDER BY
 		loadTemplate('admin_list_rallyes', false, $content);
 	} else {
 		// No rallyes setup so far
-		loadTemplate('admin_settings_saved', false, getMessage('RALLYE_NO_RALLYES_SETUP'));
+		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
 	}
 }