[Phpbb-checkins] CVS: phpBB2 posting.php,1.84,1.85

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

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

Modified Files:
	posting.php 
Log Message:
Removed remaining elements of global announcements to prevent confusion

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -r1.84 -r1.85
*** posting.php	2001/10/16 17:15:25	1.84
--- posting.php	2001/10/17 23:05:46	1.85
***************
*** 526,535 ****
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if( $HTTP_POST_VARS['topictype'] == "global" )
  	{
- 		$topic_type = POST_ANNOUNCE_GLOBAL;
- 	}
- 	else if( $HTTP_POST_VARS['topictype']  == "announce" )
- 	{
  		$topic_type = POST_ANNOUNCE;
  	}
--- 526,531 ----
  if( isset($HTTP_POST_VARS['topictype']) )
  {
! 	if( $HTTP_POST_VARS['topictype']  == "announce" )
  	{
  		$topic_type = POST_ANNOUNCE;
  	}
***************
*** 555,559 ****
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE || $topic_type == POST_GLOBAL_ANNOUNCE )
  		{
  			$is_auth_type = "auth_announce";
--- 551,555 ----
  {
  	case 'newtopic':
! 		if( $topic_type == POST_ANNOUNCE  )
  		{
  			$is_auth_type = "auth_announce";
***************
*** 643,651 ****
  	message_die(GENERAL_MESSAGE, $message);
  }
- else if( $topic_type == POST_GLOBAL_ANNOUNCE && $userdata['user_level'] != ADMIN )
- {
- 	$message = $lang['Sorry_auth'] . $lang['Administrators'] . $auth_string . $lang['this_forum'];
- 	message_die(GENERAL_MESSAGE, $message);
- }
  //
  // End Auth
--- 639,642 ----
***************
*** 945,952 ****
  					$sql .= " WHERE forum_id = $forum_id";
  					
- /*					if( $topic_type != POST_GLOBAL_ANNOUNCE )
- 					{		
- 					}
- */
  					if($db->sql_query($sql))
  					{
--- 936,939 ----
***************
*** 2255,2268 ****
  	$template->assign_block_vars("type_toggle", array());
  
- 	if( $userdata['user_level'] == ADMIN )
- 	{
- 		$global_announce_toggle = '<input type="radio" name="topictype" value="global"';
- 		if( $topic_type == POST_GLOBAL_ANNOUNCE )
- 		{
- 			$global_announce_toggle .= ' checked="checked"';
- 		}
- 		$global_announce_toggle .= ' /> ' . $lang['Post_Global_Announcement'] . '&nbsp;&nbsp;';
- 	}
- 
  	if( $is_auth['auth_announce'] )
  	{
--- 2242,2245 ----
***************
*** 2292,2296 ****
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle . $global_announce_toggle;
  	}
  }
--- 2269,2273 ----
  			$topic_type_toggle .= ' checked="checked"';
  		}
! 		$topic_type_toggle .= ' /> ' . $lang['Post_Normal'] . '&nbsp;&nbsp;' . $sticky_toggle . $announce_toggle;
  	}
  }