1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

- use php_uname('n') instead of posix_uname and HTTP_HOST

- updated the authors file a bit


git-svn-id: file:///svn/phpbb/trunk@5866 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-04-30 12:19:11 +00:00
parent 076a235bb0
commit 28fe12956d
2 changed files with 24 additions and 12 deletions

View File

@@ -915,7 +915,7 @@ class smtp_class
global $user;
$err_msg = '';
$local_host = (empty($user->page)) ? 'localhost' : $user->host;
$local_host = (empty(php_uname('n'))) ? 'localhost' : php_uname('n');
// If we are authenticating through pop-before-smtp, we
// have to login ones before we get authenticated
@@ -966,12 +966,7 @@ class smtp_class
$available_methods = explode(' ', $this->commands['AUTH']);
// Define the auth ordering if the default auth method was not found
$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5');
if (function_exists('posix_uname'))
{
$auth_methods[] = 'DIGEST-MD5';
}
$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5');
$method = '';
if (in_array($default_auth_method, $available_methods))
@@ -1148,8 +1143,7 @@ class smtp_class
// Realm
if (empty($tokens['realm']))
{
$uname = posix_uname();
$tokens['realm'] = $uname['nodename'];
$tokens['realm'] = php_uname('n');
}
// Maxbuf