From 8d3b27b9e8aff077b15ff33c0e9abaec3cfd9cb2 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 13 Mar 2014 22:58:57 +0100
Subject: Fix message import dialog (#1489685): - Display alert if no file is
 chosen - Unlock the UI if form is not submitted - Avoid duplicate error
 messages - Fix javascript error due to missing attachments list widget

---
 program/steps/mail/func.inc   | 3 ++-
 program/steps/mail/import.inc | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index aa41d6a0b..072ee716c 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -124,7 +124,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
     if (!$OUTPUT->ajax_call) {
         $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
             'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
-            'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
+            'copy', 'move', 'quota', 'replyall', 'replylist');
     }
 
     $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
@@ -2070,6 +2070,7 @@ function rcmail_message_import_form($attrib = array())
         $content);
 
     $RCMAIL->output->add_gui_object('importform', $attrib['id'].'Frm');
+    $RCMAIL->output->add_label('selectimportfile','importwait');
 
     return html::div($attrib, $out);
 }
diff --git a/program/steps/mail/import.inc b/program/steps/mail/import.inc
index 4f822e0e4..5a74feb9f 100644
--- a/program/steps/mail/import.inc
+++ b/program/steps/mail/import.inc
@@ -34,7 +34,6 @@ if (is_array($_FILES['_file'])) {
             list($mtype_primary,) = explode('/', rcube_mime::file_content_type($filepath, $_FILES['_file']['name'][$i], $_FILES['_file']['type'][$i]));
 
             if (!in_array($mtype_primary, array('text','message'))) {
-                $OUTPUT->show_message('importmessageerror', 'error');
                 continue;
             }
 
@@ -46,7 +45,6 @@ if (is_array($_FILES['_file'])) {
             while ($line !== false && trim($line) == '');
 
             if (!preg_match('/^From\s+-/', $line) && !preg_match('/^[a-z-_]+:\s+.+/i', $line)) {
-                $OUTPUT->show_message('importmessageerror', 'error');
                 continue;
             }
 
-- 
cgit v1.2.3