summaryrefslogtreecommitdiff
path: root/plugins/archive
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-10-30 10:02:48 +0100
committerAleksander Machniak <alec@alec.pl>2013-10-30 10:02:48 +0100
commita6cc96a55def228775780b7e0c49eced0a23dc1a (patch)
tree9ceb38af3aeca471b767189dc68c39fc2a9e4d60 /plugins/archive
parent2143a648734fe631bcab8516ca8f08128dd6a735 (diff)
Fix archive button on messages page when using archive_type != '' (#1489404)
Diffstat (limited to 'plugins/archive')
-rw-r--r--plugins/archive/archive.js9
-rw-r--r--plugins/archive/archive.php12
2 files changed, 19 insertions, 2 deletions
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 3500b9fe4..cf44b74d4 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -15,7 +15,14 @@ function rcmail_archive(prop)
}
else {
// let the server sort the messages to the according subfolders
- var post_data = { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
+ var post_data = { _uid: rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox };
+
+ if (rcmail.env.display_next && rcmail.env.next_uid)
+ post_data._next_uid = rcmail.env.next_uid;
+
+ if (rcmail.env.action)
+ post_data._from = rcmail.env.action;
+
rcmail.http_post('plugin.move2archive', post_data);
}
}
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 420f6918b..291ef1370 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -208,7 +208,17 @@ class archive extends rcube_plugin
$rcmail->output->show_message($this->gettext('archived'), 'confirmation');
}
- $rcmail->output->command('plugin.move2archive_response', $result);
+ if ($_POST['_from'] == 'show' && !empty($result['update'])) {
+ if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) {
+ $rcmail->output->command('show_message', $next);
+ }
+ else {
+ $rcmail->output->command('command', 'list');
+ }
+ }
+ else {
+ $rcmail->output->command('plugin.move2archive_response', $result);
+ }
}
/**