[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.73,1.74 viewtopic.php,1.165,1.166

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

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

Modified Files:
	privmsg.php viewtopic.php 
Log Message:
Fix global disallow sig still allows old sigs to display bug #501162

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** privmsg.php	2002/01/14 20:16:09	1.73
--- privmsg.php	2002/01/24 03:39:00	1.74
***************
*** 493,497 ****
  	$bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
  
! 	$user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig'];
  	$user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid'];
  
--- 493,504 ----
  	$bbcode_uid = $privmsg['privmsgs_bbcode_uid'];
  
! 	if( $board_config['allow_sig'] )
! 	{
! 		$user_sig = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig'] : $privmsg['user_sig'];
! 	}
! 	else
! 	{
! 		$user_sig = "";
! 	}
  	$user_sig_bbcode_uid = ( $privmsg['privmsgs_from_userid'] == $userdata['user_id'] ) ? $userdata['user_sig_bbcode_uid'] : $privmsg['user_sig_bbcode_uid'];
  
***************
*** 859,863 ****
  
  	$attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig'];
! 	$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : "";
  	
  	if( $submit && $mode != "edit" )
--- 866,870 ----
  
  	$attach_sig = ( $submit || $refresh ) ? ( ( !empty($HTTP_POST_VARS['attach_sig']) ) ? TRUE : 0 ) : $userdata['user_attachsig'];
! 	$user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
  	
  	if( $submit && $mode != "edit" )
***************
*** 1128,1132 ****
  			$page_title = $lang['Send_new_privmsg'];
  
! 			$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : "";
  
  		}
--- 1135,1139 ----
  			$page_title = $lang['Send_new_privmsg'];
  
! 			$user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
  
  		}
***************
*** 1135,1139 ****
  			$page_title = $lang['Reply_privmsg'];
  
! 			$user_sig = ( $userdata['user_sig'] != "" ) ? $userdata['user_sig'] : "";
  
  		}
--- 1142,1146 ----
  			$page_title = $lang['Reply_privmsg'];
  
! 			$user_sig = ( $userdata['user_sig'] != "" && $board_config['allow_sig'] ) ? $userdata['user_sig'] : "";
  
  		}
***************
*** 1155,1159 ****
  				}
  
! 				$user_sig = ( $postrow['user_sig'] != "" ) ? $postrow['user_sig'] : "";
  			}
  			else
--- 1162,1166 ----
  				}
  
! 				$user_sig = ( $postrow['user_sig'] != "" && $board_config['allow_sig'] ) ? $postrow['user_sig'] : "";
  			}
  			else
***************
*** 1255,1259 ****
  			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
  
! 			$user_sig = $privmsg['user_sig'];
  
  			$to_username = $privmsg['username'];
--- 1262,1266 ----
  			$privmsg_message = preg_replace('#</textarea>#si', '&lt;/textarea&gt;', $privmsg_message);
  
! 			$user_sig = (  $board_config['allow_sig'] ) ? $privmsg['user_sig'] : "";
  
  			$to_username = $privmsg['username'];

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -r1.165 -r1.166
*** viewtopic.php	2002/01/24 03:05:32	1.165
--- viewtopic.php	2002/01/24 03:39:00	1.166
***************
*** 984,988 ****
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
  
! 	$user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != "" ) ? $postrow[$i]['user_sig'] : "";
  	$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];
  
--- 984,988 ----
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
  
! 	$user_sig = ( $postrow[$i]['enable_sig'] && $postrow[$i]['user_sig'] != "" && $board_config['allow_sig'] ) ? $postrow[$i]['user_sig'] : "";
  	$user_sig_bbcode_uid = $postrow[$i]['user_sig_bbcode_uid'];