- Added possibility to select all messages in a folder (#1484756)

2 files changed, 15 insertions, 15 deletions

diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c37a6e47c..1a2838cd8 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -52,14 +52,14 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
     exit;
   }
 
-  if($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
-    $uids = get_input_value('_ruid', RCUBE_INPUT_POST);
-    $read = $IMAP->set_flag($uids, 'SEEN');
+  if ($flag == 'DELETED' && $CONFIG['read_when_deleted'] && !empty($_POST['_ruid'])) {
+    $ruids = get_input_value('_ruid', RCUBE_INPUT_POST);
+    $read = $IMAP->set_flag($ruids, 'SEEN');
     
     if ($read != -1 && !$CONFIG['skip_deleted'])
-      $OUTPUT->command('flag_deleted_as_read', $uids);
+      $OUTPUT->command('flag_deleted_as_read', $ruids);
   }
-    
+
   if ($flag == 'SEEN' || $flag == 'UNSEEN' || ($flag == 'DELETED' && !$CONFIG['skip_deleted'])) {
     rcmail_send_unread_count($IMAP->get_mailbox_name());
   }
@@ -99,20 +99,20 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
 
       if ($old_unseen != $unseen_count) {
         $OUTPUT->command('set_unread_count', $mbox, $unseen_count, ($mbox == 'INBOX'));
-	$_SESSION['unseen_count'][$mbox] = $unseen_count;
+	    $_SESSION['unseen_count'][$mbox] = $unseen_count;
       }
       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
       if ($IMAP->threading)
-	$count = get_input_value('_count', RCUBE_INPUT_POST);
+	    $count = get_input_value('_count', RCUBE_INPUT_POST);
 
       // add new rows from next page (if any)
-      if ($count && ($jump_back || $nextpage_count > 0)) {
+      if ($count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
         $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
         $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
   
         $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order,
-	  $jump_back ? NULL : $count);
+	    $jump_back ? NULL : $count);
       
         rcmail_js_message_list($a_headers, false, false);
       }
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index f884a781e..f6d8d98ae 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -34,11 +34,11 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_targe
     $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
 
     $moved = $IMAP->move_message($uids, $target, $mbox);
-  
+
     if (!$moved) {
         // send error message
-	if ($_POST['_from'] != 'show')
-          $OUTPUT->command('list_mailbox');
+	    if ($_POST['_from'] != 'show')
+            $OUTPUT->command('list_mailbox');
         $OUTPUT->show_message('errormoving', 'error');
         $OUTPUT->send();
         exit;
@@ -55,8 +55,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
   
     if (!$del) {
         // send error message
-	if ($_POST['_from'] != 'show')
-          $OUTPUT->command('list_mailbox');
+	    if ($_POST['_from'] != 'show')
+            $OUTPUT->command('list_mailbox');
         $OUTPUT->show_message('errordeleting', 'error');
         $OUTPUT->send();
         exit;
@@ -121,7 +121,7 @@ else
     $count = get_input_value('_count', RCUBE_INPUT_POST);
 
   // add new rows from next page (if any)
-  if ($addrows && $count && ($jump_back || $nextpage_count > 0)) {
+  if ($addrows && $count && $uids != '*' && ($jump_back || $nextpage_count > 0)) {
     $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
     $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];