[Phpbb-checkins] CVS: phpBB2 common.php,1.66,1.67

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

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

Modified Files:
	common.php 
Log Message:
Updated IP stuff

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -r1.66 -r1.67
*** common.php	2001/12/05 00:20:52	1.66
--- common.php	2001/12/10 02:01:28	1.67
***************
*** 143,158 ****
  // Obtain and encode users IP
  //
! if(!empty($HTTP_CLIENT_IP))
  {
! 	$client_ip = ( ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_CLIENT_IP) ) ? $HTTP_CLIENT_IP : $REMOTE_ADDR;
  }
- else if(!empty($HTTP_X_FORWARDED_FOR))
- {
- 	$client_ip = ( ereg("^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)", $HTTP_X_FORWARDED_FOR, $ip_list) ) ? $ip_list[0] : $REMOTE_ADDR;
- }
- else if(!empty($HTTP_PROXY_USER))
- {
- 	$client_ip = ( ereg("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+", $HTTP_PROXY_USER) ) ? $HTTP_PROXY_USER : $REMOTE_ADDR;
- }
  else
  {
--- 143,150 ----
  // Obtain and encode users IP
  //
! if( !empty($HTTP_X_FORWARDED_FOR) )
  {
! 	$client_ip = ( preg_match("/^([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/", $HTTP_X_FORWARDED_FOR, $ip_list) ) ? $ip_list[1] : $REMOTE_ADDR;
  }
  else
  {
***************
*** 185,187 ****
  }
  
! ?>
--- 177,179 ----
  }
  
! ?>
\ No newline at end of file