extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-29 11:23:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix IDE warnings

Browse Source
This commit is contained in:
Ralf Becker 2014-06-05 10:33:38 +00:00
parent 6d6e9d8a43
commit f5d4cdf7c0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpgwapi/inc/class.egw_mailer.inc.php
View File

@ -103,7 +103,7 @@ class egw_mailer extends PHPMailer
{ {
$port = $this->Port; $port = $this->Port;
$hosts = explode(';',$this->Host); $hosts = explode(';',$this->Host);
foreach ($hosts as $k => &$host) foreach ($hosts as &$host)
{ {
$host = trim($host); // make sure there is no whitespace leading or trailling the host string $host = trim($host); // make sure there is no whitespace leading or trailling the host string
if (in_array($port,array(465,587)) && strpos($host,'://')===false) if (in_array($port,array(465,587)) && strpos($host,'://')===false)
@ -130,6 +130,7 @@ class egw_mailer extends PHPMailer
*/ */
public function SmtpSend($header, $body) public function SmtpSend($header, $body)
{ {
$matches = null;
$mail_id = $GLOBALS['egw']->hooks->process(array( $mail_id = $GLOBALS['egw']->hooks->process(array(
'location' => 'send_mail', 'location' => 'send_mail',
'subject' => $this->Subject, 'subject' => $this->Subject,
@ -138,7 +139,7 @@ class egw_mailer extends PHPMailer
'cc' => $this->addresses['Cc'], 'cc' => $this->addresses['Cc'],
'bcc' => $this->addresses['Bcc'], 'bcc' => $this->addresses['Bcc'],
'body_sha1' => sha1($body), 'body_sha1' => sha1($body),
'message_id' => preg_match('/^Message-ID: (.*)$/m', $header,$matches) ? $matches[1] : null, 'message_id' => preg_match('/^Message-ID: (.*)$/m', $header, $matches) ? $matches[1] : null,
), array(), true); // true = call all apps ), array(), true); // true = call all apps
$this->addresses = array(); // reset addresses for next mail $this->addresses = array(); // reset addresses for next mail