mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 00:37:42 +02:00
Do not error out if php_uname function disabled / Authenticating on SMTP Server (Bug #22235 - patch by HoL)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8449 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -1056,8 +1056,7 @@ class smtp_class
|
||||
global $user;
|
||||
|
||||
$err_msg = '';
|
||||
$local_host = php_uname('n');
|
||||
$local_host = (empty($local_host)) ? 'localhost' : $local_host;
|
||||
$local_host = (function_exists('php_uname')) ? php_uname('n') : $user->host;
|
||||
|
||||
// If we are authenticating through pop-before-smtp, we
|
||||
// have to login ones before we get authenticated
|
||||
@@ -1332,7 +1331,7 @@ class smtp_class
|
||||
// Realm
|
||||
if (empty($tokens['realm']))
|
||||
{
|
||||
$tokens['realm'] = php_uname('n');
|
||||
$tokens['realm'] = (function_exists('php_uname')) ? php_uname('n') : $user->host;
|
||||
}
|
||||
|
||||
// Maxbuf
|
||||
|
Reference in New Issue
Block a user