X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_rallyes.php;h=ec3c17b554ff59b586c2c74cdcd2b17904577389;hb=dc25bd7a76750f02e2d617c9db9eb0aae53270f5;hp=2ff208825a3a48152dc2b85807a5f8ee339ef393;hpb=682edce003a1a91f66fb8e2212d7fdb591379843;p=mailer.git

diff --git a/inc/modules/admin/what-list_rallyes.php b/inc/modules/admin/what-list_rallyes.php
index 2ff208825a..ec3c17b554 100644
--- a/inc/modules/admin/what-list_rallyes.php
+++ b/inc/modules/admin/what-list_rallyes.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -41,7 +41,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 } // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init message
 $message = '';
@@ -100,7 +100,7 @@ if (isGetRequestParameterSet('rallye')) {
 
 	// Run SQL command
 	runFilterChain('run_sqls');
-} elseif (isFormSent('remove')) {
+} elseif (isFormSent('do_delete')) {
 	// Delete rallyes
 	if (ifPostContainsSelections()) {
 		// Init SQLs
@@ -126,7 +126,7 @@ 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
@@ -224,7 +224,7 @@ 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)) {
 	// List users and their refs before start and current
@@ -283,7 +283,7 @@ 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
@@ -300,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);
 
@@ -312,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="form_field" value="1" />',
 				'admin_id'          => $data['admin_id'],
-				'login'             => $data['login'],
 				'id'                => $data['id'],
 				'title'             => $data['title'],
 				'template'          => $data['template'],
@@ -391,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--}');
 	}
 }