From d04d202234b0ba1e65b1c581acf0cbe715120dd7 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 22 Nov 2006 06:49:30 -0500
Subject: [PATCH] Remove newlines from mail headers (#1484031)
---
program/include/rcube_imap.inc | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 05de677..fafef67 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -1010,10 +1010,11 @@
// get part size
if (!empty($part[6]) && $part[6]!='NIL')
$struct->size = intval($part[6]);
-
+
// read part disposition
$di = count($part) - 2;
- if (is_array($part[$di]))
+ if ((is_array($part[$di]) && count($part[$di]) == 2 && is_array($part[$di][1])) ||
+ (is_array($part[--$di]) && count($part[$di]) == 2))
{
$struct->disposition = strtolower($part[$di][0]);
@@ -1463,7 +1464,7 @@
function get_quota()
{
if ($this->get_capability('QUOTA'))
- return array('total' => 2048 * 1024, 'used' => 500 * 1024, 'percent' => 32); //iil_C_GetQuota($this->conn);
+ return iil_C_GetQuota($this->conn);
return FALSE;
}
@@ -2376,7 +2377,8 @@
function _parse_address_list($str)
{
- $a = $this->_explode_quoted_string(',', $str);
+ // remove any newlines and carriage returns before
+ $a = $this->_explode_quoted_string(',', preg_replace( "/[\r\n]/", " ", $str));
$result = array();
foreach ($a as $key => $val)
--
Gitblit v1.9.1