[Phpbb-php5mod-cvs-checkins] phpbb-php5/includes bbcode.php,1.3,1.4 functions.php,1.3,1.4 functions_

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpbb-php5mod/phpbb-php5/includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21914/includes

Modified Files:
	bbcode.php functions.php functions_validate.php sessions.php 
	usercp_activate.php usercp_avatar.php usercp_confirm.php 
	usercp_viewprofile.php 
Log Message:
2.0.17.5

Index: functions_validate.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/functions_validate.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** functions_validate.php	29 Jul 2004 22:36:19 -0000	1.1
--- functions_validate.php	19 Jul 2005 23:31:24 -0000	1.2
***************
*** 31,38 ****

  	// Remove doubled up spaces
! 	$username = preg_replace('#\s+#', ' ', $username); 
! 	// Limit username length
! 	$username = substr(str_replace("\'", "'", $username), 0, 25);
! 	$username = str_replace("'", "''", $username);

  	$sql = "SELECT username 
--- 31,36 ----

  	// Remove doubled up spaces
! 	$username = preg_replace('#\s+#', ' ', trim($username));
! 	$username = phpbb_clean_username($username);

  	$sql = "SELECT username 

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/functions.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** functions.php	22 Feb 2005 01:21:02 -0000	1.3
--- functions.php	19 Jul 2005 23:31:24 -0000	1.4
***************
*** 92,96 ****
  	global $db;

! 	if (intval($user) == 0 || $force_str)
  	{
  		$user = phpbb_clean_username($user);
--- 92,96 ----
  	global $db;

! 	if (!is_numeric($user) || $force_str)
  	{
  		$user = phpbb_clean_username($user);
***************
*** 553,557 ****
  	}

! 	define(HAS_DIED, 1);

--- 553,557 ----
  	}

! 	define('HAS_DIED', 1);

Index: sessions.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/sessions.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sessions.php	8 May 2005 02:12:44 -0000	1.7
--- sessions.php	19 Jul 2005 23:31:24 -0000	1.8
***************
*** 190,194 ****
  		$userdata['user_lastvisit'] = $last_visit;
  		$sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid'];
! 
  	}

--- 190,194 ----
  		$userdata['user_lastvisit'] = $last_visit;
  		$sessiondata['autologinid'] = (!$admin) ? (( $enable_autologin && $sessionmethod == SESSION_METHOD_COOKIE ) ? $auto_login_key : '') : $sessiondata['autologinid'];
! 		$sessiondata['userid'] = $user_id;
  	}

