[Phpbb-checkins] CVS: phpBB2/includes bbcode.php,1.36.2.24,1.36.2.25 page_header.php,1.106.2.13,1.106.2.14 prune.php,1.19.2.5,1.19.2.6

[Meik S. <acy...@us...>]

Update of /cvsroot/phpbb/phpBB2/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv20873/includes

Modified Files:
      Tag: phpBB-2_0_0
	bbcode.php page_header.php prune.php 
Log Message:
fixed some small bugs... added the updater (this one needs some testing, i have moved some things around)

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/bbcode.php,v
retrieving revision 1.36.2.24
retrieving revision 1.36.2.25
diff -C2 -r1.36.2.24 -r1.36.2.25
*** bbcode.php	11 Mar 2003 01:55:18 -0000	1.36.2.24
--- bbcode.php	18 Mar 2003 23:23:54 -0000	1.36.2.25
***************
*** 199,215 ****
  
  	// matches a [url]xxxx://www.phpbb.com[/url] code..
! 	$patterns[] = "#\[url\]([\w]+?://*[^\"\n\r\t<]*)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url1'];
  
  	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url\]((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^\"\n\r\t<]*)?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url2'];
  
  	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
! 	$patterns[] = "#\[url=([\w]+?://*[^\"\n\r\t<]*)\](.*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url3'];
  
  	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url=((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^\"\n\r\t<]*)?)\](.*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url4'];
  
--- 199,215 ----
  
  	// matches a [url]xxxx://www.phpbb.com[/url] code..
! 	$patterns[] = "#\[url\]([\w]+?://*[^ \"\n\r\t<]*)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url1'];
  
  	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url\]((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\n\r\t<]*)?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url2'];
  
  	// [url=xxxx://www.phpbb.com]phpBB[/url] code..
! 	$patterns[] = "#\[url=([\w]+?://*[^ \"\n\r\t<]*)\](.*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url3'];
  
  	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url=((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\n\r\t<]*)?)\](.*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url4'];
  
***************
*** 622,626 ****
  	// xxxx can only be alpha characters.
  	// yyyy is anything up to the first space, newline, comma, double quote or <
! 	$ret = preg_replace("#(^|[\n ])([\w]+?://*[^\"\n\r\t<]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);
  
  	// matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
--- 622,626 ----
  	// xxxx can only be alpha characters.
  	// yyyy is anything up to the first space, newline, comma, double quote or <
! 	$ret = preg_replace("#(^|[\n ])([\w]+?://*[^ \"\n\r\t<]*)#is", "\\1<a href=\"\\2\" target=\"_blank\">\\2</a>", $ret);
  
  	// matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
***************
*** 628,632 ****
  	// zzzz is optional.. will contain everything up to the first space, newline, 
  	// comma, double quote or <.
! 	$ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^\"\t\n\r<]*)?)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);
  
  	// matches an email@domain type address at the start of a line, or after a space.
--- 628,632 ----
  	// zzzz is optional.. will contain everything up to the first space, newline, 
  	// comma, double quote or <.
! 	$ret = preg_replace("#(^|[\n ])((www|ftp)\.[\w\-]+\.[\w\-.\~]+(?:/[^ \"\t\n\r<]*)?)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);
  
  	// matches an email@domain type address at the start of a line, or after a space.

Index: page_header.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/page_header.php,v
retrieving revision 1.106.2.13
retrieving revision 1.106.2.14
diff -C2 -r1.106.2.13 -r1.106.2.14
*** page_header.php	4 Mar 2003 21:02:30 -0000	1.106.2.13
--- page_header.php	18 Mar 2003 23:23:55 -0000	1.106.2.14
***************
*** 390,394 ****
  	'U_VIEWONLINE' => append_sid('viewonline.'.$phpEx),
  	'U_LOGIN_LOGOUT' => append_sid($u_login_logout),
- 	'U_MEMBERSLIST' => append_sid('memberlist.'.$phpEx),
  	'U_GROUP_CP' => append_sid('groupcp.'.$phpEx),
  
--- 390,393 ----

Index: prune.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/includes/Attic/prune.php,v
retrieving revision 1.19.2.5
retrieving revision 1.19.2.6
diff -C2 -r1.19.2.5 -r1.19.2.6
*** prune.php	4 Mar 2003 21:02:34 -0000	1.19.2.5
--- prune.php	18 Mar 2003 23:23:57 -0000	1.19.2.6
***************
*** 57,60 ****
--- 57,61 ----
  		$sql_topics .= ( ( $sql_topics != '' ) ? ', ' : '' ) . $row['topic_id'];
  	}
+ 	$db->sql_freeresult($result);
  		
  	if( $sql_topics != '' )
***************
*** 74,77 ****
--- 75,79 ----
  			$sql_post .= ( ( $sql_post != '' ) ? ', ' : '' ) . $row['post_id'];
  		}
+ 		$db->sql_freeresult($result);
  
  		if ( $sql_post != '' )