[Phpbb-checkins] CVS: phpBB2/admin admin_ranks.php,1.5,1.6

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv16544/admin

Modified Files:
	admin_ranks.php 
Log Message:
Removed max setting for ranks as per poll and feedback

Index: admin_ranks.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_ranks.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** admin_ranks.php	2001/11/24 01:51:35	1.5
--- admin_ranks.php	2001/12/05 14:38:37	1.6
***************
*** 107,112 ****
  			"SPECIAL_RANK" => $rank_is_special,
  			"NOT_SPECIAL_RANK" => $rank_is_not_special,
! 			"MINIMUM" => $rank_info['rank_min'],
! 			"MAXIMUM" => $rank_info['rank_max'],
  			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "",
  			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="' . $rank_info['rank_image'] . '" />' : "",
--- 107,111 ----
  			"SPECIAL_RANK" => $rank_is_special,
  			"NOT_SPECIAL_RANK" => $rank_is_not_special,
! 			"MINIMUM" => ( $rank_is_special ) ? "" : $rank_info['rank_min'],
  			"IMAGE" => ( $rank_info['rank_image'] != "" ) ? $rank_info['rank_image'] : "",
  			"IMAGE_DISPLAY" => ( $rank_info['rank_image'] != "" ) ? '<img src="' . $rank_info['rank_image'] . '" />' : "",
***************
*** 117,121 ****
  			"L_RANK_SPECIAL" => $lang['Rank_special'],
  			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
- 			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
  			"L_RANK_IMAGE" => $lang['Rank_image'],
  			"L_RANK_IMAGE_EXPLAIN" => $lang['Rank_image_explain'],
--- 116,119 ----
***************
*** 137,149 ****
  		
  		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
! 		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? $HTTP_POST_VARS['title'] : "";
  		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
- 		$max_posts = ( isset($HTTP_POST_VARS['max_posts']) ) ? intval($HTTP_POST_VARS['max_posts']) : -1;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? $HTTP_POST_VARS['rank_image'] : "";
  
  		if( $rank_title == "" )
  		{
! 			message_die(GENERAML_MESSAGE, $lang['Must_select_rank']);
  		}
  
--- 135,146 ----
  		
  		$rank_id = ( isset($HTTP_POST_VARS['id']) ) ? intval($HTTP_POST_VARS['id']) : 0;
! 		$rank_title = ( isset($HTTP_POST_VARS['title']) ) ? trim($HTTP_POST_VARS['title']) : "";
  		$special_rank = ( $HTTP_POST_VARS['special_rank'] == 1 ) ? TRUE : 0;
  		$min_posts = ( isset($HTTP_POST_VARS['min_posts']) ) ? intval($HTTP_POST_VARS['min_posts']) : -1;
! 		$rank_image = ( (isset($HTTP_POST_VARS['rank_image'])) ) ? trim($HTTP_POST_VARS['rank_image']) : "";
  
  		if( $rank_title == "" )
  		{
! 			message_die(GENERAL_MESSAGE, $lang['Must_select_rank']);
  		}
  
***************
*** 168,177 ****
  		{
  			$sql = "UPDATE " . RANKS_TABLE . "
! 				SET 
! 					rank_title = '$rank_title', 
! 					rank_special = '$special_rank',
! 					rank_max = '$max_posts',
! 					rank_min = '$min_posts',
! 					rank_image = '$rank_image'
  				WHERE rank_id = $rank_id";
  
--- 165,169 ----
  		{
  			$sql = "UPDATE " . RANKS_TABLE . "
! 				SET rank_title = '$rank_title', rank_special = $special_rank, rank_max = 0, rank_min = $min_posts, rank_image = '$rank_image'
  				WHERE rank_id = $rank_id";
  
***************
*** 180,187 ****
  		else
  		{
! 			$sql = "INSERT INTO " . RANKS_TABLE . "
! 					(rank_title, rank_special, rank_max, rank_min, rank_image)
! 				VALUES
! 					('$rank_title', '$special_rank', '$max_posts', '$min_posts', '$rank_image')";
  
  			$message = $lang['Rank_added'];
--- 172,177 ----
  		else
  		{
! 			$sql = "INSERT INTO " . RANKS_TABLE . " (rank_title, rank_special, rank_max, rank_min, rank_image)
! 				VALUES ('$rank_title', $special_rank, 0, $min_posts, '$rank_image')";
  
  			$message = $lang['Rank_added'];
***************
*** 223,227 ****
  			}
  
! 			$message .= "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
  			message_die(GENERAL_MESSAGE, $message);
--- 213,217 ----
  			}
  
! 			$message = $lang['Rank_removed'] . "<br /><br />" . sprintf($lang['Click_return_rankadmin'], "<a href=\"" . append_sid("admin_ranks.$phpEx") . "\">", "</a>") . "<br /><br />" . sprintf($lang['Click_return_admin_index'], "<a href=\"" . append_sid("index.$phpEx?pane=right") . "\">", "</a>");
  
  			message_die(GENERAL_MESSAGE, $message);
***************
*** 244,248 ****
  		
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
! 			ORDER BY rank_min ASC, rank_special ASC";
  		if( !$result = $db->sql_query($sql) )
  		{
--- 234,238 ----
  		
  		$sql = "SELECT * FROM " . RANKS_TABLE . "
! 			ORDER BY rank_min, rank_title";
  		if( !$result = $db->sql_query($sql) )
  		{
***************
*** 258,262 ****
  			"L_RANK" => $lang['Rank'],
  			"L_RANK_MINIMUM" => $lang['Rank_minimum'],
- 			"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
  			"L_SPECIAL_RANK" => $lang['Special_rank'],
  			"L_EDIT" => $lang['Edit'],
--- 248,251 ----
***************
*** 274,278 ****
  			$rank_id = $rank_rows[$i]['rank_id'];
  			$rank_min = $rank_rows[$i]['rank_min'];
- 			$rank_max = $rank_rows[$i]['rank_max'];
  
  			if($special_rank)
--- 263,266 ----
***************
*** 289,293 ****
  				"RANK" => $rank,
  				"RANK_MIN" => $rank_min,
- 				"RANK_MAX" => $rank_max,
  
  				"SPECIAL_RANK" => ( $special_rank == 1 ) ? $lang['Yes'] : $lang['No'],
--- 277,280 ----
***************
*** 323,327 ****
  		"L_RANK" => $lang['Rank_title'],
  		"L_RANK_MINIMUM" => $lang['Rank_minimum'],
- 		"L_RANK_MAXIMUM" => $lang['Rank_maximum'],
  		"L_SPECIAL_RANK" => $lang['Rank_special'],
  		"L_EDIT" => $lang['Edit'],
--- 310,313 ----
***************
*** 339,345 ****
  		$rank_id = $rank_rows[$i]['rank_id'];
  		$rank_min = $rank_rows[$i]['rank_min'];
- 		$rank_max = $rank_rows[$i]['rank_max'];
  		
! 		if($special_rank == "1")
  		{
  			$rank_min = $rank_max = "-";
--- 325,330 ----
  		$rank_id = $rank_rows[$i]['rank_id'];
  		$rank_min = $rank_rows[$i]['rank_min'];
  		
! 		if( $special_rank == 1 )
  		{
  			$rank_min = $rank_max = "-";
***************
*** 357,361 ****
  			"SPECIAL_RANK" => $rank_is_special,
  			"RANK_MIN" => $rank_min,
- 			"RANK_MAX" => $rank_max,
  
  			"U_RANK_EDIT" => append_sid("admin_ranks.$phpEx?mode=edit&amp;id=$rank_id"),
--- 342,345 ----