Merged branch devel-addressbook from r443 back to trunk

1 files changed, 22 insertions, 27 deletions

diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 8d31e3aa5..fb8a0af4c 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/move_del.inc                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -19,46 +19,42 @@
 
 */
 
-$REMOTE_REQUEST = TRUE;
-
 // move messages
 if ($_action=='moveto' && !empty($_GET['_uid']) && !empty($_GET['_target_mbox']))
-  {
+{
   $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_GET))));
   $target = get_input_value('_target_mbox', RCUBE_INPUT_GET);
   $moved = $IMAP->move_message($uids, $target, get_input_value('_mbox', RCUBE_INPUT_GET));
   
   if (!$moved)
-    {
+  {
     // send error message
-    $commands = "this.list_mailbox();\n";
-    $commands .= show_message('errormoving', 'error');
-    rcube_remote_response($commands);
+    $OUTPUT->command('list_mailbox');
+    $OUTPUT->show_message('errormoving', 'error');
+    $OUTPUT->send();
     exit;
-    }
   }
+}
 
 // delete messages 
 else if ($_action=='delete' && !empty($_GET['_uid']))
-  {
+{
   $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_GET))));
   $del = $IMAP->delete_message($uids, get_input_value('_mbox', RCUBE_INPUT_GET));
   
   if (!$del)
-    {
+  {
     // send error message
-    $commands = "this.list_mailbox();\n";
-    $commands .= show_message('errordeleting', 'error');
-    rcube_remote_response($commands);
+    $OUTPUT->command('list_mailbox');
+    $OUTPUT->show_message('errordeleting', 'error');
+    $OUTPUT->send();
     exit;
-    }
   }
+}
   
 // unknown action or missing query param
 else
-  {
   exit;
-  }
 
 // refresh saved seach set after moving some messages
 if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set)
@@ -68,34 +64,33 @@ if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->se
 // update message count display
 $msg_count = $IMAP->messagecount();
 $pages = ceil($msg_count / $IMAP->page_size);
-$commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text($msg_count));
-$commands .= sprintf("this.set_env('pagecount', %d);\n", $pages);
+$OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
 
 
 // update mailboxlist
 $mbox = $IMAP->get_mailbox_name();
-$commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
+$OUTPUT->command('set_unread_count', $mbox, $IMAP->messagecount($mbox, 'UNSEEN'));
 
 if ($_action=='moveto' && $target)
-  $commands .= sprintf("this.set_unread_count('%s', %d);\n", $target, $IMAP->messagecount($target, 'UNSEEN'));
+  $OUTPUT->command('set_unread_count', $target, $IMAP->messagecount($target, 'UNSEEN'));
 
-$commands .= sprintf("this.set_quota('%s');\n", $IMAP->get_quota()); 
+$OUTPUT->command('set_quota', $IMAP->get_quota());
 
 // add new rows from next page (if any)
 if ($_GET['_from']!='show' && $pages>1 && $IMAP->list_page < $pages)
-  {
+{
   $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);
   $a_headers = array_slice($a_headers, -$count, $count);
 
-  $commands .= rcmail_js_message_list($a_headers);
-  }
+  rcmail_js_message_list($a_headers);
+}
 
 
 // send response
-rcube_remote_response($commands);
+$OUTPUT->send();
 
-exit;
 ?>