archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge -c3259 from trunk to branch 2.0

Browse source 
Remove " " after ":" on smtp_mail

git-svn-id: http://piwigo.org/svn/branches/2.0@3260 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2009-04-26 15:05:07 +00:00
parent ef20fa17b5
commit 6d758aec6b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/class_smtp_mail.inc.php
View file

@ -115,12 +115,12 @@ class smtp_mail
$this->server_parse('250');
}
$this->server_write('MAIL FROM: <'.$this->email_webmaster.'>'."\r\n");
$this->server_write('MAIL FROM:<'.$this->email_webmaster.'>'."\r\n");
$this->server_parse('250');
if (preg_match('/^\s*to\s*:.*/mi', $headers) === 0)
{
$to_header = 'To: '.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
$to_header = 'To:'.implode(',', array_map(create_function('$email','return "<".$email.">";'), $recipients));
}
else
{
@ -130,14 +130,14 @@ class smtp_mail
@reset($recipients);
while (list(, $email) = @each($recipients))
{
$this->server_write('RCPT TO: <'.$email.'>'."\r\n");
$this->server_write('RCPT TO:<'.$email.'>'."\r\n");
$this->server_parse('250');
}
$this->server_write('DATA'."\r\n");
$this->server_parse('354');
$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('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');