Index: usercp_activate.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_activate.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usercp_activate.php	30 Jul 2004 02:12:38 -0000	1.2
--- usercp_activate.php	19 Jul 2005 23:31:25 -0000	1.3
***************
*** 48,51 ****
--- 48,56 ----
  	else if ((trim($row['user_actkey']) == trim($_GET['act_key'])) && (trim($row['user_actkey']) != ''))
  	{
+ 		if (intval($board_config['require_activation']) == USER_ACTIVATION_ADMIN && $userdata['user_level'] != ADMIN)
+ 		{
+ 			message_die(GENERAL_MESSAGE, $lang['Not_Authorised']);
+ 		}
+ 
  		$sql_update_pass = ( $row['user_newpasswd'] != '' ) ? ", user_password = '" . str_replace("\'", "''", $row['user_newpasswd']) . "', user_newpasswd = ''" : '';

Index: usercp_confirm.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_confirm.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** usercp_confirm.php	8 May 2005 02:12:44 -0000	1.2
--- usercp_confirm.php	19 Jul 2005 23:31:25 -0000	1.3
***************
*** 34,38 ****

  // Do we have an id? No, then just exit
! if (empty($_GET_['id']))
  {
  	exit;
--- 34,38 ----

  // Do we have an id? No, then just exit
! if (empty($_GET['id']))
  {
  	exit;

Index: usercp_viewprofile.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_viewprofile.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usercp_viewprofile.php	8 May 2005 02:12:44 -0000	1.4
--- usercp_viewprofile.php	19 Jul 2005 23:31:25 -0000	1.5
***************
*** 166,171 ****

  $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts");
! $search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . $lang['Search_user_posts'] . '" border="0" /></a>';
! $search = '<a href="' . $temp_url . '">' . $lang['Search_user_posts'] . '</a>';

  //
--- 166,171 ----

  $temp_url = append_sid("search.$phpEx?search_author=" . urlencode($profiledata['username']) . "&amp;showresults=posts");
! $search_img = '<a href="' . $temp_url . '"><img src="' . $images['icon_search'] . '" alt="' . $lang['Search_user_posts'] . '" title="' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '" border="0" /></a>';
! $search = '<a href="' . $temp_url . '">' . sprintf($lang['Search_user_posts'], $profiledata['username']) . '</a>';

  //

Index: bbcode.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/bbcode.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** bbcode.php	27 Jun 2005 20:16:37 -0000	1.3
--- bbcode.php	19 Jul 2005 23:31:24 -0000	1.4
***************
*** 197,213 ****
  	// [img]image_url_here[/img] code..
  	// This one gets first-passed..
! 	$patterns[] = "#\[img:$uid\]([^?].*?)\[/img:$uid\]#si";
  	$replacements[] = $bbcode_tpl['img'];

  	// 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=([\w]+?://[^ \"\n\r\t<]*?)\]([^?\n\r\t].*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url3'];

  	// [url=www.phpbb.com]phpBB[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url=((www|ftp)\.[^ \"\n\r\t<]*?)\]([^?\n\r\t].*?)\[/url\]#is"; 
  	$replacements[] = $bbcode_tpl['url3'];

--- 197,213 ----
  	// [img]image_url_here[/img] code..
  	// This one gets first-passed..
! 	$patterns[] = "#\[url\]([\w]+?://[\w\#$%&~/.\-;:=,?@\[\]+]*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['img'];

  	// matches a [url]xxxx://www.phpbb.com[/url] code..
! 	$patterns[] = "#\[url\]((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url1'];

  	// [url]www.phpbb.com[/url] code.. (no xxxx:// prefix).
! 	$patterns[] = "#\[url=([\w]+?://[\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\#$%&~/.\-;:=,?@\[\]+]*?)\]([^?\n\r\t].*?)\[/url\]#is";
  	$replacements[] = $bbcode_tpl['url3'];

***************
*** 624,628 ****
  	// 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
--- 624,628 ----
  	// xxxx can only be alpha characters.
  	// yyyy is anything up to the first space, newline, comma, double quote or <
! 	$ret = preg_replace("#(^|[\n ])((www|ftp)\.[^ \"\t\n\r<]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);

  	// matches a "www|ftp.xxxx.yyyy[/zzzz]" kinda lazy URL thing
***************
*** 634,638 ****
  	// 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..
--- 634,638 ----
  	// 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 ])((www|ftp)\.[\w\#$%&~/.\-;:=,?@\[\]+]*)#is", "\\1<a href=\"http://\\2\" target=\"_blank\">\\2</a>", $ret);

  	// Remove our padding..

Index: usercp_avatar.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_avatar.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** usercp_avatar.php	27 Jun 2005 20:16:39 -0000	1.4
--- usercp_avatar.php	19 Jul 2005 23:31:25 -0000	1.5
***************
*** 87,90 ****
--- 87,92 ----
  function user_avatar_url($mode, &$error, &$error_msg, $avatar_filename)
  {
+ 	global $lang;
+ 
  	if ( !preg_match('#^(http)|(ftp):\/\/#i', $avatar_filename) )
  	{

[Phpbb-php5mod-cvs-checkins] phpbb-php5/includes bbcode.php,1.3,1.4 functions.php,1.3,1.4 functions_

[Phpbb-php5mod-cvs-checkins] phpbb-php5/includes bbcode.php,1.3,1.4 functions.php,1.3,1.4 functions_validate.php,1.1,1.2 sessions.php,1.7,1.8 usercp_activate.php,1.2,1.3 usercp_avatar.php,1.4,1.5 usercp_confirm.php,1.2,1.3 usercp_viewprofile.php,1.4,1.5