githubFork/roundcubemail.git

			@@ -63,60 +63,24 @@
			* Parse the given raw message source and return a structure
			* of rcube_message_part objects.
			*
			* It makes use of the PEAR:Mail_mimeDecode library
			* It makes use of the rcube_mime_decode library
			*
			* @param string The message source
			* @param string $raw_body The message source
			*
			* @return object rcube_message_part The message structure
			*/
			public static function parse_message($raw_body)
			{
			$mime = new Mail_mimeDecode($raw_body);
			$struct = $mime->decode(array('include_bodies' => true, 'decode_bodies' => true));
			return self::structure_part($struct);
			}
			$conf = array(
			'include_bodies' => true,
			'decode_bodies' => true,
			'decode_headers' => false,
			'default_charset' => self::get_charset(),
			);

			$mime = new rcube_mime_decode($conf);

			/**
			* Recursive method to convert a Mail_mimeDecode part into a rcube_message_part object
			*
			* @param object A message part struct
			* @param int Part count
			* @param string Parent MIME ID
			*
			* @return object rcube_message_part
			*/
			private static function structure_part($part, $count=0, $parent='')
			{
			$struct = new rcube_message_part;
			$struct->mime_id = $part->mime_id ? $part->mime_id : (empty($parent) ? (string)$count : "$parent.$count");
			$struct->headers = $part->headers;
			$struct->ctype_primary = $part->ctype_primary;
			$struct->ctype_secondary = $part->ctype_secondary;
			$struct->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
			$struct->ctype_parameters = $part->ctype_parameters;

			if ($part->headers['content-transfer-encoding'])
			$struct->encoding = $part->headers['content-transfer-encoding'];
			if ($part->ctype_parameters['charset'])
			$struct->charset = $part->ctype_parameters['charset'];

			$part_charset = $struct->charset ? $struct->charset : self::get_charset();

			// determine filename
			if (($filename = $part->d_parameters['filename']) \|\| ($filename = $part->ctype_parameters['name'])) {
			$struct->filename = rcube_mime::decode_mime_string($filename, $part_charset);
			}

			// copy part body and convert it to UTF-8 if necessary
			$struct->body = $part->ctype_primary == 'text' \|\| !$part->ctype_parameters['charset'] ? rcube_charset::convert($part->body, $part_charset) : $part->body;
			$struct->size = strlen($part->body);
			$struct->disposition = $part->disposition;

			foreach ((array)$part->parts as $child_part) {
			$struct->parts[] = self::structure_part($child_part, ++$count, $struct->mime_id);
			}

			return $struct;
			return $mime->decode($raw_body);
			}


			@@ -366,6 +330,9 @@
			$address = 'MAILER-DAEMON';
			$name = substr($val, 0, -strlen($m[1]));
			}
			else if (preg_match('/('.$email_rx.')/', $val, $m)) {
			$name = $m[1];
			}
			else {
			$name = $val;
			}
			@@ -378,14 +345,20 @@
			}
			if ($decode) {
			$name = self::decode_header($name, $fallback);
			// some clients encode addressee name with quotes around it
			if ($name[0] == '"' && $name[strlen($name)-1] == '"') {
			$name = substr($name, 1, -1);
			}
			}
			}

			if (!$address && $name) {
			$address = $name;
			$name = '';
			}

			if ($address) {
			$address = self::fix_email($address);
			$result[$key] = array('name' => $name, 'address' => $address);
			}
			}
			@@ -514,7 +487,7 @@
			// remove space-stuffing
			$line = preg_replace('/^\s/', '', $line);

			if (isset($text[$last]) && $line
			if (isset($text[$last]) && $line && !$q_level
			&& $text[$last] != '-- '
			&& $text[$last][strlen($text[$last])-1] == ' '
			) {
			@@ -587,23 +560,20 @@
			*/
			public static function wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null, $wrap_quoted=true)
			{
			if (!$charset) {
			$charset = RCUBE_CHARSET;
			}
			// Note: Never try to use iconv instead of mbstring functions here
			// Iconv's substr/strlen are 100x slower (#1489113)

			// detect available functions
			$strlen_func = function_exists('iconv_strlen') ? 'iconv_strlen' : 'mb_strlen';
			$strpos_func = function_exists('iconv_strpos') ? 'iconv_strpos' : 'mb_strpos';
			$strrpos_func = function_exists('iconv_strrpos') ? 'iconv_strrpos' : 'mb_strrpos';
			$substr_func = function_exists('iconv_substr') ? 'iconv_substr' : 'mb_substr';
			if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
			mb_internal_encoding($charset);
			}

			// Convert \r\n to \n, this is our line-separator
			$string = str_replace("\r\n", "\n", $string);
			$separator = "\n"; // must be 1 character length
			$result = array();

			while (($stringLength = $strlen_func($string, $charset)) > 0) {
			$breakPos = $strpos_func($string, $separator, 0, $charset);
			while (($stringLength = mb_strlen($string)) > 0) {
			$breakPos = mb_strpos($string, $separator, 0);

			// quoted line (do not wrap)
			if ($wrap_quoted && $string[0] == '>') {
			@@ -612,7 +582,7 @@
			$cutLength = null;
			}
			else {
			$subString = $substr_func($string, 0, $breakPos, $charset);
			$subString = mb_substr($string, 0, $breakPos);
			$cutLength = $breakPos + 1;
			}
			}
			@@ -623,59 +593,54 @@
			$cutLength = null;
			}
			else {
			$subString = $substr_func($string, 0, $breakPos, $charset);
			$subString = mb_substr($string, 0, $breakPos);
			$cutLength = $breakPos + 1;
			}
			}
			else {
			$subString = $substr_func($string, 0, $width, $charset);
			$subString = mb_substr($string, 0, $width);

			// last line
			if ($breakPos === false && $subString === $string) {
			$cutLength = null;
			}
			else {
			$nextChar = $substr_func($string, $width, 1, $charset);
			$nextChar = mb_substr($string, $width, 1);

			if ($nextChar === ' ' \|\| $nextChar === $separator) {
			$afterNextChar = $substr_func($string, $width + 1, 1, $charset);
			$afterNextChar = mb_substr($string, $width + 1, 1);

			if ($afterNextChar === false) {
			// Note: mb_substr() does never return False
			if ($afterNextChar === false \|\| $afterNextChar === '') {
			$subString .= $nextChar;
			}

			$cutLength = $strlen_func($subString, $charset) + 1;
			$cutLength = mb_strlen($subString) + 1;
			}
			else {
			if ($strrpos_func[0] == 'm') {
			$spacePos = $strrpos_func($subString, ' ', 0, $charset);
			}
			else {
			$spacePos = $strrpos_func($subString, ' ', $charset);
			}
			$spacePos = mb_strrpos($subString, ' ', 0);

			if ($spacePos !== false) {
			$subString = $substr_func($subString, 0, $spacePos, $charset);
			$subString = mb_substr($subString, 0, $spacePos);
			$cutLength = $spacePos + 1;
			}
			else if ($cut === false && $breakPos === false) {
			$subString = $string;
			$cutLength = null;
			}
			else if ($cut === false) {
			$spacePos = $strpos_func($string, ' ', 0, $charset);
			$spacePos = mb_strpos($string, ' ', 0);

			if ($spacePos !== false && $spacePos < $breakPos) {
			$subString = $substr_func($string, 0, $spacePos, $charset);
			if ($spacePos !== false && ($breakPos === false \|\| $spacePos < $breakPos)) {
			$subString = mb_substr($string, 0, $spacePos);
			$cutLength = $spacePos + 1;
			}
			else if ($breakPos === false) {
			$subString = $string;
			$cutLength = null;
			}
			else {
			$subString = $substr_func($string, 0, $breakPos, $charset);
			$subString = mb_substr($string, 0, $breakPos);
			$cutLength = $breakPos + 1;
			}
			}
			else {
			$subString = $substr_func($subString, 0, $width, $charset);
			$cutLength = $width;
			}
			}
			@@ -685,11 +650,15 @@
			$result[] = $subString;

			if ($cutLength !== null) {
			$string = $substr_func($string, $cutLength, ($stringLength - $cutLength), $charset);
			$string = mb_substr($string, $cutLength, ($stringLength - $cutLength));
			}
			else {
			break;
			}
			}

			if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
			mb_internal_encoding(RCUBE_CHARSET);
			}

			return implode($break, $result);
			@@ -712,12 +681,20 @@
			*/
			public static function file_content_type($path, $name, $failover = 'application/octet-stream', $is_stream = false, $skip_suffix = false)
			{
			static $mime_ext = array();

			$mime_type = null;
			$mime_magic = rcube::get_instance()->config->get('mime_magic');
			$mime_ext = $skip_suffix ? null : @include(RCUBE_CONFIG_DIR . '/mimetypes.php');
			$config = rcube::get_instance()->config;
			$mime_magic = $config->get('mime_magic');

			if (!$skip_suffix && empty($mime_ext)) {
			foreach ($config->resolve_paths('mimetypes.php') as $fpath) {
			$mime_ext = array_merge($mime_ext, (array) @include($fpath));
			}
			}

			// use file name suffix with hard-coded mime-type map
			if (is_array($mime_ext) && $name) {
			if (!$skip_suffix && is_array($mime_ext) && $name) {
			if ($suffix = substr($name, strrpos($name, '.')+1)) {
			$mime_type = $mime_ext[strtolower($suffix)];
			}
			@@ -806,7 +783,7 @@
			}

			$mime_types = $mime_extensions = array();
			$regex = "/([\w\+\-\.\/]+)\t+([\w\s]+)/i";
			$regex = "/([\w\+\-\.\/]+)\s+([\w\s]+)/i";
			foreach((array)$lines as $line) {
			// skip comments or mime types w/o any extensions
			if ($line[0] == '#' \|\| !preg_match($regex, $line, $matches))
			@@ -822,7 +799,9 @@

			// fallback to some well-known types most important for daily emails
			if (empty($mime_types)) {
			$mime_extensions = (array) @include(RCUBE_CONFIG_DIR . '/mimetypes.php');
			foreach (rcube::get_instance()->config->resolve_paths('mimetypes.php') as $fpath) {
			$mime_extensions = array_merge($mime_extensions, (array) @include($fpath));
			}

			foreach ($mime_extensions as $ext => $mime) {
			$mime_types[$mime][] = $ext;
			@@ -875,4 +854,19 @@
			return 'image/' . $type;
			}

			/**
			* Try to fix invalid email addresses
			*/
			public static function fix_email($email)
			{
			$parts = rcube_utils::explode_quoted_string('@', $email);
			foreach ($parts as $idx => $part) {
			// remove redundant quoting (#1490040)
			if ($part[0] == '"' && preg_match('/^"([a-zA-Z0-9._+=-]+)"$/', $part, $m)) {
			$parts[$idx] = $m[1];
			}
			}

			return implode('@', $parts);
			}
			}