[UseBB-Checkins] UseBB/sources functions.php,1.359,1.360

[Dietrich M. <pc_...@us...>]

Update of /cvsroot/usebb/UseBB/sources
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22787/sources

Modified Files:
	functions.php 
Log Message:
some more

Index: functions.php
===================================================================
RCS file: /cvsroot/usebb/UseBB/sources/functions.php,v
retrieving revision 1.359
retrieving revision 1.360
diff -C2 -d -r1.359 -r1.360
*** functions.php	30 Dec 2006 13:37:13 -0000	1.359
--- functions.php	30 Dec 2006 13:58:05 -0000	1.360
***************
*** 197,203 ****
  	exec('nslookup -type='.$type.' '.$host, $output);
  	
  	foreach ( $output as $line ) {
  		
! 		if ( strpos($line, $host) === 0 )
  			return true;
  		
--- 197,204 ----
  	exec('nslookup -type='.$type.' '.$host, $output);
  	
+ 	$host_len = strlen($host);
  	foreach ( $output as $line ) {
  		
! 		if ( !strncasecmp($line, $host, $host_len) )
  			return true;
  		
***************
*** 290,294 ****
  		);
  		
! 		if ( strpos($error, 'SQL:') === 0 ) {
  			
  			$errtype = 'SQL_ERROR';
--- 291,295 ----
  		);
  		
! 		if ( !strncmp($error, 'SQL:', 4) ) {
  			
  			$errtype = 'SQL_ERROR';
***************
*** 299,303 ****
  		error_log('[UseBB Error] ['.date('D M d G:i:s Y').'] ['.$errtype.' - '.preg_replace('#(?:\s+|\s)#', ' ', $error).'] ['.$file.':'.$line.']');
  		
! 		if ( strpos($error, 'mysql') === 0 && $this->get_config('debug') < 2 )
  			$error = preg_replace("#'[^ ]+'?@'?[^ ]+'#", '<em>-filtered-</em>', $error);
  		
--- 300,304 ----
  		error_log('[UseBB Error] ['.date('D M d G:i:s Y').'] ['.$errtype.' - '.preg_replace('#(?:\s+|\s)#', ' ', $error).'] ['.$file.':'.$line.']');
  		
! 		if ( !strncmp($error, 'mysql', 5) && $this->get_config('debug') < 2 )
  			$error = preg_replace("#'[^ ]+'?@'?[^ ]+'#", '<em>-filtered-</em>', $error);
  		
***************
*** 373,378 ****
  		// - sql error "Table 'x' doesn't exist" or "Access denied for user"
  		//
! 		if ( ( strpos($error, 'mysql') === 0 && strpos($error, 'Access denied for user') !== false ) ||
! 		( $errtype == 'SQL_ERROR' && preg_match("#(?:Table '.+' doesn't exist|Access denied for user)#i", $error) ) ) {
  			
  			$html_msg .= '
--- 374,378 ----
  		// - sql error "Table 'x' doesn't exist" or "Access denied for user"
  		//
! 		if ( ( !strncmp($error, 'mysql', 5) && strpos($error, 'Access denied for user') !== false ) || ( $errtype == 'SQL_ERROR' && preg_match("#(?:Table '.+' doesn't exist|Access denied for user)#i", $error) ) ) {
  			
  			$html_msg .= '