From 6d479a622bfb779e07e7ac7bd12154ec951982e5 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 22 Sep 2009 03:50:32 -0400
Subject: [PATCH] - remove set_magic_quotes_runtime() call, use set_time_limit() with @ (#1486149)
---
program/include/rcube_mail_mime.php | 24 +++---------------------
1 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/program/include/rcube_mail_mime.php b/program/include/rcube_mail_mime.php
index c86be49..ab93d3a 100644
--- a/program/include/rcube_mail_mime.php
+++ b/program/include/rcube_mail_mime.php
@@ -5,7 +5,7 @@
| program/include/rcube_mail_mime.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2007-2008, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2007-2009, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -128,7 +128,7 @@
{
// if header contains e-mail addresses
if (preg_match('/\s<.+@[a-z0-9\-\.]+\.[a-z]+>/U', $hdr_value)) {
- $chunks = $this->_explode_quoted_string(',', $hdr_value);
+ $chunks = rcube_explode_quoted_string(',', $hdr_value);
}
else {
$chunks = array($hdr_value);
@@ -180,31 +180,13 @@
}
}
- $input[$hdr_name] = $hdr_value;
+ $input[$hdr_name] = wordwrap($hdr_value, 990, "\n", true); // hard limit header length
}
return $input;
}
- function _explode_quoted_string($delimiter, $string)
- {
- $result = array();
- $strlen = strlen($string);
- for ($q=$p=$i=0; $i < $strlen; $i++) {
- if ($string{$i} == "\"" && $string{$i-1} != "\\") {
- $q = $q ? false : true;
- }
- else if (!$q && $string{$i} == $delimiter) {
- $result[] = substr($string, $p, $i - $p);
- $p = $i + 1;
- }
- }
-
- $result[] = substr($string, $p);
- return $result;
- }
-
/**
* Provides caching of body of constructed MIME Message to avoid
* duplicate construction of message and damage of MIME headers
--
Gitblit v1.9.1