mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00
Code Issues Releases Wiki Activity

merging... again

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8452 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-03-18 14:47:43 +00:00
parent c34599126f
commit 02a5032a52
11 changed files with 64 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/functions_messenger.php
View File

@@ -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