[Phpbb-checkins] CVS: phpBB2 groupcp.php,1.45,1.46

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

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

Modified Files:
	groupcp.php 
Log Message:
Somewhat overhauled posting, fixed various bugs, completed new way of handling URIs in emails, blah blah

Index: groupcp.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/groupcp.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** groupcp.php	17 Feb 2002 17:02:03 -0000	1.45
--- groupcp.php	18 Feb 2002 12:34:38 -0000	1.46
***************
*** 34,37 ****
--- 34,45 ----
  //
  
+ $script_name = preg_replace("/^\/?(.*?)\/?$/", "\\1", trim($board_config['script_path']));
+ $script_name = ( $script_name != '' ) ? $script_name . '/groupcp.'.$phpEx : 'groupcp.'.$phpEx;
+ $server_name = trim($board_config['server_name']);
+ $server_protocol = ( $board_config['cookie_secure'] ) ? "https://" : "http://";
+ $server_port = ( $board_config['server_port'] <> 80 ) ? ':' . trim($board_config['server_port']) . '/' : '/';
+ 
+ $server_url = $server_protocol . $script_name . $server_name . $server_port;
+ 
  if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || isset($HTTP_POST_VARS[POST_GROUPS_URL]) )
  {
***************
*** 198,202 ****
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
  	$emailer->send();
--- 206,210 ----
  		"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 		"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id&validate=true")
  	);
  	$emailer->send();
***************
*** 404,408 ****
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 					"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
  				);
  				$emailer->send();
--- 412,416 ----
  					"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 					"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
  				);
  				$emailer->send();
***************
*** 510,514 ****
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_GROUPCP" => $script_url . "?" . POST_GROUPS_URL . "=$group_id")
  					);
  					$emailer->send();
--- 518,522 ----
  						"EMAIL_SIG" => str_replace("<br />", "\n", "-- \n" . $board_config['board_email_sig']), 
  
! 						"U_GROUPCP" => $server_url . "?" . POST_GROUPS_URL . "=$group_id")
  					);
  					$emailer->send();