mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

reverting changes to the installer

Browse Source 
do not introduce a function we never call outside of common.php


git-svn-id: file:///svn/phpbb/trunk@5859 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-04-29 13:14:33 +00:00
parent 7bc05c5e24
commit 859902ea24
8 changed files with 367 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/functions_messenger.php
View File

@@ -912,7 +912,10 @@ class smtp_class
// Log into server and get possible auth codes if neccessary
function log_into_server($hostname, $username, $password, $default_auth_method)
{
global $user;
$err_msg = '';
$local_host = (empty($user->page)) ? 'localhost' : $user->host;
// If we are authenticating through pop-before-smtp, we
// have to login ones before we get authenticated
@@ -923,7 +926,7 @@ class smtp_class
}
// Try EHLO first
$this->server_send("EHLO [$hostname]");
$this->server_send("EHLO [{$local_host}]");
if ($err_msg = $this->server_parse('250', __LINE__))
{
// a 503 response code means that we're already authenticated
@@ -933,7 +936,7 @@ class smtp_class
}
// If EHLO fails, we try HELO
$this->server_send("HELO [$hostname]");
$this->server_send("HELO [{$local_host}]");
if ($err_msg = $this->server_parse('250', __LINE__))
{
return ($this->numeric_response_code == 503) ? false : $err_msg;
@@ -1148,7 +1151,7 @@ class smtp_class
$uname = posix_uname();
$tokens['realm'] = $uname['nodename'];
}
// Maxbuf
if (empty($tokens['maxbuf']))
{