summaryrefslogtreecommitdiff
path: root/program/steps/mail/move_del.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-03-25 16:29:02 +0000
committeralecpl <alec@alec.pl>2010-03-25 16:29:02 +0000
commitfb7ec576ab3a353b6eb99614e9636a9096462807 (patch)
tree9397ede61815ac232bedddc728a973e1b67f0c11 /program/steps/mail/move_del.inc
parent5ffceb790602cb00f92acd8f275fe8246cb36222 (diff)
- Added possibility to select all messages in a folder (#1484756)
Diffstat (limited to 'program/steps/mail/move_del.inc')
-rw-r--r--program/steps/mail/move_del.inc12
1 files changed, 6 insertions, 6 deletions
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'];