Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

mail: add a Return-Path header is done on the first line and the other headers are added at the end of the headers

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3759 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2017-06-13 14:16:58 +00:00
parent d2d6b6ba24
commit 3d571ae233
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mail.php
View File

@@ -1119,9 +1119,31 @@ class mail
throw new \Exception ("Wanted section not found in addHeader", 404);
$sectionMainID = $sectionID;
}
$this->sections[$sectionMainID]["_headersArray"][][$header] = $value;
// TODO : Encode ? Strip ?
$this->sections[$sectionMainID]["_headersEML"] .= "$header: $value";
if ($header === "Return-Path")
{
// Must be placed on the first line and must be unique
reset ($this->sections[$sectionMainID]["_headersArray"]);
if (key_exists (0, $this->sections[$sectionMainID]["_headersArray"]) &&
key_exists ("Return-Path", $this->sections[$sectionMainID]["_headersArray"][0]))
{
// Remove the old one
array_shift ($this->sections[$sectionMainID]["_headersArray"]);
$this->sections[$sectionMainID]["_headersEML"] =
substr ($this->sections[$sectionMainID]["_headersEML"],
strpos ($this->sections[$sectionMainID]["_headersEML"], "\n") +1);
}
array_unshift ($this->sections[$sectionMainID]["_headersArray"],
array ($header => $value));
$this->sections[$sectionMainID]["_headersEML"] = "$header: $value".
$this->sections[$sectionMainID]["_headersEML"];
}
else
{
// The "normal" headers are places sequentially at the end of the headers
$this->sections[$sectionMainID]["_headersArray"][][$header] = $value;
// TODO : Encode ? Strip ?
$this->sections[$sectionMainID]["_headersEML"] .= "$header: $value";
}
$this->createMailEML ();
}