adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-08 01:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved issue 0000815: Email format standardization

Browse Source 
Merge branch-1_7 2282:2283 into BSF


git-svn-id: http://piwigo.org/svn/trunk@2284 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2008-03-18 22:02:33 +00:00
parent 0da8401a9c
commit 6ae74fe965
4 changed files with 68 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/class_smtp_mail.inc.php
+10 -5
View File
@@ -2,7 +2,7 @@
// +-----------------------------------------------------------------------+
// | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+
// | file : $Id$
// | last update : $Date$
@@ -121,21 +121,26 @@ class smtp_mail
$this->server_write('MAIL FROM: <'.$this->email_webmaster.'>'."\r\n");
$this->server_parse('250');
$to_header = 'To: ';
if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
{
$to_header = 'To: '.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
}
else
{
$to_header = '';
}
@reset($recipients);
while (list(, $email) = @each($recipients))
{
$this->server_write('RCPT TO: <'.$email.'>'."\r\n");
$this->server_parse('250');
$to_header .= '<'.$email.'>, ';
}
$this->server_write('DATA'."\r\n");
$this->server_parse('354');
$this->server_write('Subject: '.$subject."\r\n".$to_header."\r\n".$headers."\r\n\r\n".$message."\r\n");
$this->server_write('Subject: '.$subject."\r\n".(empty($to_header) ? "" : $to_header."\r\n").$headers."\r\n\r\n".$message."\r\n");
$this->server_write('.'."\r\n");
$this->server_parse('250');