[Phpbb-checkins] CVS: phpBB2 viewtopic.php,1.155,1.156

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

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

Modified Files:
	viewtopic.php 
Log Message:
Separate sig completely from message

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -r1.155 -r1.156
*** viewtopic.php	2001/12/20 16:58:39	1.155
--- viewtopic.php	2001/12/20 19:00:08	1.156
***************
*** 390,394 ****
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
--- 390,394 ----
  // Go ahead and pull all data for this topic
  //
! $sql = "SELECT u.username, u.user_id, u.user_posts, u.user_from, u.user_website, u.user_email, u.user_icq, u.user_aim, u.user_yim, u.user_regdate, u.user_msnm, u.user_viewemail, u.user_rank, u.user_sig, u.user_sig_bbcode_uid, u.user_avatar, u.user_avatar_type, u.user_allowavatar, u.user_allowsmile, p.*,  pt.post_text, pt.post_subject, pt.bbcode_uid
  	FROM " . POSTS_TABLE . " p, " . USERS_TABLE . " u, " . POSTS_TEXT_TABLE . " pt
  	WHERE p.topic_id = $topic_id
***************
*** 943,947 ****
  	// output
  	//
- 	$message = make_clickable($message);
  
  	//
--- 943,946 ----
***************
*** 963,991 ****
  
  	//
! 	// Parse signature for BBCode if reqd.
  	//
! 	if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
  	{
! 		$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
! 		$user_sig = "<span class=\"signature\">". make_clickable($user_sig). "</span>";
! 	}
! 
! 	//
! 	// Parse message for BBCode if reqd
! 	//
! 	if( $bbcode_uid != "" )
! 	{
! 		$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
! 	}
  
! 	//
! 	// Append signature
! 	//
! 	if( $postrow[$i]['enable_sig'] && $user_sig != "" )
! 	{
! 		$message .= "<br /><br />_________________<br />" . $user_sig;
  	}
  
  	$message = make_clickable($message);
  
  	//
--- 962,982 ----
  
  	//
! 	// Parse message and/or sig for BBCode if reqd
  	//
! 	if( $board_config['allow_bbcode'] )
  	{
! 		if( $user_sig != "" && $postrow[$i]['enable_sig'] && $user_sig_bbcode_uid != "" )
! 		{
! 			$user_sig = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($user_sig, $user_sig_bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $user_sig);
! 		}
  
! 		if( $bbcode_uid != "" )
! 		{
! 			$message = ( $board_config['allow_bbcode'] ) ? bbencode_second_pass($message, $bbcode_uid) : preg_replace("/\:[0-9a-z\:]+\]/si", "]", $message);
! 		}
  	}
  
  	$message = make_clickable($message);
+ 	$user_sig = make_clickable($user_sig);
  
  	//
***************
*** 1004,1007 ****
--- 995,1003 ----
  		$post_subject = preg_replace($orig_word, $replacement_word, $post_subject);
  		$message = preg_replace($orig_word, $replacement_word, $message);
+ 
+ 		if( $user_sig != "" && $postrow[$i]['enable_sig'] )
+ 		{
+ 			$user_sig = preg_replace($orig_word, $replacement_word, $user_sig);
+ 		}
  	}
  
***************
*** 1009,1015 ****
  	// Parse smilies
  	//
! 	if( $board_config['allow_smilies'] && $postrow[$i]['enable_smilies'] )
  	{
! 		$message = smilies_pass($message);
  	}
  
--- 1005,1019 ----
  	// Parse smilies
  	//
! 	if( $board_config['allow_smilies'] )
  	{
! 		if( $postrow[$i]['enable_smilies'] )
! 		{
! 			$message = smilies_pass($message);
! 		}
! 
! 		if( $postrow[$i]['user_allowsmile'] && $user_sig != "" && $postrow[$i]['enable_sig'] )
! 		{
! 			$user_sig = smilies_pass($user_sig);
! 		}
  	}
  
***************
*** 1018,1022 ****
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />", $message);
  
  	//
--- 1022,1031 ----
  	// till recently it wasn't XHTML compliant)
  	//
! 	$message = str_replace("\n", "\n<br />\n", $message);
! 
! 	if( $user_sig != "" && $postrow[$i]['enable_sig'] )
! 	{
! 		$user_sig = "<br />_________________<br />" . str_replace("\n", "\n<br />", $user_sig);
! 	}
  
  	//
***************
*** 1057,1060 ****
--- 1066,1070 ----
  		"POST_SUBJECT" => $post_subject,
  		"MESSAGE" => $message, 
+ 		"SIGNATURE" => $user_sig, 
  		"EDITED_MESSAGE" => $l_edited_by,