From eda23fe6c8ccb91e741db61f6c79e40dbc106cf0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 4 Aug 2016 08:57:48 +0200
Subject: [PATCH] Remove hacks for old Internet Explorer versions

---
 plugins/managesieve/managesieve.js |  2 +-
 program/steps/mail/get.inc         | 11 +----------
 skins/classic/functions.js         | 17 +++++------------
 skins/classic/splitter.js          |  4 ++--
 skins/larry/ui.js                  |  4 ++--
 5 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 6cb5b3865..a1cb022fc 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -1056,7 +1056,7 @@ rcube_webmail.prototype.managesieve_create = function(force)
   dialog.dialog({
     modal: false,
     resizable: true,
-    closeOnEscape: !bw.ie7,  // disable for performance reasons
+    closeOnEscape: true,
     title: this.get_label('managesieve.newfilter'),
     close: function() { rcmail.managesieve_dialog_close(); },
     buttons: buttons,
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 202ae34fb..c3c4b7ba8 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -271,13 +271,6 @@ if (empty($_GET['_thumb']) && $attachment->is_valid()) {
     $filename    = $browser->ie ? rawurlencode($filename) : addcslashes($filename, '"');
     $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
 
-    // Workaround for nasty IE bug (#1488844)
-    // If Content-Disposition header contains string "attachment" e.g. in filename
-    // IE handles data as attachment not inline
-    if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
-        $filename = str_ireplace('attachment', 'attach', $filename);
-    }
-
     // add filename extension if missing
     if (!pathinfo($filename, PATHINFO_EXTENSION) && ($extensions = rcube_mime::get_mime_extensions($mimetype))) {
         $filename .= '.' . $extensions[0];
@@ -583,9 +576,7 @@ class rcmail_attachment_handler
             return false;
         }
 
-        $rcube   = rcube::get_instance();
-        $browser = $rcube->output->browser;
-        $secure  = stripos($mimetype, 'image/') === false || $this->download;
+        $secure = stripos($mimetype, 'image/') === false || $this->download;
 
         // Remove <script> in SVG images
         if (!$secure && stripos($mimetype, 'image/svg') === 0) {
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 542c542cc..2e793394e 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -479,16 +479,9 @@ switch_preview_pane: function(elem)
   }
   else {
     prev_frm.hide();
-    if (bw.ie7) {
-      var fr = document.getElementById('mailcontframe');
-      fr.style.bottom = 0;
-      fr.style.height = parseInt(fr.parentNode.offsetHeight)+'px';
-    }
-    else {
-      $('#mailcontframe').css({height: 'auto', bottom: 0});
-      if (bw.opera)
-        $('#messagelistcontainer').css({height: 'auto'});
-    }
+    $('#mailcontframe').css({height: 'auto', bottom: 0});
+    if (bw.opera)
+      $('#messagelistcontainer').css({height: 'auto'});
     if (mailviewsplit.layer)
       mailviewsplit.layer.elm.style.display = 'none';
 
@@ -831,8 +824,8 @@ function rcube_render_mailboxlist()
 {
   var list = $('#mailboxlist > li > a, #mailboxlist ul:visible > li > a');
 
-  // it's too slow with really big number of folders, especially on IE
-  if (list.length > (bw.ie && bw.vendver < 9 ? 40 : 100))
+  // it's too slow with really big number of folders
+  if (list.length > 100)
     return;
 
   list.each(function() {
diff --git a/skins/classic/splitter.js b/skins/classic/splitter.js
index 2498c0ba3..4117b2c29 100644
--- a/skins/classic/splitter.js
+++ b/skins/classic/splitter.js
@@ -83,7 +83,7 @@ function rcube_splitter(attrib)
       this.p2.style.top = Math.ceil(this.pos + lh / 2) + 'px';
       this.layer.move(this.layer.x, Math.round(this.pos - lh / 2 + 1));
       if (bw.ie) {
-        var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
+        var new_height = parseInt(this.p2.parentNode.offsetHeight, 10) - parseInt(this.p2.style.top, 10);
         this.p2.style.height = (new_height > 0 ? new_height : 0) + 'px';
       }
     }
@@ -200,7 +200,7 @@ function rcube_splitter(attrib)
   function onResize(e)
   {
     if (me.horizontal) {
-      var new_height = parseInt(me.p2.parentNode.offsetHeight, 10) - parseInt(me.p2.style.top, 10) - (bw.ie8 ? 2 : 0);
+      var new_height = parseInt(me.p2.parentNode.offsetHeight, 10) - parseInt(me.p2.style.top, 10);
       me.p2.style.height = (new_height > 0 ? new_height : 0) +'px';
     }
     else {
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 162f0dabe..3a4622243 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1331,7 +1331,7 @@ function rcube_splitter(p)
       this.p2.css('top', Math.ceil(this.pos + Math.ceil(this.halfsize) + 2) + 'px');
       this.handle.css('top', Math.round(this.pos - this.halfsize + this.offset)+'px');
       if (bw.ie) {
-        var new_height = parseInt(this.parent.outerHeight(), 10) - parseInt(this.p2.css('top'), 10) - (bw.ie8 ? 2 : 0);
+        var new_height = parseInt(this.parent.outerHeight(), 10) - parseInt(this.p2.css('top'), 10);
         this.p2.css('height', (new_height > 0 ? new_height : 0) + 'px');
       }
     }
@@ -1471,7 +1471,7 @@ function rcube_splitter(p)
   function onResize(e)
   {
     if (me.horizontal) {
-      var new_height = parseInt(me.parent.outerHeight(), 10) - parseInt(me.p2[0].style.top, 10) - (bw.ie8 ? 2 : 0);
+      var new_height = parseInt(me.parent.outerHeight(), 10) - parseInt(me.p2[0].style.top, 10);
       me.p2.css('height', (new_height > 0 ? new_height : 0) +'px');
     }
     else {