[Phpbb-checkins] CVS: phpBB2/includes functions_post.php,1.11,1.12

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

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

Modified Files:
	functions_post.php 
Log Message:
Fix bad URL for topic notifications

Index: functions_post.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/functions_post.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** functions_post.php	20 Apr 2002 22:56:09 -0000	1.11
--- functions_post.php	14 May 2002 17:27:20 -0000	1.12
***************
*** 650,654 ****
  
  			$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! 			$script_name = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx;
  			$server_name = trim($board_config['server_name']);
  			$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
--- 650,654 ----
  
  			$script_name = preg_replace('/^\/?(.*?)\/?$/', '\1', trim($board_config['script_path']));
! 			$script_name_f = ( $script_name != '' ) ? $script_name . '/viewforum.'.$phpEx : 'viewforum.'.$phpEx;
  			$server_name = trim($board_config['server_name']);
  			$server_protocol = ( $board_config['cookie_secure'] ) ? 'https://' : 'http://';
***************
*** 677,682 ****
  							'FORUM_NAME' => $forum_name, 
  
! 							'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id",
! 							'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum")
  						);
  
--- 677,682 ----
  							'FORUM_NAME' => $forum_name, 
  
! 							'U_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id",
! 							'U_STOP_WATCHING_FORUM' => $server_protocol . $server_name . $server_port . $script_name_f . '?' . POST_FORUM_URL . "=$forum_id&unwatch=forum")
  						);
  
***************
*** 713,717 ****
  				}
  
! 				$script_name = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
  				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
--- 713,717 ----
  				}
  
! 				$script_name_t = ( $script_name != '' ) ? $script_name . '/viewtopic.'.$phpEx : 'viewtopic.'.$phpEx;
  				$email_headers = "From: " . $board_config['board_email'] . "\nReturn-Path: " . $board_config['board_email'] . "\r\n";
  
***************
*** 736,741 ****
  								'TOPIC_TITLE' => $topic_title, 
  
! 								'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_POST_URL . "=$post_id#$post_id",
! 								'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
  							);
  
--- 736,741 ----
  								'TOPIC_TITLE' => $topic_title, 
  
! 								'U_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_POST_URL . "=$post_id#$post_id",
! 								'U_STOP_WATCHING_TOPIC' => $server_protocol . $server_name . $server_port . $script_name_t . '?' . POST_TOPIC_URL . "=$topic_id&unwatch=topic")
  							);