[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.35,1.36

[Doug K. <dou...@us...>]

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

Modified Files:
	groupcp.php 
Log Message:
Three bugs fixed here... Bug ID 494154, which was a bug in the group moderation page, where email links would not redirect to the login page.  Bug ID 498927 was a problem between the time/date format.  Bug ID 498961 was a slight cosmetic error in the admin panel.  That's all for now!


Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** groupcp.php	2001/12/24 20:30:57	1.35
--- groupcp.php	2002/01/03 22:44:28	1.36
***************
*** 196,200 ****
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id")
  	);
  	$emailer->send();
--- 196,200 ----
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $protocol . $server_name . $path . "/groupcp.$phpEx?" . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
  	$emailer->send();
***************
*** 553,556 ****
--- 553,568 ----
  	
  	//
+ 	// Did the group moderator get here through an email?
+ 	// If so, check to see if they are logged in.
+ 	//
+ 	if( isset($HTTP_GET_VARS['validate']) );
+ 	{
+ 		if( !$userdata['session_logged_in'] )
+ 		{
+ 			header("Location: " . append_sid("login.$phpEx?redirect=groupcp.$phpEx&" . POST_GROUPS_URL . "=$group_id", true));
+ 		}
+ 	}
+ 
+ 	//
  	// Get group details
  	//
***************
*** 1242,1244 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 1254,1256 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>