diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-30 12:19:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-30 12:19:11 +0000 |
| commit | 28fe12956dc9dc2baa048bc40143e2dbacd7663e (patch) | |
| tree | d64c4f644be23e8926a97005ab0daa827e1dd997 /phpBB/includes/functions_messenger.php | |
| parent | 076a235bb0ab769099e73d832c2e4a349af5821e (diff) | |
| download | forums-28fe12956dc9dc2baa048bc40143e2dbacd7663e.tar forums-28fe12956dc9dc2baa048bc40143e2dbacd7663e.tar.gz forums-28fe12956dc9dc2baa048bc40143e2dbacd7663e.tar.bz2 forums-28fe12956dc9dc2baa048bc40143e2dbacd7663e.tar.xz forums-28fe12956dc9dc2baa048bc40143e2dbacd7663e.zip | |
- 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
Diffstat (limited to 'phpBB/includes/functions_messenger.php')
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index a314c5edef..db647aba60 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -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 |