From 5515dbb9707571209515643464fb6267199fb523 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 18 Apr 2014 11:04:03 +0200
Subject: Remove IE<7 specific code

---
 plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php | 9 ++++-----
 program/steps/mail/get.inc                               | 4 +---
 program/steps/mail/viewsource.inc                        | 4 +---
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index a1bcc86ca..4b57f760d 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -352,14 +352,13 @@ class rcube_sieve_engine
                 header("Content-Type: application/octet-stream");
                 header("Content-Length: ".strlen($script));
 
-                if ($browser->ie)
+                if ($browser->ie) {
                     header("Content-Type: application/force-download");
-                if ($browser->ie && $browser->ver < 7)
-                    $filename = rawurlencode(abbreviate_string($script_name, 55));
-                else if ($browser->ie)
                     $filename = rawurlencode($script_name);
-                else
+                }
+                else {
                     $filename = addcslashes($script_name, '\\"');
+                }
 
                 header("Content-Disposition: attachment; filename=\"$filename.txt\"");
                 echo $script;
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 8f869c67c..c6262097f 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -293,9 +293,7 @@ else if (strlen($part_id)) {
 
             $filename = rcmail_attachment_name($part);
 
-            if ($browser->ie && $browser->ver < 7)
-                $filename = rawurlencode(abbreviate_string($filename, 55));
-            else if ($browser->ie)
+            if ($browser->ie)
                 $filename = rawurlencode($filename);
             else
                 $filename = addcslashes($filename, '"');
diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc
index 0328d9600..f988f679a 100644
--- a/program/steps/mail/viewsource.inc
+++ b/program/steps/mail/viewsource.inc
@@ -33,9 +33,7 @@ if ($uid = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET)) {
         $filename = ($subject ? $subject : $RCMAIL->config->get('product_name', 'email')) . '.eml';
         $browser  = $RCMAIL->output->browser;
 
-        if ($browser->ie && $browser->ver < 7)
-            $filename = rawurlencode(abbreviate_string($filename, 55));
-        else if ($browser->ie)
+        if ($browser->ie)
             $filename = rawurlencode($filename);
         else
             $filename = addcslashes($filename, '"');
-- 
cgit v1.2.3