diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2014-03-13 22:58:57 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2014-03-13 23:01:39 +0100 |
| commit | 8d3b27b9e8aff077b15ff33c0e9abaec3cfd9cb2 (patch) | |
| tree | a2eebb08697473f828e1f5e5228de18e8125c6fa /program/steps/mail/import.inc | |
| parent | f4564ae20d3c85b374b1312cb72e794733957968 (diff) | |
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
Diffstat (limited to 'program/steps/mail/import.inc')
| -rw-r--r-- | program/steps/mail/import.inc | 2 |
1 files changed, 0 insertions, 2 deletions
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; } |