- Add missing confirmation/error messages on contact/group/message actions (#1486845)

- Add 'loading' message on message move/copy/delete/mark actions

5 files changed, 19 insertions, 5 deletions

diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index b42ef392f..ba5fa723c 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -34,13 +34,16 @@ if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
 
     $copied = $IMAP->copy_message($uids, $target, $mbox);
-  
+
     if (!$copied) {
         // send error message
         $OUTPUT->show_message('errorcopying', 'error');
         $OUTPUT->send();
         exit;
     }
+    else {
+        $OUTPUT->show_message('messagecopied', 'confirmation');
+    }
 
     rcmail_send_unread_count($target, true);
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 629e68bfd..11df12845 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -131,7 +131,8 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
 
   if (!$OUTPUT->ajax_call)
     $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
-      'movingmessage', 'copyingmessage', 'copy', 'move', 'quota');
+      'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
+      'copy', 'move', 'quota');
 
   $OUTPUT->set_pagetitle(rcmail_localize_foldername($mbox_name));
 }
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index 57eae64e2..467548161 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -51,6 +51,9 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
     $OUTPUT->send();
     exit;
   }
+  else {
+    $OUTPUT->show_message('messagemarked', 'confirmation');
+  }
 
   if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
     $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 5078fb02c..4f52a60ca 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -43,6 +43,9 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe
         $OUTPUT->send();
         exit;
     }
+    else {
+      $OUTPUT->show_message('messagemoved', 'confirmation');
+    }
 
     $addrows = true;
 }
@@ -52,7 +55,7 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
 
     $del = $IMAP->delete_message($uids, $mbox);
-  
+
     if (!$del) {
         // send error message
 	    if ($_POST['_from'] != 'show')
@@ -61,7 +64,10 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
         $OUTPUT->send();
         exit;
     }
-    
+    else {
+      $OUTPUT->show_message('messagedeleted', 'confirmation');
+    }
+
     $addrows = true;
 }
 // unknown action or missing query param
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index a5df3475d..13b7ed650 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -66,7 +66,8 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
     $OUTPUT->set_env('list_post', true);
 
   if (!$OUTPUT->ajax_call)
-    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
+      'movingmessage', 'deletingmessage');
 
   // check for unset disposition notification
   if ($MESSAGE->headers->mdn_to &&