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/func.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'program/steps/mail/func.inc') 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); } -- cgit v1.2.3