[Phpbb-checkins] r10158 - in /branches/phpBB-3_0_0/phpBB/includes: functions_messenger.php session.php

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

Author: acydburn
Date: Thu Sep 17 14:39:50 2009
New Revision: 10158

Log:
extend r9387 - check for existance of all functions we use...

Modified:
    branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
    branches/phpBB-3_0_0/phpBB/includes/session.php

Modified: branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_messenger.php Thu Sep 17 14:39:50 2009
***************
*** 1134,1140 ****
  		global $user;
  
  		$err_msg = '';
! 		$local_host = (function_exists('php_uname')) ? gethostbyaddr(gethostbyname(php_uname('n'))) : $user->host;
  
  		// If we are authenticating through pop-before-smtp, we
  		// have to login ones before we get authenticated
--- 1134,1140 ----
  		global $user;
  
  		$err_msg = '';
! 		$local_host = (function_exists('php_uname') && function_exists('gethostbyaddr') && function_exists('gethostbyname')) ? gethostbyaddr(gethostbyname(php_uname('n'))) : $user->host;
  
  		// If we are authenticating through pop-before-smtp, we
  		// have to login ones before we get authenticated

Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Thu Sep 17 14:39:50 2009
***************
*** 182,188 ****
  			else
  			{
  				// Set to OS hostname or localhost
! 				$host = (function_exists('php_uname')) ? gethostbyaddr(gethostbyname(php_uname('n'))) : 'localhost';
  			}
  		}
  
--- 182,188 ----
  			else
  			{
  				// Set to OS hostname or localhost
! 				$host = (function_exists('php_uname') && function_exists('gethostbyaddr') && function_exists('gethostbyname')) ? gethostbyaddr(gethostbyname(php_uname('n'))) : 'localhost';
  			}
  		}