tweet_live: comparison web/lib/Zend/Mime/Decode.php

equal deleted inserted replaced

-:5a6b6e770365
+:68c69c656a2c
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Mime
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Decode.php 24593 2012-01-05 20:35:02Z matthew $
+* @version    $Id$
 */
 /**
 * @see Zend_Mime
 */
 require_once 'Zend/Mime.php';
 /**
 * @category   Zend
 * @package    Zend_Mime
-* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Mime_Decode
 {
 /**
 {
 // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
 $body = str_replace("\r", '', $body);
 $start = 0;
-$res = array();
+$res   = array();
 // find every mime part limiter and cut out the
 // string before it.
 // the part before the first boundary string is discarded:
 $p = strpos($body, '--' . $boundary . "\n", $start);
 if ($p === false) {
 $start = $p + 3 + strlen($boundary);
 }
 // no more parts, find end boundary
 $p = strpos($body, '--' . $boundary . '--', $start);
-if ($p===false) {
+if ($p === false) {
 throw new Zend_Exception('Not a valid Mime Message: End Missing');
 }
 // the remaining part also needs to be parsed:
-$res[] = substr($body, $start, $p-$start);
+$res[] = substr($body, $start, $p - $start);
 return $res;
 }
 /**
 * decodes a mime encoded String and returns a
 * struct of parts with header and body
 *
 * @param  string $message  raw message content
 * @param  string $boundary boundary as found in content-type
-* @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+* @param  string $EOL      EOL string; defaults to {@link Zend_Mime::LINEEND}
 * @return array|null parts as array('header' => array(name => value), 'body' => content), null if no parts found
 * @throws Zend_Exception
 */
-public static function splitMessageStruct($message, $boundary, $EOL = Zend_Mime::LINEEND)
+public static function splitMessageStruct(
+$message, $boundary, $EOL = Zend_Mime::LINEEND
+)
 {
 $parts = self::splitMime($message, $boundary);
 if (count($parts) <= 0) {
 return null;
 }
 $result = array();
 foreach ($parts as $part) {
 self::splitMessage($part, $headers, $body, $EOL);
-$result[] = array('header' => $headers,
+$result[] = array(
-'body'   => $body    );
+'header' => $headers,
-}
+'body'   => $body
+);
+}
 return $result;
 }
 /**
 * split a message in header and body part, if no header or an
 * The charset of the returned headers depend on your iconv settings.
 *
 * @param  string $message raw message with header and optional content
 * @param  array  $headers output param, array with headers as array(name => value)
 * @param  string $body    output param, content of message
-* @param  string $EOL EOL string; defaults to {@link Zend_Mime::LINEEND}
+* @param  string $EOL     EOL string; defaults to {@link Zend_Mime::LINEEND}
 * @return null
 */
-public static function splitMessage($message, &$headers, &$body, $EOL = Zend_Mime::LINEEND)
+public static function splitMessage(
+$message, &$headers, &$body, $EOL = Zend_Mime::LINEEND
+)
 {
 // check for valid header at first line
 $firstline = strtok($message, "\n");
 if (!preg_match('%^[^\s]+[^:]*:%', $firstline)) {
 $headers = array();
 // TODO: we're ignoring \r for now - is this function fast enough and is it safe to asume noone needs \r?
-$body = str_replace(array("\r", "\n"), array('', $EOL), $message);
+$body = str_replace(
+array(
+"\r",
+"\n"
+), array(
+'',
+$EOL
+), $message
+);
 return;
 }
 // find an empty line between headers and body
 // default is set new line
 if (strpos($message, $EOL . $EOL)) {
 list($headers, $body) = explode($EOL . $EOL, $message, 2);
 // next is the standard new line
-} else if ($EOL != "\r\n" && strpos($message, "\r\n\r\n")) {
-list($headers, $body) = explode("\r\n\r\n", $message, 2);
-// next is the other "standard" new line
-} else if ($EOL != "\n" && strpos($message, "\n\n")) {
-list($headers, $body) = explode("\n\n", $message, 2);
-// at last resort find anything that looks like a new line
 } else {
-@list($headers, $body) = @preg_split("%([\r\n]+)\\1%U", $message, 2);
+if ($EOL != "\r\n" && strpos($message, "\r\n\r\n")) {
-}
+list($headers, $body) = explode("\r\n\r\n", $message, 2);
+// next is the other "standard" new line
-$headers = iconv_mime_decode_headers($headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR);
+} else {
+if ($EOL != "\n" && strpos($message, "\n\n")) {
-if ($headers === false ) {
+list($headers, $body) = explode("\n\n", $message, 2);
+// at last resort find anything that looks like a new line
+} else {
+@list($headers, $body) =
+@preg_split("%([\r\n]+)\\1%U", $message, 2);
+}
+}
+}
+$headers = iconv_mime_decode_headers(
+$headers, ICONV_MIME_DECODE_CONTINUE_ON_ERROR
+);
+if ($headers === false) {
 // an error occurs during the decoding
 return;
 }
 // normalize header names
 }
 if (is_array($headers[$lower])) {
 $headers[$lower][] = $header;
 continue;
 }
-$headers[$lower] = array($headers[$lower], $header);
+$headers[$lower] = array(
+$headers[$lower],
+$header
+);
 }
 }
 /**
 * split a content type in its different parts
 }
 /**
 * split a header field like content type in its different parts
 *
-* @param  string $type       header field
+* @param  string     $field
-* @param  string $wantedPart the wanted part, else an array with all parts is returned
+* @param  string     $wantedPart the wanted part, else an array with all parts is returned
-* @param  string $firstName  key name for the first part
+* @param  int|string $firstName  key name for the first part
+* @throws Zend_Exception
 * @return string|array wanted part or all parts as array($firstName => firstPart, partname => value)
-* @throws Zend_Exception
+*/
-*/
+public static function splitHeaderField(
-public static function splitHeaderField($field, $wantedPart = null, $firstName = 0)
+$field, $wantedPart = null, $firstName = 0
+)
 {
 $wantedPart = strtolower($wantedPart);
-$firstName = strtolower($firstName);
+$firstName  = strtolower($firstName);
 // special case - a bit optimized
 if ($firstName === $wantedPart) {
 $field = strtok($field, ';');
 return $field[0] == '"' ? substr($field, 1, -1) : $field;
 }
 $field = $firstName . '=' . $field;
 if (!preg_match_all('%([^=\s]+)\s*=\s*("[^"]+"|[^;]+)(;\s*|$)%', $field, $matches)) {
 continue;
 }
 if ($matches[2][$key][0] != '"') {
 return $matches[2][$key];
 }
 return substr($matches[2][$key], 1, -1);
 }
 return null;
 }
 $split = array();
 foreach ($matches[1] as $key => $name) {
 /**
 * decode a quoted printable encoded string
 *
 * The charset of the returned string depends on your iconv settings.
 *
-* @param  string encoded string
+* @param  string $string Encoded string
-* @return string decoded string
+* @return string         Decoded string
 */
 public static function decodeQuotedPrintable($string)
 {
 return quoted_printable_decode($string);
 }

changeset 1230	68c69c656a2c
parent 807	877f952ae2bd