phpbb-php5mod-cvs-checkins

[Josh <jel...@us...>]

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

Modified Files:
	functions_admin.php functions_search.php usercp_register.php 
Log Message:
Additions from phpBB Group
Some fixes from me

Index: functions_search.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/functions_search.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** functions_search.php	31 Oct 2005 03:18:41 -0000	1.4
--- functions_search.php	31 Oct 2005 21:03:26 -0000	1.5
***************
*** 351,354 ****
--- 351,355 ----
  		case 'mysql':
  		case 'mysql4':
+ 		case 'mysqli':
  			$sql = "SELECT word_id 
  				FROM " . SEARCH_MATCH_TABLE . " 

Index: usercp_register.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/usercp_register.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** usercp_register.php	31 Oct 2005 03:18:41 -0000	1.7
--- usercp_register.php	31 Oct 2005 21:03:26 -0000	1.8
***************
*** 72,75 ****
--- 72,76 ----
  
  $error = FALSE;
+ $error_msg = '';
  $page_title = ( $mode == 'editprofile' ) ? $lang['Edit_profile'] : $lang['Register'];
  
***************
*** 191,194 ****
--- 192,196 ----
  
  	$user_avatar_local = ( isset($_POST['avatarselect']) && !empty($_POST['submitavatar']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($_POST['avatarselect']) : ( ( isset($_POST['avatarlocal'])  ) ? htmlspecialchars($_POST['avatarlocal']) : '' );
+ 	$user_avatar_category = ( isset($HTTP_POST_VARS['avatarcatname']) && $board_config['allow_avatar_local'] ) ? htmlspecialchars($HTTP_POST_VARS['avatarcatname']) : '' ;
  
  	$user_avatar_remoteurl = ( !empty($_POST['avatarremoteurl']) ) ? trim(htmlspecialchars($_POST['avatarremoteurl'])) : '';
***************
*** 218,222 ****
  		$occupation = stripslashes($occupation);
  		$interests = stripslashes($interests);
! 		$signature = stripslashes($signature);
  
  		$user_lang = stripslashes($user_lang);
--- 220,224 ----
  		$occupation = stripslashes($occupation);
  		$interests = stripslashes($interests);
! 		$signature = htmlspecialchars(stripslashes($signature));
  
  		$user_lang = stripslashes($user_lang);
***************
*** 225,229 ****
  		if ( !isset($_POST['cancelavatar']))
  		{
! 			$user_avatar = $user_avatar_local;
  			$user_avatar_type = USER_AVATAR_GALLERY;
  		}
--- 227,231 ----
  		if ( !isset($_POST['cancelavatar']))
  		{
! 			$user_avatar = $user_avatar_category . '/' . $user_avatar_local; 
  			$user_avatar_type = USER_AVATAR_GALLERY;
  		}
***************
*** 434,438 ****
  		}
  
! 		if ( $signature_bbcode_uid == '' )
  		{
  			$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : '';
--- 436,440 ----
  		}
  
! 		if ( !isset($signature_bbcode_uid) || $signature_bbcode_uid == '' )
  		{
  			$signature_bbcode_uid = ( $allowbbcode ) ? make_bbcode_uid() : '';
***************
*** 471,487 ****
  	else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
  	{
! 		if ( @file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar'])) )
! 		{
! 			@unlink(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']));
! 		}
  		$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
  	}
  	else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
  	{
! 		if ( @file_exists(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar'])) )
! 		{
! 			@unlink(@phpbb_realpath('./' . $board_config['avatar_path'] . '/' . $userdata['user_avatar']));
! 		}
! 		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local);
  	}
  
--- 473,483 ----
  	else if ( $user_avatar_remoteurl != '' && $board_config['allow_avatar_remote'] )
  	{
! 		user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
  		$avatar_sql = user_avatar_url($mode, $error, $error_msg, $user_avatar_remoteurl);
  	}
  	else if ( $user_avatar_local != '' && $board_config['allow_avatar_local'] )
  	{
! 		user_avatar_delete($userdata['user_avatar_type'], $userdata['user_avatar']);
! 		$avatar_sql = user_avatar_gallery($mode, $error, $error_msg, $user_avatar_local, $user_avatar_category);
  	}
  
***************
*** 894,898 ****
  	if ( !empty($user_avatar_local) )
  	{
! 		$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" />';
  	}
  
--- 890,894 ----
  	if ( !empty($user_avatar_local) )
  	{
! 		$s_hidden_fields .= '<input type="hidden" name="avatarlocal" value="' . $user_avatar_local . '" /><input type="hidden" name="avatarcatname" value="' . $user_avatar_category . '" />'; 
  	}
  

Index: functions_admin.php
===================================================================
RCS file: /cvsroot/phpbb-php5mod/phpbb-php5/includes/functions_admin.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** functions_admin.php	31 Oct 2005 03:18:41 -0000	1.2
--- functions_admin.php	31 Oct 2005 21:03:26 -0000	1.3
***************
*** 180,183 ****
--- 180,184 ----
  				$db->sql_freeresult($result);
  			break;
+ 		}
  	}