[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.22,1.23

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

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

Modified Files:
	bbcode.php 
Log Message:
Check for allowed chars in [url] submissions ... could use some double checking

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