From 7e3298753a9f93405ef44b46ba4db4ca98553b51 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 14 Nov 2015 04:08:07 -0500
Subject: [PATCH] Use ternary operator where aplicable
---
program/lib/Roundcube/rcube_mime.php | 81 +++++++++++-----------------------------
1 files changed, 22 insertions(+), 59 deletions(-)
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 3f2fcc3..56406b1 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2014, The Roundcube Dev Team |
@@ -61,61 +61,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(),
+ );
- /**
- * 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 ?: (empty($parent) ? (string)$count : "$parent.$count");
- $struct->headers = $part->headers;
- $struct->mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
- $struct->ctype_primary = $part->ctype_primary;
- $struct->ctype_secondary = $part->ctype_secondary;
- $struct->ctype_parameters = $part->ctype_parameters;
+ $mime = new rcube_mime_decode($conf);
- 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 ?: 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);
- }
-
- $struct->body = $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);
}
/**
@@ -170,8 +133,8 @@
/**
* Decode a message header value
*
- * @param string $input Header value
- * @param string $fallback Fallback charset if none specified
+ * @param string $input Header value
+ * @param string $fallback Fallback charset if none specified
*
* @return string Decoded string
*/
@@ -192,7 +155,7 @@
*/
public static function decode_mime_string($input, $fallback = null)
{
- $default_charset = !empty($fallback) ? $fallback : self::get_charset();
+ $default_charset = $fallback ?: self::get_charset();
// rfc: all line breaks or other characters not found
// in the Base64 Alphabet must be ignored by decoding software
@@ -327,7 +290,7 @@
}
/**
- * @access private
+ * E-mail address list parser
*/
private static function parse_address_list($str, $decode = true, $fallback = null)
{
@@ -520,7 +483,7 @@
// remove space-stuffing
$line = preg_replace('/^ /', '', $line);
- if (isset($text[$last]) && $line
+ if (isset($text[$last]) && $line && !$q_level
&& $text[$last] != '-- '
&& $text[$last][strlen($text[$last])-1] == ' '
) {
@@ -604,7 +567,7 @@
// Note: Never try to use iconv instead of mbstring functions here
// Iconv's substr/strlen are 100x slower (#1489113)
- if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
+ if ($charset && $charset != RCUBE_CHARSET) {
mb_internal_encoding($charset);
}
@@ -698,7 +661,7 @@
}
}
- if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
+ if ($charset && $charset != RCUBE_CHARSET) {
mb_internal_encoding(RCUBE_CHARSET);
}
@@ -708,9 +671,9 @@
/**
* A method to guess the mime_type of an attachment.
*
- * @param string $path Path to the file or file contents
- * @param string $name File name (with suffix)
- * @param string $failover Mime type supplied for failover
+ * @param string $path Path to the file or file contents
+ * @param string $name File name (with suffix)
+ * @param string $failover Mime type supplied for failover
* @param boolean $is_stream Set to True if $path contains file contents
* @param boolean $skip_suffix Set to True if the config/mimetypes.php mappig should be ignored
*
--
Gitblit v1.9.1