mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00: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:
parent
076a235bb0
commit
28fe12956d
2 changed files with 24 additions and 12 deletions
|
@ -1,18 +1,35 @@
|
||||||
/* ********************************************************************** *\
|
/* ********************************************************************** *\
|
||||||
/* *\
|
/* *\
|
||||||
/* phpBB3 © Copyright 2003 phpBB Group *\
|
/* phpBB3 © Copyright 2006 phpBB Group *\
|
||||||
/* *\
|
/* *\
|
||||||
/* [ http://www.phpbb.com/ ] *\
|
/* [ 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
|
Original subSilver by subBlue Design, Tom Beddard, © 2001 phpBB Group
|
||||||
|
|
||||||
phpBB3 contains code from the following applications:
|
phpBB3 contains code from the following applications:
|
||||||
|
|
||||||
LGPL licenced:
|
LGPL licenced:
|
||||||
Smarty © 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
|
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:
|
GPL licenced:
|
||||||
phpMyAdmin © 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
|
phpMyAdmin © 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
|
||||||
|
@ -20,3 +37,4 @@ Jabber class
|
||||||
|
|
||||||
PHP License, version 3.0:
|
PHP License, version 3.0:
|
||||||
Pear © 2001-2004 PHP Group, http://pear.php.net
|
Pear © 2001-2004 PHP Group, http://pear.php.net
|
||||||
|
|
||||||
|
|
|
@ -915,7 +915,7 @@ class smtp_class
|
||||||
global $user;
|
global $user;
|
||||||
|
|
||||||
$err_msg = '';
|
$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
|
// If we are authenticating through pop-before-smtp, we
|
||||||
// have to login ones before we get authenticated
|
// have to login ones before we get authenticated
|
||||||
|
@ -966,12 +966,7 @@ class smtp_class
|
||||||
$available_methods = explode(' ', $this->commands['AUTH']);
|
$available_methods = explode(' ', $this->commands['AUTH']);
|
||||||
|
|
||||||
// Define the auth ordering if the default auth method was not found
|
// Define the auth ordering if the default auth method was not found
|
||||||
$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5');
|
$auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5');
|
||||||
if (function_exists('posix_uname'))
|
|
||||||
{
|
|
||||||
$auth_methods[] = 'DIGEST-MD5';
|
|
||||||
}
|
|
||||||
|
|
||||||
$method = '';
|
$method = '';
|
||||||
|
|
||||||
if (in_array($default_auth_method, $available_methods))
|
if (in_array($default_auth_method, $available_methods))
|
||||||
|
@ -1148,8 +1143,7 @@ class smtp_class
|
||||||
// Realm
|
// Realm
|
||||||
if (empty($tokens['realm']))
|
if (empty($tokens['realm']))
|
||||||
{
|
{
|
||||||
$uname = posix_uname();
|
$tokens['realm'] = php_uname('n');
|
||||||
$tokens['realm'] = $uname['nodename'];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Maxbuf
|
// Maxbuf
|
||||||
|
|
Loading…
Add table
Reference in a new issue