mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 09:04:53 +01:00
enable the use of the active mailprofile (if set)
This commit is contained in:
parent
6b631a3dd0
commit
e5f5feddf1
@ -52,14 +52,30 @@
|
||||
$lang = $nation;
|
||||
}
|
||||
$this->SetLanguage($lang,$lang_path);
|
||||
|
||||
$this->IsSmtp();
|
||||
$this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost';
|
||||
$this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25;
|
||||
$this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']);
|
||||
$this->Username = $GLOBALS['egw_info']['server']['smtp_auth_user'];
|
||||
$this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd'];
|
||||
|
||||
$bopreferences =& CreateObject('felamimail.bopreferences');
|
||||
if ($bopreferences) {
|
||||
$preferences = $bopreferences->getPreferences();
|
||||
if ($preferences) {
|
||||
$ogServer = $preferences->getOutgoingServer(0);
|
||||
if ($ogServer) {
|
||||
$this->Host = $ogServer->host;
|
||||
$this->Port = $ogServer->port;
|
||||
if($ogServer->smtpAuth) {
|
||||
$this->SMTPAuth = true;
|
||||
$this->Username = $ogServer->username;
|
||||
$this->Password = $ogServer->password;
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$this->Host = $GLOBALS['egw_info']['server']['smtp_server']?$GLOBALS['egw_info']['server']['smtp_server']:'localhost';
|
||||
$this->Port = $GLOBALS['egw_info']['server']['smtp_port']?$GLOBALS['egw_info']['server']['smtp_port']:25;
|
||||
$this->SMTPAuth = !empty($GLOBALS['egw_info']['server']['smtp_auth_user']);
|
||||
$this->Username = $GLOBALS['egw_info']['server']['smtp_auth_user'];
|
||||
$this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd'];
|
||||
}
|
||||
$this->Hostname = $GLOBALS['egw_info']['server']['hostname'];
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user