holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable the use of the active mailprofile (if set)

Browse Source
This commit is contained in:
Klaus Leithoff 2008-06-19 11:44:31 +00:00
parent 6b631a3dd0
commit e5f5feddf1
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpgwapi/inc/class.send.inc.php
View File

@ -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'];
}