[Phpbb-checkins] CVS: phpBB2 posting.php,1.109,1.110 privmsg.php,1.54,1.55 profile.php,1.140,1.141

[Nathan C. <na...@us...>]

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

Modified Files:
	posting.php privmsg.php profile.php 
Log Message:
Fixed bug 478218 -- [ and ] in usernames qith quote= bbcode. Usernames can no longer contain the double-quote character. Also removed a dupe from lang_main file.

Index: posting.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/posting.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -r1.109 -r1.110
*** posting.php	2001/11/24 17:17:06	1.109
--- posting.php	2001/11/25 23:31:03	1.110
***************
*** 1041,1045 ****
  				$error_msg .= "<br />";
  			}
! 			$error_msg .= $lang['Bad_username'];
  		}
  	}
--- 1041,1045 ----
  				$error_msg .= "<br />";
  			}
! 			$error_msg .= $lang['Invalid_username'];
  		}
  	}
***************
*** 2359,2363 ****
  				$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 				$post_message = "[quote=" . $post_username . "]\n" . $post_message . "\n[/quote]";
  
  				$mode = "reply";
--- 2359,2363 ----
  				$msg_date =  create_date($board_config['default_dateformat'], $postrow['post_time'], $board_config['board_timezone']);
  
! 				$post_message = "[quote=\"" . $post_username . "\"]\n" . $post_message . "\n[/quote]";
  
  				$mode = "reply";

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -r1.54 -r1.55
*** privmsg.php	2001/11/24 18:25:52	1.54
--- privmsg.php	2001/11/25 23:31:03	1.55
***************
*** 1264,1268 ****
  			$to_userid = $privmsg['user_id'];
  
! 			$privmsg_message = preg_replace("/(|\:1)\:$post_bbcode_uid(|\:[a-z])/si", "", $privmsg_message);
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
--- 1264,1268 ----
  			$to_userid = $privmsg['user_id'];
  
! 			$privmsg_message = preg_replace("/\:(([a-z0-9]:)?)$post_bbcode_uid/si", "", $privmsg_message);
  			$privmsg_message = str_replace("<br />", "\n", $privmsg_message);
  			$privmsg_message = preg_replace($html_entities_match, $html_entities_replace, $privmsg_message);
***************
*** 1275,1279 ****
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
  
! 				$privmsg_message = "[quote=" . $to_username . "]\n" . $privmsg_message . "\n[/quote]";
  
  				$mode = "reply";
--- 1275,1279 ----
  				$msg_date =  create_date($board_config['default_dateformat'], $privmsg['privmsgs_date'], $board_config['board_timezone']); //"[date]" . $privmsg['privmsgs_time'] . "[/date]";
  
! 				$privmsg_message = "[quote=\"" . $to_username . "\"]\n" . $privmsg_message . "\n[/quote]";
  
  				$mode = "reply";

Index: profile.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/profile.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -C2 -r1.140 -r1.141
*** profile.php	2001/11/23 19:01:51	1.140
--- profile.php	2001/11/25 23:31:04	1.141
***************
*** 547,550 ****
--- 547,551 ----
  					$error_msg = $lang['Fields_empty'];
  				}
+ 				
  			}