diff options
author | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
---|---|---|
committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-11-04 19:58:48 +0100 |
commit | 00bb246a0d90ddbcc1016fdedb5cf629bfbca70a (patch) | |
tree | f5d69cf10ef3fd157a21990a38515c03b74035a1 /lib/mail.php | |
parent | df8c67721df1358eab7aa5794ef223a5bc8f0b59 (diff) | |
parent | 8ac3849a95bd6a733cce9134bab4bf38c5c0fadd (diff) | |
download | nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.tar.gz nextcloud-server-00bb246a0d90ddbcc1016fdedb5cf629bfbca70a.zip |
merge from master
Diffstat (limited to 'lib/mail.php')
-rw-r--r-- | lib/mail.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/mail.php b/lib/mail.php index 8d30fff9f28..c78fcce88d4 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -27,7 +27,7 @@ class OC_Mail { * @param string $fromname * @param bool $html */ - public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='',$bcc='') { + public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') { $SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' ); $SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' ); @@ -56,13 +56,13 @@ class OC_Mail { $mailo->From =$fromaddress; $mailo->FromName = $fromname;; $mailo->Sender =$fromaddress; - $a=explode(' ',$toaddress); + $a=explode(' ', $toaddress); try { foreach($a as $ad) { - $mailo->AddAddress($ad,$toname); + $mailo->AddAddress($ad, $toname); } - if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname); + if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname); if($bcc<>'') $mailo->AddBCC($bcc); $mailo->AddReplyTo($fromaddress, $fromname); |