|
|
@@ -19,7 +19,6 @@
|
|
|
* @version $Id$
|
|
|
*/
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Support class for MultiPart Mime Messages
|
|
|
*
|
|
|
@@ -30,20 +29,20 @@
|
|
|
*/
|
|
|
class Zend_Mime
|
|
|
{
|
|
|
- const TYPE_OCTETSTREAM = 'application/octet-stream';
|
|
|
- const TYPE_TEXT = 'text/plain';
|
|
|
- const TYPE_HTML = 'text/html';
|
|
|
- const ENCODING_7BIT = '7bit';
|
|
|
- const ENCODING_8BIT = '8bit';
|
|
|
+ const TYPE_OCTETSTREAM = 'application/octet-stream';
|
|
|
+ const TYPE_TEXT = 'text/plain';
|
|
|
+ const TYPE_HTML = 'text/html';
|
|
|
+ const ENCODING_7BIT = '7bit';
|
|
|
+ const ENCODING_8BIT = '8bit';
|
|
|
const ENCODING_QUOTEDPRINTABLE = 'quoted-printable';
|
|
|
- const ENCODING_BASE64 = 'base64';
|
|
|
- const DISPOSITION_ATTACHMENT = 'attachment';
|
|
|
- const DISPOSITION_INLINE = 'inline';
|
|
|
- const LINELENGTH = 72;
|
|
|
- const LINEEND = "\n";
|
|
|
- const MULTIPART_ALTERNATIVE = 'multipart/alternative';
|
|
|
- const MULTIPART_MIXED = 'multipart/mixed';
|
|
|
- const MULTIPART_RELATED = 'multipart/related';
|
|
|
+ const ENCODING_BASE64 = 'base64';
|
|
|
+ const DISPOSITION_ATTACHMENT = 'attachment';
|
|
|
+ const DISPOSITION_INLINE = 'inline';
|
|
|
+ const LINELENGTH = 72;
|
|
|
+ const LINEEND = "\n";
|
|
|
+ const MULTIPART_ALTERNATIVE = 'multipart/alternative';
|
|
|
+ const MULTIPART_MIXED = 'multipart/mixed';
|
|
|
+ const MULTIPART_RELATED = 'multipart/related';
|
|
|
|
|
|
/**
|
|
|
* Boundary
|
|
|
@@ -63,61 +62,341 @@ class Zend_Mime
|
|
|
* @var array
|
|
|
*/
|
|
|
public static $qpKeys = array(
|
|
|
- "\x00","\x01","\x02","\x03","\x04","\x05","\x06","\x07",
|
|
|
- "\x08","\x09","\x0A","\x0B","\x0C","\x0D","\x0E","\x0F",
|
|
|
- "\x10","\x11","\x12","\x13","\x14","\x15","\x16","\x17",
|
|
|
- "\x18","\x19","\x1A","\x1B","\x1C","\x1D","\x1E","\x1F",
|
|
|
- "\x7F","\x80","\x81","\x82","\x83","\x84","\x85","\x86",
|
|
|
- "\x87","\x88","\x89","\x8A","\x8B","\x8C","\x8D","\x8E",
|
|
|
- "\x8F","\x90","\x91","\x92","\x93","\x94","\x95","\x96",
|
|
|
- "\x97","\x98","\x99","\x9A","\x9B","\x9C","\x9D","\x9E",
|
|
|
- "\x9F","\xA0","\xA1","\xA2","\xA3","\xA4","\xA5","\xA6",
|
|
|
- "\xA7","\xA8","\xA9","\xAA","\xAB","\xAC","\xAD","\xAE",
|
|
|
- "\xAF","\xB0","\xB1","\xB2","\xB3","\xB4","\xB5","\xB6",
|
|
|
- "\xB7","\xB8","\xB9","\xBA","\xBB","\xBC","\xBD","\xBE",
|
|
|
- "\xBF","\xC0","\xC1","\xC2","\xC3","\xC4","\xC5","\xC6",
|
|
|
- "\xC7","\xC8","\xC9","\xCA","\xCB","\xCC","\xCD","\xCE",
|
|
|
- "\xCF","\xD0","\xD1","\xD2","\xD3","\xD4","\xD5","\xD6",
|
|
|
- "\xD7","\xD8","\xD9","\xDA","\xDB","\xDC","\xDD","\xDE",
|
|
|
- "\xDF","\xE0","\xE1","\xE2","\xE3","\xE4","\xE5","\xE6",
|
|
|
- "\xE7","\xE8","\xE9","\xEA","\xEB","\xEC","\xED","\xEE",
|
|
|
- "\xEF","\xF0","\xF1","\xF2","\xF3","\xF4","\xF5","\xF6",
|
|
|
- "\xF7","\xF8","\xF9","\xFA","\xFB","\xFC","\xFD","\xFE",
|
|
|
+ "\x00",
|
|
|
+ "\x01",
|
|
|
+ "\x02",
|
|
|
+ "\x03",
|
|
|
+ "\x04",
|
|
|
+ "\x05",
|
|
|
+ "\x06",
|
|
|
+ "\x07",
|
|
|
+ "\x08",
|
|
|
+ "\x09",
|
|
|
+ "\x0A",
|
|
|
+ "\x0B",
|
|
|
+ "\x0C",
|
|
|
+ "\x0D",
|
|
|
+ "\x0E",
|
|
|
+ "\x0F",
|
|
|
+ "\x10",
|
|
|
+ "\x11",
|
|
|
+ "\x12",
|
|
|
+ "\x13",
|
|
|
+ "\x14",
|
|
|
+ "\x15",
|
|
|
+ "\x16",
|
|
|
+ "\x17",
|
|
|
+ "\x18",
|
|
|
+ "\x19",
|
|
|
+ "\x1A",
|
|
|
+ "\x1B",
|
|
|
+ "\x1C",
|
|
|
+ "\x1D",
|
|
|
+ "\x1E",
|
|
|
+ "\x1F",
|
|
|
+ "\x7F",
|
|
|
+ "\x80",
|
|
|
+ "\x81",
|
|
|
+ "\x82",
|
|
|
+ "\x83",
|
|
|
+ "\x84",
|
|
|
+ "\x85",
|
|
|
+ "\x86",
|
|
|
+ "\x87",
|
|
|
+ "\x88",
|
|
|
+ "\x89",
|
|
|
+ "\x8A",
|
|
|
+ "\x8B",
|
|
|
+ "\x8C",
|
|
|
+ "\x8D",
|
|
|
+ "\x8E",
|
|
|
+ "\x8F",
|
|
|
+ "\x90",
|
|
|
+ "\x91",
|
|
|
+ "\x92",
|
|
|
+ "\x93",
|
|
|
+ "\x94",
|
|
|
+ "\x95",
|
|
|
+ "\x96",
|
|
|
+ "\x97",
|
|
|
+ "\x98",
|
|
|
+ "\x99",
|
|
|
+ "\x9A",
|
|
|
+ "\x9B",
|
|
|
+ "\x9C",
|
|
|
+ "\x9D",
|
|
|
+ "\x9E",
|
|
|
+ "\x9F",
|
|
|
+ "\xA0",
|
|
|
+ "\xA1",
|
|
|
+ "\xA2",
|
|
|
+ "\xA3",
|
|
|
+ "\xA4",
|
|
|
+ "\xA5",
|
|
|
+ "\xA6",
|
|
|
+ "\xA7",
|
|
|
+ "\xA8",
|
|
|
+ "\xA9",
|
|
|
+ "\xAA",
|
|
|
+ "\xAB",
|
|
|
+ "\xAC",
|
|
|
+ "\xAD",
|
|
|
+ "\xAE",
|
|
|
+ "\xAF",
|
|
|
+ "\xB0",
|
|
|
+ "\xB1",
|
|
|
+ "\xB2",
|
|
|
+ "\xB3",
|
|
|
+ "\xB4",
|
|
|
+ "\xB5",
|
|
|
+ "\xB6",
|
|
|
+ "\xB7",
|
|
|
+ "\xB8",
|
|
|
+ "\xB9",
|
|
|
+ "\xBA",
|
|
|
+ "\xBB",
|
|
|
+ "\xBC",
|
|
|
+ "\xBD",
|
|
|
+ "\xBE",
|
|
|
+ "\xBF",
|
|
|
+ "\xC0",
|
|
|
+ "\xC1",
|
|
|
+ "\xC2",
|
|
|
+ "\xC3",
|
|
|
+ "\xC4",
|
|
|
+ "\xC5",
|
|
|
+ "\xC6",
|
|
|
+ "\xC7",
|
|
|
+ "\xC8",
|
|
|
+ "\xC9",
|
|
|
+ "\xCA",
|
|
|
+ "\xCB",
|
|
|
+ "\xCC",
|
|
|
+ "\xCD",
|
|
|
+ "\xCE",
|
|
|
+ "\xCF",
|
|
|
+ "\xD0",
|
|
|
+ "\xD1",
|
|
|
+ "\xD2",
|
|
|
+ "\xD3",
|
|
|
+ "\xD4",
|
|
|
+ "\xD5",
|
|
|
+ "\xD6",
|
|
|
+ "\xD7",
|
|
|
+ "\xD8",
|
|
|
+ "\xD9",
|
|
|
+ "\xDA",
|
|
|
+ "\xDB",
|
|
|
+ "\xDC",
|
|
|
+ "\xDD",
|
|
|
+ "\xDE",
|
|
|
+ "\xDF",
|
|
|
+ "\xE0",
|
|
|
+ "\xE1",
|
|
|
+ "\xE2",
|
|
|
+ "\xE3",
|
|
|
+ "\xE4",
|
|
|
+ "\xE5",
|
|
|
+ "\xE6",
|
|
|
+ "\xE7",
|
|
|
+ "\xE8",
|
|
|
+ "\xE9",
|
|
|
+ "\xEA",
|
|
|
+ "\xEB",
|
|
|
+ "\xEC",
|
|
|
+ "\xED",
|
|
|
+ "\xEE",
|
|
|
+ "\xEF",
|
|
|
+ "\xF0",
|
|
|
+ "\xF1",
|
|
|
+ "\xF2",
|
|
|
+ "\xF3",
|
|
|
+ "\xF4",
|
|
|
+ "\xF5",
|
|
|
+ "\xF6",
|
|
|
+ "\xF7",
|
|
|
+ "\xF8",
|
|
|
+ "\xF9",
|
|
|
+ "\xFA",
|
|
|
+ "\xFB",
|
|
|
+ "\xFC",
|
|
|
+ "\xFD",
|
|
|
+ "\xFE",
|
|
|
"\xFF"
|
|
|
- );
|
|
|
+ );
|
|
|
|
|
|
/**
|
|
|
* @var array
|
|
|
*/
|
|
|
public static $qpReplaceValues = array(
|
|
|
- "=00","=01","=02","=03","=04","=05","=06","=07",
|
|
|
- "=08","=09","=0A","=0B","=0C","=0D","=0E","=0F",
|
|
|
- "=10","=11","=12","=13","=14","=15","=16","=17",
|
|
|
- "=18","=19","=1A","=1B","=1C","=1D","=1E","=1F",
|
|
|
- "=7F","=80","=81","=82","=83","=84","=85","=86",
|
|
|
- "=87","=88","=89","=8A","=8B","=8C","=8D","=8E",
|
|
|
- "=8F","=90","=91","=92","=93","=94","=95","=96",
|
|
|
- "=97","=98","=99","=9A","=9B","=9C","=9D","=9E",
|
|
|
- "=9F","=A0","=A1","=A2","=A3","=A4","=A5","=A6",
|
|
|
- "=A7","=A8","=A9","=AA","=AB","=AC","=AD","=AE",
|
|
|
- "=AF","=B0","=B1","=B2","=B3","=B4","=B5","=B6",
|
|
|
- "=B7","=B8","=B9","=BA","=BB","=BC","=BD","=BE",
|
|
|
- "=BF","=C0","=C1","=C2","=C3","=C4","=C5","=C6",
|
|
|
- "=C7","=C8","=C9","=CA","=CB","=CC","=CD","=CE",
|
|
|
- "=CF","=D0","=D1","=D2","=D3","=D4","=D5","=D6",
|
|
|
- "=D7","=D8","=D9","=DA","=DB","=DC","=DD","=DE",
|
|
|
- "=DF","=E0","=E1","=E2","=E3","=E4","=E5","=E6",
|
|
|
- "=E7","=E8","=E9","=EA","=EB","=EC","=ED","=EE",
|
|
|
- "=EF","=F0","=F1","=F2","=F3","=F4","=F5","=F6",
|
|
|
- "=F7","=F8","=F9","=FA","=FB","=FC","=FD","=FE",
|
|
|
+ "=00",
|
|
|
+ "=01",
|
|
|
+ "=02",
|
|
|
+ "=03",
|
|
|
+ "=04",
|
|
|
+ "=05",
|
|
|
+ "=06",
|
|
|
+ "=07",
|
|
|
+ "=08",
|
|
|
+ "=09",
|
|
|
+ "=0A",
|
|
|
+ "=0B",
|
|
|
+ "=0C",
|
|
|
+ "=0D",
|
|
|
+ "=0E",
|
|
|
+ "=0F",
|
|
|
+ "=10",
|
|
|
+ "=11",
|
|
|
+ "=12",
|
|
|
+ "=13",
|
|
|
+ "=14",
|
|
|
+ "=15",
|
|
|
+ "=16",
|
|
|
+ "=17",
|
|
|
+ "=18",
|
|
|
+ "=19",
|
|
|
+ "=1A",
|
|
|
+ "=1B",
|
|
|
+ "=1C",
|
|
|
+ "=1D",
|
|
|
+ "=1E",
|
|
|
+ "=1F",
|
|
|
+ "=7F",
|
|
|
+ "=80",
|
|
|
+ "=81",
|
|
|
+ "=82",
|
|
|
+ "=83",
|
|
|
+ "=84",
|
|
|
+ "=85",
|
|
|
+ "=86",
|
|
|
+ "=87",
|
|
|
+ "=88",
|
|
|
+ "=89",
|
|
|
+ "=8A",
|
|
|
+ "=8B",
|
|
|
+ "=8C",
|
|
|
+ "=8D",
|
|
|
+ "=8E",
|
|
|
+ "=8F",
|
|
|
+ "=90",
|
|
|
+ "=91",
|
|
|
+ "=92",
|
|
|
+ "=93",
|
|
|
+ "=94",
|
|
|
+ "=95",
|
|
|
+ "=96",
|
|
|
+ "=97",
|
|
|
+ "=98",
|
|
|
+ "=99",
|
|
|
+ "=9A",
|
|
|
+ "=9B",
|
|
|
+ "=9C",
|
|
|
+ "=9D",
|
|
|
+ "=9E",
|
|
|
+ "=9F",
|
|
|
+ "=A0",
|
|
|
+ "=A1",
|
|
|
+ "=A2",
|
|
|
+ "=A3",
|
|
|
+ "=A4",
|
|
|
+ "=A5",
|
|
|
+ "=A6",
|
|
|
+ "=A7",
|
|
|
+ "=A8",
|
|
|
+ "=A9",
|
|
|
+ "=AA",
|
|
|
+ "=AB",
|
|
|
+ "=AC",
|
|
|
+ "=AD",
|
|
|
+ "=AE",
|
|
|
+ "=AF",
|
|
|
+ "=B0",
|
|
|
+ "=B1",
|
|
|
+ "=B2",
|
|
|
+ "=B3",
|
|
|
+ "=B4",
|
|
|
+ "=B5",
|
|
|
+ "=B6",
|
|
|
+ "=B7",
|
|
|
+ "=B8",
|
|
|
+ "=B9",
|
|
|
+ "=BA",
|
|
|
+ "=BB",
|
|
|
+ "=BC",
|
|
|
+ "=BD",
|
|
|
+ "=BE",
|
|
|
+ "=BF",
|
|
|
+ "=C0",
|
|
|
+ "=C1",
|
|
|
+ "=C2",
|
|
|
+ "=C3",
|
|
|
+ "=C4",
|
|
|
+ "=C5",
|
|
|
+ "=C6",
|
|
|
+ "=C7",
|
|
|
+ "=C8",
|
|
|
+ "=C9",
|
|
|
+ "=CA",
|
|
|
+ "=CB",
|
|
|
+ "=CC",
|
|
|
+ "=CD",
|
|
|
+ "=CE",
|
|
|
+ "=CF",
|
|
|
+ "=D0",
|
|
|
+ "=D1",
|
|
|
+ "=D2",
|
|
|
+ "=D3",
|
|
|
+ "=D4",
|
|
|
+ "=D5",
|
|
|
+ "=D6",
|
|
|
+ "=D7",
|
|
|
+ "=D8",
|
|
|
+ "=D9",
|
|
|
+ "=DA",
|
|
|
+ "=DB",
|
|
|
+ "=DC",
|
|
|
+ "=DD",
|
|
|
+ "=DE",
|
|
|
+ "=DF",
|
|
|
+ "=E0",
|
|
|
+ "=E1",
|
|
|
+ "=E2",
|
|
|
+ "=E3",
|
|
|
+ "=E4",
|
|
|
+ "=E5",
|
|
|
+ "=E6",
|
|
|
+ "=E7",
|
|
|
+ "=E8",
|
|
|
+ "=E9",
|
|
|
+ "=EA",
|
|
|
+ "=EB",
|
|
|
+ "=EC",
|
|
|
+ "=ED",
|
|
|
+ "=EE",
|
|
|
+ "=EF",
|
|
|
+ "=F0",
|
|
|
+ "=F1",
|
|
|
+ "=F2",
|
|
|
+ "=F3",
|
|
|
+ "=F4",
|
|
|
+ "=F5",
|
|
|
+ "=F6",
|
|
|
+ "=F7",
|
|
|
+ "=F8",
|
|
|
+ "=F9",
|
|
|
+ "=FA",
|
|
|
+ "=FB",
|
|
|
+ "=FC",
|
|
|
+ "=FD",
|
|
|
+ "=FE",
|
|
|
"=FF"
|
|
|
- );
|
|
|
+ );
|
|
|
|
|
|
/**
|
|
|
* @var string
|
|
|
*/
|
|
|
public static $qpKeysString =
|
|
|
- "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
|
|
|
+ "\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0A\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x7F\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8A\x8B\x8C\x8D\x8E\x8F\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9A\x9B\x9C\x9D\x9E\x9F\xA0\xA1\xA2\xA3\xA4\xA5\xA6\xA7\xA8\xA9\xAA\xAB\xAC\xAD\xAE\xAF\xB0\xB1\xB2\xB3\xB4\xB5\xB6\xB7\xB8\xB9\xBA\xBB\xBC\xBD\xBE\xBF\xC0\xC1\xC2\xC3\xC4\xC5\xC6\xC7\xC8\xC9\xCA\xCB\xCC\xCD\xCE\xCF\xD0\xD1\xD2\xD3\xD4\xD5\xD6\xD7\xD8\xD9\xDA\xDB\xDC\xDD\xDE\xDF\xE0\xE1\xE2\xE3\xE4\xE5\xE6\xE7\xE8\xE9\xEA\xEB\xEC\xED\xEE\xEF\xF0\xF1\xF2\xF3\xF4\xF5\xF6\xF7\xF8\xF9\xFA\xFB\xFC\xFD\xFE\xFF";
|
|
|
|
|
|
/**
|
|
|
* Check if the given string is "printable"
|
|
|
@@ -141,15 +420,17 @@ class Zend_Mime
|
|
|
* @param string $lineEnd Line end; defaults to {@link LINEEND}
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function encodeQuotedPrintable($str,
|
|
|
+ public static function encodeQuotedPrintable(
|
|
|
+ $str,
|
|
|
$lineLength = self::LINELENGTH,
|
|
|
- $lineEnd = self::LINEEND)
|
|
|
+ $lineEnd = self::LINEEND
|
|
|
+ )
|
|
|
{
|
|
|
$out = '';
|
|
|
$str = self::_encodeQuotedPrintable($str);
|
|
|
|
|
|
// Split encoded text into separate lines
|
|
|
- while(strlen($str) > 0) {
|
|
|
+ while (strlen($str) > 0) {
|
|
|
$ptr = strlen($str);
|
|
|
if ($ptr > $lineLength) {
|
|
|
$ptr = $lineLength;
|
|
|
@@ -173,6 +454,7 @@ class Zend_Mime
|
|
|
|
|
|
$out = rtrim($out, $lineEnd);
|
|
|
$out = rtrim($out, '=');
|
|
|
+
|
|
|
return $out;
|
|
|
}
|
|
|
|
|
|
@@ -187,6 +469,7 @@ class Zend_Mime
|
|
|
$str = str_replace('=', '=3D', $str);
|
|
|
$str = str_replace(self::$qpKeys, self::$qpReplaceValues, $str);
|
|
|
$str = rtrim($str);
|
|
|
+
|
|
|
return $str;
|
|
|
}
|
|
|
|
|
|
@@ -202,51 +485,54 @@ class Zend_Mime
|
|
|
* @param string $lineEnd Line end; defaults to {@link LINEEND}
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function encodeQuotedPrintableHeader($str, $charset,
|
|
|
- $lineLength = self::LINELENGTH,
|
|
|
- $lineEnd = self::LINEEND)
|
|
|
+ public static function encodeQuotedPrintableHeader(
|
|
|
+ $str, $charset, $lineLength = self::LINELENGTH, $lineEnd = self::LINEEND
|
|
|
+ )
|
|
|
{
|
|
|
// Reduce line-length by the length of the required delimiter, charsets and encoding
|
|
|
- $prefix = sprintf('=?%s?Q?', $charset);
|
|
|
- $lineLength = $lineLength-strlen($prefix)-3;
|
|
|
+ $prefix = sprintf('=?%s?Q?', $charset);
|
|
|
+ $lineLength = $lineLength - strlen($prefix) - 3;
|
|
|
|
|
|
$str = self::_encodeQuotedPrintable($str);
|
|
|
|
|
|
// Mail-Header required chars have to be encoded also:
|
|
|
- $str = str_replace(array('?', ' ', '_', ','), array('=3F', '=20', '=5F', '=2C'), $str);
|
|
|
+ $str = str_replace(
|
|
|
+ array('?', ' ', '_', ','), array('=3F', '=20', '=5F', '=2C'), $str
|
|
|
+ );
|
|
|
|
|
|
// initialize first line, we need it anyways
|
|
|
$lines = array(0 => "");
|
|
|
|
|
|
// Split encoded text into separate lines
|
|
|
$tmp = "";
|
|
|
- while(strlen($str) > 0) {
|
|
|
- $currentLine = max(count($lines)-1, 0);
|
|
|
+ while (strlen($str) > 0) {
|
|
|
+ $currentLine = max(count($lines) - 1, 0);
|
|
|
$token = self::getNextQuotedPrintableToken($str);
|
|
|
$str = substr($str, strlen($token));
|
|
|
|
|
|
$tmp .= $token;
|
|
|
- if($token == '=20') {
|
|
|
+ if ($token == '=20') {
|
|
|
// only if we have a single char token or space, we can append the
|
|
|
// tempstring it to the current line or start a new line if necessary.
|
|
|
- if(strlen($lines[$currentLine].$tmp) > $lineLength) {
|
|
|
- $lines[$currentLine+1] = $tmp;
|
|
|
+ if (strlen($lines[$currentLine] . $tmp) > $lineLength) {
|
|
|
+ $lines[$currentLine + 1] = $tmp;
|
|
|
} else {
|
|
|
$lines[$currentLine] .= $tmp;
|
|
|
}
|
|
|
$tmp = "";
|
|
|
}
|
|
|
// don't forget to append the rest to the last line
|
|
|
- if(strlen($str) == 0) {
|
|
|
+ if (strlen($str) == 0) {
|
|
|
$lines[$currentLine] .= $tmp;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// assemble the lines together by pre- and appending delimiters, charset, encoding.
|
|
|
- for($i = 0; $i < count($lines); $i++) {
|
|
|
- $lines[$i] = " ".$prefix.$lines[$i]."?=";
|
|
|
+ for ($i = 0; $i < count($lines); $i++) {
|
|
|
+ $lines[$i] = " " . $prefix . $lines[$i] . "?=";
|
|
|
}
|
|
|
$str = trim(implode($lineEnd, $lines));
|
|
|
+
|
|
|
return $str;
|
|
|
}
|
|
|
|
|
|
@@ -258,11 +544,12 @@ class Zend_Mime
|
|
|
*/
|
|
|
private static function getNextQuotedPrintableToken($str)
|
|
|
{
|
|
|
- if(substr($str, 0, 1) == "=") {
|
|
|
+ if (substr($str, 0, 1) == "=") {
|
|
|
$token = substr($str, 0, 3);
|
|
|
} else {
|
|
|
$token = substr($str, 0, 1);
|
|
|
}
|
|
|
+
|
|
|
return $token;
|
|
|
}
|
|
|
|
|
|
@@ -275,18 +562,20 @@ class Zend_Mime
|
|
|
* @param string $lineEnd Line end; defaults to {@link LINEEND}
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function encodeBase64Header($str,
|
|
|
- $charset,
|
|
|
- $lineLength = self::LINELENGTH,
|
|
|
- $lineEnd = self::LINEEND)
|
|
|
+ public static function encodeBase64Header(
|
|
|
+ $str, $charset, $lineLength = self::LINELENGTH, $lineEnd = self::LINEEND
|
|
|
+ )
|
|
|
{
|
|
|
- $prefix = '=?' . $charset . '?B?';
|
|
|
- $suffix = '?=';
|
|
|
+ $prefix = '=?' . $charset . '?B?';
|
|
|
+ $suffix = '?=';
|
|
|
$remainingLength = $lineLength - strlen($prefix) - strlen($suffix);
|
|
|
|
|
|
$encodedValue = self::encodeBase64($str, $remainingLength, $lineEnd);
|
|
|
- $encodedValue = str_replace($lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue);
|
|
|
+ $encodedValue = str_replace(
|
|
|
+ $lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue
|
|
|
+ );
|
|
|
$encodedValue = $prefix . $encodedValue . $suffix;
|
|
|
+
|
|
|
return $encodedValue;
|
|
|
}
|
|
|
|
|
|
@@ -299,9 +588,9 @@ class Zend_Mime
|
|
|
* @param string $lineEnd Line end; defaults to {@link LINEEND}
|
|
|
* @return string
|
|
|
*/
|
|
|
- public static function encodeBase64($str,
|
|
|
- $lineLength = self::LINELENGTH,
|
|
|
- $lineEnd = self::LINEEND)
|
|
|
+ public static function encodeBase64(
|
|
|
+ $str, $lineLength = self::LINELENGTH, $lineEnd = self::LINEEND
|
|
|
+ )
|
|
|
{
|
|
|
return rtrim(chunk_split(base64_encode($str), $lineLength, $lineEnd));
|
|
|
}
|
Frank Brückner