From 2dbc2d787a7d9acf85ac8b048d6a8a6c479ab428 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 20 Jun 2009 02:55:17 -0400
Subject: [PATCH] - typo (#1485933)
---
program/lib/Mail/mimePart.php | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 212 insertions(+), 24 deletions(-)
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index 04c4a97..c478c82 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -135,10 +135,13 @@
define('MAIL_MIMEPART_CRLF', defined('MAIL_MIME_CRLF') ? MAIL_MIME_CRLF : "\r\n", TRUE);
}
+ $contentType = array();
+ $contentDisp = array();
foreach ($params as $key => $value) {
switch ($key) {
case 'content_type':
- $headers['Content-Type'] = $value . (isset($charset) ? '; charset="' . $charset . '"' : '');
+ $contentType['type'] = $value;
+ //$headers['Content-Type'] = $value . (isset($charset) ? '; charset="' . $charset . '"' : '');
break;
case 'encoding':
@@ -151,15 +154,12 @@
break;
case 'disposition':
- $headers['Content-Disposition'] = $value . (isset($dfilename) ? '; filename="' . $dfilename . '"' : '');
+ $contentDisp['disp'] = $value;
break;
case 'dfilename':
- if (isset($headers['Content-Disposition'])) {
- $headers['Content-Disposition'] .= '; filename="' . $value . '"';
- } else {
- $dfilename = $value;
- }
+ $contentDisp['filename'] = $value;
+ $contentType['name'] = $value;
break;
case 'description':
@@ -167,12 +167,47 @@
break;
case 'charset':
- if (isset($headers['Content-Type'])) {
- $headers['Content-Type'] .= '; charset="' . $value . '"';
- } else {
- $charset = $value;
- }
+ $contentType['charset'] = $value;
+ $contentDisp['charset'] = $value;
break;
+
+ case 'language':
+ $contentType['language'] = $value;
+ $contentDisp['language'] = $value;
+ break;
+
+ case 'location':
+ $headers['Content-Location'] = $value;
+ break;
+
+ }
+ }
+
+ if (isset($contentType['type'])) {
+ $headers['Content-Type'] = $contentType['type'];
+ if (isset($contentType['charset'])) {
+ $headers['Content-Type'] .= "; charset={$contentType['charset']}";
+ }
+ if (isset($contentType['name'])) {
+ $headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF;
+ $headers['Content-Type'] .=
+ $this->_buildHeaderParam('name', $contentType['name'],
+ isset($contentType['charset']) ? $contentType['charset'] : 'US-ASCII',
+ isset($contentType['language']) ? $contentType['language'] : NULL,
+ isset($params['name-encoding']) ? $params['name-encoding'] : NULL);
+ }
+ }
+
+
+ if (isset($contentDisp['disp'])) {
+ $headers['Content-Disposition'] = $contentDisp['disp'];
+ if (isset($contentDisp['filename'])) {
+ $headers['Content-Disposition'] .= ';' . MAIL_MIMEPART_CRLF;
+ $headers['Content-Disposition'] .=
+ $this->_buildHeaderParam('filename', $contentDisp['filename'],
+ isset($contentDisp['charset']) ? $contentDisp['charset'] : 'US-ASCII',
+ isset($contentDisp['language']) ? $contentDisp['language'] : NULL,
+ isset($params['filename-encoding']) ? $params['filename-encoding'] : NULL);
}
}
@@ -207,8 +242,7 @@
{
$encoded =& $this->_encoded;
- if (!empty($this->_subparts)) {
- srand((double)microtime()*1000000);
+ if (count($this->_subparts)) {
$boundary = '=_' . md5(rand() . microtime());
$this->_headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF . "\t" . 'boundary="' . $boundary . '"';
@@ -219,15 +253,15 @@
foreach ($tmp['headers'] as $key => $value) {
$headers[] = $key . ': ' . $value;
}
- $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'];
+ $subparts[] = implode(MAIL_MIMEPART_CRLF, $headers) . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF . $tmp['body'] . MAIL_MIMEPART_CRLF;
}
- $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF .
- implode('--' . $boundary . MAIL_MIMEPART_CRLF, $subparts) .
- '--' . $boundary.'--' . MAIL_MIMEPART_CRLF . MAIL_MIMEPART_CRLF;
+ $encoded['body'] = '--' . $boundary . MAIL_MIMEPART_CRLF .
+ implode('--' . $boundary . MAIL_MIMEPART_CRLF , $subparts) .
+ '--' . $boundary.'--' . MAIL_MIMEPART_CRLF;
} else {
- $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding) . MAIL_MIMEPART_CRLF;
+ $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
}
// Add headers to $encoded
@@ -306,7 +340,7 @@
$escape = '=';
$output = '';
- while(list(, $line) = each($lines)){
+ while (list(, $line) = each($lines)) {
$line = preg_split('||', $line, -1, PREG_SPLIT_NO_EMPTY);
$linlen = count($line);
@@ -316,17 +350,25 @@
$char = $line[$i];
$dec = ord($char);
- if (($dec == 32) AND ($i == ($linlen - 1))){ // convert space at eol only
+ if (($dec == 32) AND ($i == ($linlen - 1))) { // convert space at eol only
$char = '=20';
- } elseif(($dec == 9) AND ($i == ($linlen - 1))) { // convert tab at eol only
+ } elseif (($dec == 9) AND ($i == ($linlen - 1))) { // convert tab at eol only
$char = '=09';
- } elseif($dec == 9) {
+ } elseif ($dec == 9) {
; // Do nothing if a tab.
- } elseif(($dec == 61) OR ($dec < 32 ) OR ($dec > 126)) {
+ } elseif (($dec == 61) OR ($dec < 32 ) OR ($dec > 126)) {
$char = $escape . strtoupper(sprintf('%02s', dechex($dec)));
+ } elseif (($dec == 46) AND (($newline == '') || ((strlen($newline) + strlen("=2E")) >= $line_max))) {
+ //Bug #9722: convert full-stop at bol,
+ //some Windows servers need this, won't break anything (cipri)
+ //Bug #11731: full-stop at bol also needs to be encoded
+ //if this line would push us over the line_max limit.
+ $char = '=2E';
}
+ //Note, when changing this line, also change the ($dec == 46)
+ //check line, as it mimics this line due to Bug #11731
if ((strlen($newline) + strlen($char)) >= $line_max) { // MAIL_MIMEPART_CRLF is not counted
$output .= $newline . $escape . $eol; // soft line break; " =\r\n" is okay
$newline = '';
@@ -338,4 +380,150 @@
$output = substr($output, 0, -1 * strlen($eol)); // Don't want last crlf
return $output;
}
+
+ /**
+ * _buildHeaderParam()
+ *
+ * Encodes the paramater of a header.
+ *
+ * @param $name The name of the header-parameter
+ * @param $value The value of the paramter
+ * @param $charset The characterset of $value
+ * @param $language The language used in $value
+ * @param $paramEnc Parameter encoding type
+ * @param $maxLength The maximum length of a line. Defauls to 78
+ *
+ * @access private
+ */
+ function _buildHeaderParam($name, $value, $charset=NULL, $language=NULL, $paramEnc=NULL, $maxLength=78)
+ {
+ // RFC 2045:
+ // value needs encoding if contains non-ASCII chars or is longer than 78 chars
+ if (!preg_match('#[^\x20-\x7E]#', $value)) { // ASCII
+ // token
+ if (!preg_match('#([^\x21,\x23-\x27,\x2A,\x2B,\x2D,\x2E,\x30-\x39,\x41-\x5A,\x5E-\x7E])#', $value)) {
+ if (strlen($name) + strlen($value) + 3 <= $maxLength)
+ return " {$name}={$value};";
+ } else { // quoted-string
+ $quoted = addcslashes($value, '\\"');
+ if (strlen($name) + strlen($quoted) + 5 <= $maxLength)
+ return " {$name}=\"{$quoted}\";";
+ }
+ }
+
+ // RFC2047: use quoted-printable/base64 encoding
+ if ($paramEnc == 'quoted-printable' || $paramEnc == 'base64')
+ return $this->_buildRFC2047Param($name, $value, $charset, $paramEnc);
+
+ // RFC2231:
+ $encValue = preg_replace('#([^\x21,\x23,\x24,\x26,\x2B,\x2D,\x2E,\x30-\x39,\x41-\x5A,\x5E-\x7E])#e',
+ '"%" . strtoupper(dechex(ord("\1")))', $value);
+ $value = "$charset'$language'$encValue";
+
+ $header = " {$name}*={$value};";
+ if (strlen($header) <= $maxLength) {
+ return $header;
+ }
+
+ $preLength = strlen(" {$name}*0*=");
+ $maxLength = max(16, $maxLength - $preLength - 3);
+ $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
+
+ $headers = array();
+ $headCount = 0;
+ while ($value) {
+ $matches = array();
+ $found = preg_match($maxLengthReg, $value, $matches);
+ if ($found) {
+ $headers[] = " {$name}*{$headCount}*={$matches[0]}";
+ $value = substr($value, strlen($matches[0]));
+ } else {
+ $headers[] = " {$name}*{$headCount}*={$value}";
+ $value = '';
+ }
+ $headCount++;
+ }
+ $headers = implode(';' . MAIL_MIMEPART_CRLF, $headers) . ';';
+ return $headers;
+ }
+
+ /**
+ * Encodes header parameter as per RFC2047 if needed (values too long will be truncated)
+ *
+ * @param string $name The parameter name
+ * @param string $value The parameter value
+ * @param string $charset The parameter charset
+ * @param string $encoding Encoding type (quoted-printable or base64)
+ * @param int $maxLength Encoded parameter max length (75 is the value specified in the RFC)
+ *
+ * @return string Parameter line
+ * @access private
+ */
+ function _buildRFC2047Param($name, $value, $charset, $encoding='quoted-printable', $maxLength=75)
+ {
+ if (!preg_match('#([^\x20-\x7E]){1}#', $value))
+ {
+ $quoted = addcslashes($value, '\\"');
+ $maxLength = $maxLength - 6;
+ if (strlen($quoted) > $maxLength)
+ {
+ // truncate filename leaving extension
+ $ext = strrchr($quoted, '.');
+ $quoted = substr($quoted, 0, $maxLength - strlen($ext));
+ // remove backslashes from the end of filename
+ preg_replace('/[\\\\]+$/', '', $quoted);
+ $quoted .= $ext;
+ }
+ }
+ else if ($encoding == 'base64')
+ {
+ $ext = strrchr($value, '.');
+ $value = substr($value, 0, strlen($value) - strlen($ext));
+
+ $ext = base64_encode($ext);
+ $value = base64_encode($value);
+
+ $prefix = '=?' . $charset . '?B?';
+ $suffix = '?=';
+ $maxLength = $maxLength - strlen($prefix . $suffix) - strlen($ext) - 2;
+
+ //We can cut base64 every 4 characters, so the real max
+ //we can get must be rounded down.
+ $maxLength = $maxLength - ($maxLength % 4);
+ $quoted = $prefix . substr($value, 0, $maxLength) . $ext . $suffix;
+ }
+ else // quoted-printable
+ {
+ $ext = strrchr($value, '.');
+ $value = substr($value, 0, strlen($value) - strlen($ext));
+
+ // Replace all special characters used by the encoder.
+ $search = array('=', '_', '?', ' ');
+ $replace = array('=3D', '=5F', '=3F', '_');
+ $ext = str_replace($search, $replace, $ext);
+ $value = str_replace($search, $replace, $value);
+
+ // Replace all extended characters (\x80-xFF) with their
+ // ASCII values.
+ $ext = preg_replace('/([\x80-\xFF])/e',
+ '"=" . strtoupper(dechex(ord("\1")))', $ext);
+ $value = preg_replace('/([\x80-\xFF])/e',
+ '"=" . strtoupper(dechex(ord("\1")))', $value);
+
+ $prefix = '=?' . $charset . '?Q?';
+ $suffix = '?=';
+
+ $maxLength = $maxLength - strlen($prefix . $suffix) - strlen($ext) - 2;
+
+ // Truncate QP-encoded text at $maxLength
+ // but not break any encoded letters.
+ if(preg_match("/^(.{0,$maxLength}[^\=][^\=])/", $value, $matches))
+ $value = $matches[1];
+
+ $quoted = $prefix . $value . $ext . $suffix;
+ }
+
+ return " {$name}=\"{$quoted}\"; ";
+ }
+
} // End of class
--
Gitblit v1.9.1