mail: allow 7bit contents
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3753 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
7
mail.php
7
mail.php
@@ -273,7 +273,8 @@ class mail
|
|||||||
if ($parts[$i] === "")
|
if ($parts[$i] === "")
|
||||||
continue;
|
continue;
|
||||||
$messagePart = $this->parseMessagePart ($parts[$i]);
|
$messagePart = $this->parseMessagePart ($parts[$i]);
|
||||||
if ($messagePart === null)
|
if ($messagePart === null ||
|
||||||
|
! array_key_exists ("_contentType", $messagePart))
|
||||||
continue;
|
continue;
|
||||||
$messagePart["_parentID"] = $sectionIDParent;
|
$messagePart["_parentID"] = $sectionIDParent;
|
||||||
$sectionIDChild = $this->sectionAdd ($messagePart);
|
$sectionIDChild = $this->sectionAdd ($messagePart);
|
||||||
@@ -1396,8 +1397,8 @@ class mail
|
|||||||
return quoted_printable_decode ($content);
|
return quoted_printable_decode ($content);
|
||||||
elseif ($encoding === "base64")
|
elseif ($encoding === "base64")
|
||||||
return base64_decode ($content);
|
return base64_decode ($content);
|
||||||
elseif ($encoding === "8bit")
|
elseif ($encoding === "8bit" || $encoding === "7bit")
|
||||||
return ($content);
|
return $content;
|
||||||
throw new \Exception (sprintf (
|
throw new \Exception (sprintf (
|
||||||
_("Invalid encoding provided to encodingDecode : '%s'"),
|
_("Invalid encoding provided to encodingDecode : '%s'"),
|
||||||
$encoding),
|
$encoding),
|
||||||
|
|||||||
Reference in New Issue
Block a user