extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

preparation to use senderinformation specified with the smtpusername if set (appended to the username in the orm of:

Browse Source 
smtpusername;mailadress@thatisownedbysmtpusername.com)
This commit is contained in:
Klaus Leithoff 2008-10-21 11:57:52 +00:00
parent e54f9ee079
commit 859e1206e4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,9 @@
$this->Port = $ogServer->port;
if($ogServer->smtpAuth) {
$this->SMTPAuth = true;
$this->Username = $ogServer->username;
list($username,$senderadress) = explode(';', $ogServer->username,2);
if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress;
$this->Username = $username;
$this->Password = $ogServer->password;
}
}
@ -73,7 +75,9 @@
$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'];
list($username,$senderadress) = explode(';', $GLOBALS['egw_info']['server']['smtp_auth_user'],2);
if (isset($senderadress) && !empty($senderadress)) $this->Sender = $senderadress;
$this->Username = $username;
$this->Password = $GLOBALS['egw_info']['server']['smtp_auth_passwd'];
}
$this->Hostname = $GLOBALS['egw_info']['server']['hostname'];