From a36369c3831b26191023b3e2d5d7cd0e5eee6cdb Mon Sep 17 00:00:00 2001 From: Thomas Bruederli 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/import.inc | 2 -- 1 file changed, 2 deletions(-) (limited to 'program/steps/mail/import.inc') 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