diff options
| -rw-r--r-- | phpBB/docs/AUTHORS | 24 | ||||
| -rw-r--r-- | phpBB/includes/functions_messenger.php | 12 |
2 files changed, 24 insertions, 12 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS index ffe7e0d756..02ec45bfd2 100644 --- a/phpBB/docs/AUTHORS +++ b/phpBB/docs/AUTHORS @@ -1,22 +1,40 @@ /* ********************************************************************** *\ /* *\ -/* phpBB3 © Copyright 2003 phpBB Group *\ +/* phpBB3 © Copyright 2006 phpBB Group *\ /* *\ /* [ http://www.phpbb.com/ ] *\ /* *\ /* ********************************************************************** *\ -Please see: http://www.phpbb.com/about/ for a list of all the people involved in phpBB. +Please see: http://www.phpbb.com/about/ for a list of all the people currently +involved in phpBB. + +phpBB Project Manager : theFinn (James Atkinson) + +phpBB Lead Developers : Acyd Burn (Meik Sievertsen) + psoTFX (Paul S. Owen) [2001 - 09/2005] + +phpBB Developers : DavidMJ (David M.) + GrahamJE (Graham Eames) + Naderman (Nils Aderman) + subBlue (Tom Beddard) + + Ashe (Ludovic Arnaud) - [10/2002 - 11/2003] + BartVB (Bart van Bragt) - [11/2000 - 03/2006] + + Original subSilver by subBlue Design, Tom Beddard, © 2001 phpBB Group phpBB3 contains code from the following applications: LGPL licenced: Smarty © 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/ +Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff GPL licenced: phpMyAdmin © 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/ Jabber class © 2003 Carlo Zottmann, http://phpjabber.g-blog.net PHP License, version 3.0: -Pear © 2001-2004 PHP Group, http://pear.php.net
\ No newline at end of file +Pear © 2001-2004 PHP Group, http://pear.php.net + 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 |