[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.29,1.30

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

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

Modified Files:
	bbcode.php 
Log Message:
Minor change to email match

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** bbcode.php	8 Feb 2002 01:33:36 -0000	1.29
--- bbcode.php	12 Feb 2002 17:53:20 -0000	1.30
***************
*** 210,214 ****
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-\.,\?!%\*_\#:;~\\&$@\/=\+]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
--- 210,214 ----
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-_.]+?@[\w\-]+\.[\w\-\.]+\.[\w]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
***************
*** 612,618 ****
  
  	// matches an email@domain type address at the start of a line, or after a space.
! 	// Note: before the @ sign, the only valid characters are the alphanums and "-", "_", or ".".
! 	// After the @ sign, we accept anything up to the first space, linebreak, or comma.
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([^, \n\r]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..
--- 612,617 ----
  
  	// matches an email@domain type address at the start of a line, or after a space.
! 	// Note: Only the followed chars are valid; alphanums, "-", "_" and or ".".
! 	$ret = preg_replace("#([\n ])([a-z0-9\-_.]+?)@([\w\-]+\.[\w\-\.]+\.[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $ret);
  
  	// Remove our padding..