X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=c4eafb6ad1fa8c39df148f9e921aad0f688fa5d2;hp=d60526728a1f876057018d2a4456245f9f56e319;hb=a18efdcd57ba91893f0958a457b5c58639b135c3;hpb=dbe2f70fa53fe95dd0847960d2f79ba9d3999a43

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index d60526728a..c4eafb6ad1 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -14,12 +14,10 @@
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -43,58 +41,58 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init message
 $message = '';
 
 // Quick actions on a rallye
-if (isGetRequestParameterSet('rallye')) {
+if (isGetRequestElementSet('rallye')) {
 	// Init SQL queries
 	initSqls();
 
-	if (isGetRequestParameterSet('activate')) {
+	if (isGetRequestElementSet('activate')) {
 		// Activate / deactivate
-		switch (getRequestParameter('activate')) {
+		switch (getRequestElement('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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 
 			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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 		} // END - switch
-	} elseif (isGetRequestParameterSet('notify')) {
+	} elseif (isGetRequestElementSet('notify')) {
 		// Automatic notification
-		switch (getRequestParameter('notify')) {
+		switch (getRequestElement('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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 
 			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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 		} // END - switch
-	} elseif (isGetRequestParameterSet('auto')) {
+	} elseif (isGetRequestElementSet('auto')) {
 		// Automatic adding of new members
-		switch (getRequestParameter('auto')) {
+		switch (getRequestElement('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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 
 			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)
+					array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__, false)
 				);
 				break;
 		} // END - switch
@@ -102,14 +100,14 @@ if (isGetRequestParameterSet('rallye')) {
 
 	// Run SQL command
 	runFilterChain('run_sqls');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
 	// Delete rallyes
 	if (ifPostContainsSelections()) {
 		// Init SQLs
 		initSqls();
 
 		// Delete selected rallyes and all it's data
-		foreach (postRequestParameter('sel') as $id => $selected) {
+		foreach (postRequestElement('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));
@@ -128,20 +126,20 @@ if (isGetRequestParameterSet('rallye')) {
 		// No rallye selected to delete!
 		$message = '{--RALLYE_DELETE_NOTHING_SELECTED--}';
 	}
-} elseif (isFormSent('change')) {
+} elseif (isFormSent('do_edit')) {
 	// Change rallye
 	if (ifPostContainsSelections('title')) {
 		// Init SQLs
 		initSqls();
 
 		// Change selected rallyes and all it's data
-		foreach (postRequestParameter('title') as $id => $title) {
+		foreach (postRequestElement('title') as $id => $title) {
 			// Secure id number
 			$id = bigintval($id);
 
 			// Generate timestamps
-			$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)  );
+			$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)  );
 
 			// Update entry
 			addSql(SQL_QUERY_ESC("UPDATE
@@ -159,12 +157,12 @@ WHERE
 LIMIT 1",
 			array(
 				$title,
-				postRequestParameter('descr', $id),
-				postRequestParameter('templ', $id),
+				postRequestElement('descr', $id),
+				postRequestElement('templ', $id),
 				bigintval($START),
 				bigintval($END),
-				bigintval(postRequestParameter('min_users', $id)),
-				bigintval(postRequestParameter('min_prices', $id)),
+				bigintval(postRequestElement('min_users', $id)),
+				bigintval(postRequestElement('min_prices', $id)),
 				$id
 			), __FILE__, __LINE__, false));
 		}
@@ -182,10 +180,10 @@ if (isFormSent('edit')) {
 	if (ifPostContainsSelections()) {
 		// Make all selected and deactivated rallyes editable
 		$OUT = '';
-		foreach (postRequestParameter('sel') as $id => $selected) {
+		foreach (postRequestElement('sel') as $id => $selected) {
 			// Load rallye basic data
 			$result = SQL_QUERY_ESC("SELECT
-	`title`, `descr`, `template`, `start_time`, `end_time`, `min_users`, `min_prices`
+	`title`,`descr`,`template`,`start_time`,`end_time`,`min_users`,`min_prices`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_data`
 WHERE
@@ -215,7 +213,7 @@ LIMIT 1",
 			$content['e_year']  = addSelectionBox('year' , getYear($content['end_time'])       , 'end'  , $id);
 
 			// Remember other values
-			$content['templ']      = addReferalRallyeTemplateSelection('templ['.$id.']', $content['template']);
+			$content['templ']      = addReferralRallyeTemplateSelection('templ['.$id.']', $content['template']);
 			$content['id']         = $id;
 
 			// Output row
@@ -226,32 +224,35 @@ LIMIT 1",
 		loadTemplate('admin_edit_rallyes', false, $OUT);
 	} else {
 		// Nothing selected to edit
-		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SELECTED--}');
+		displayMessage('{--RALLYE_NO_RALLYES_SELECTED--}');
 	}
-} elseif ((getRequestParameter('sub') == 'users') && (getRequestParameter('rallye') > 0)) {
+} elseif ((getRequestElement('sub') == 'users') && (getRequestElement('rallye') > 0)) {
 	// List users and their refs before start and current
 	$result = SQL_QUERY_ESC("SELECT
-	`userid`, `refs`, `curr_points`
+	`userid`,`refs`,`curr_points`
 FROM
 	`{?_MYSQL_PREFIX?}_rallye_users`
 WHERE
 	`rallye_id`=%s
 ORDER BY
 	`userid` ASC",
-		array(bigintval(getRequestParameter('rallye'))), __FILE__, __LINE__);
+		array(bigintval(getRequestElement('rallye'))), __FILE__, __LINE__);
 	if (!SQL_HASZERONUMS($result)) {
 		$OUT = '';
-		$content['rallye'] = getRequestParameter('rallye');
+		$content['rallye'] = getRequestElement('rallye');
 		while ($row = SQL_FETCHARRAY($result)) {
-			// Check for referal count
-			$cnt = getReferalRallyeRefsCount($row['userid'], $row['refs']);
+			// Check for referral count
+			$count = getReferralRallyeRefsCount($row['userid'], $row['refs']);
 
 			// Init variables
 			$bl = '';
 			$br = '';
 
 			// Output row
-			if (($row['curr_points'] > 0) && ($cnt > 0)) { $bl = '<strong>'; $br = '</strong>'; }
+			if (($row['curr_points'] > 0) && ($count > 0)) {
+				$bl = '<strong>';
+				$br = '</strong>';
+			} // END - if
 
 			// Get user points
 			$points = countSumTotalData($row['userid'], 'user_points', 'points', 'userid', false, " AND `ref_depth`=1 LIMIT 1");
@@ -263,7 +264,7 @@ ORDER BY
 				'bold_l'  => $bl ,
 				'bold_r'  => $br ,
 				'refs'    => $row['refs'],
-				'cnt'     => $cnt,
+				'count'   => $count,
 				'opoints' => ($points - $row['curr_points']),
 			);
 
@@ -273,7 +274,7 @@ ORDER BY
 
 		// Remember rows
 		$content['rows']   = $OUT;
-		$content['rallye'] = getRequestParameter('rallye');
+		$content['rallye'] = getRequestElement('rallye');
 
 		// Free memory
 		SQL_FREERESULT($result);
@@ -282,13 +283,13 @@ ORDER BY
 		loadTemplate('admin_list_rallye_usr', false, $content);
 	} else {
 		// No entries found?
-		loadTemplate('admin_settings_saved', false, '{--RALLYE_ADMIN_USERS_404--}');
+		displayMessage('{--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
@@ -299,9 +300,6 @@ ORDER BY
 		// List found rallyes
 		$OUT = '';
 		while ($data = SQL_FETCHARRAY($result)) {
-			// Load admin login
-			$data['login'] = getAdminLogin($data['admin_id']);
-
 			// Count joined userids
 			$users = countSumTotalData($data['id'], 'rallye_users', 'id', 'rallye_id', true);
 
@@ -311,14 +309,10 @@ ORDER BY
 				$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
-			if (empty($data['login']))    $data['login']     = '???';
-
 			// Transfer data into array for the template
 			$row = array(
-				'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="admin_normal" value="1" />',
+				'select'            => '<input type="checkbox" name="sel[' . $data['id'] . ']" class="form_field" value="1" />',
 				'admin_id'          => $data['admin_id'],
-				'login'             => $data['login'],
 				'id'                => $data['id'],
 				'title'             => $data['title'],
 				'template'          => $data['template'],
@@ -390,7 +384,7 @@ ORDER BY
 		loadTemplate('admin_list_rallyes', false, $content);
 	} else {
 		// No rallyes setup so far
-		loadTemplate('admin_settings_saved', false, '{--RALLYE_NO_RALLYES_SETUP--}');
+		displayMessage('{--RALLYE_NO_RALLYES_SETUP--}');
 	}
 }