[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.24,1.25

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

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

Modified Files:
	bbcode.php 
Log Message:
arrgghhhhh I hate regexp

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** bbcode.php	2002/01/27 13:59:57	1.24
--- bbcode.php	2002/01/27 14:03:21	1.25
***************
*** 194,214 ****
  	
  	// [url]xxxx://www.phpbb.com[/url] code..
! 	$patterns[1] = "#\[url\]([a-z]+?://){1}([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[1] = $bbcode_tpl['url1'];
  
  	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
! 	$patterns[2] = "#\[url\]([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[2] = $bbcode_tpl['url2'];
  
  	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
! 	$patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\](.*?)\[/url\]#si";
  	$replacements[3] = $bbcode_tpl['url3'];
  
  	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
! 	$patterns[4] = "#\[url=([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\]([a-z\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[4] = $bbcode_tpl['url4'];
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];
  
--- 194,214 ----
  	
  	// [url]xxxx://www.phpbb.com[/url] code..
! 	$patterns[1] = "#\[url\]([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[1] = $bbcode_tpl['url1'];
  
  	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
! 	$patterns[2] = "#\[url\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[2] = $bbcode_tpl['url2'];
  
  	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
! 	$patterns[3] = "#\[url=([a-z]+?://){1}([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\](.*?)\[/url\]#si";
  	$replacements[3] = $bbcode_tpl['url3'];
  
  	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
! 	$patterns[4] = "#\[url=([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/url\]#si";
  	$replacements[4] = $bbcode_tpl['url4'];
  
  	// [email]us...@do...[/email] code..
! 	$patterns[5] = "#\[email\]([a-z0-9\-\.,\?!%\*_\#:~\\&$@\/=\+]+)\[/email\]#si";
  	$replacements[5] = $bbcode_tpl['email'];