banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tabs!

Browse Source
release-0.6
thomascube 15 years ago
parent a366a323b5
commit d5515f64b6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

16
program/steps/mail/mark.inc
Unescape Escape View File

@ -63,9 +63,9 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) { else if ($flag == 'DELETED' && $CONFIG['skip_deleted']) {
if ($_POST['_from'] == 'show') { if ($_POST['_from'] == 'show') {
if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC)) if ($next = get_input_value('_next_uid', RCUBE_INPUT_GPC))
$OUTPUT->command('show_message', $next); $OUTPUT->command('show_message', $next);
else else
$OUTPUT->command('command', 'list'); $OUTPUT->command('command', 'list');
} else { } else {
// refresh saved search set after moving some messages // refresh saved search set after moving some messages
if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) { if (($search_request = get_input_value('_search', RCUBE_INPUT_GPC)) && $IMAP->search_set) {
@ -79,9 +79,9 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
// jump back one page (user removed the whole last page) // jump back one page (user removed the whole last page)
if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) { if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) {
$IMAP->set_page($IMAP->list_page-1); $IMAP->set_page($IMAP->list_page-1);
$_SESSION['page'] = $IMAP->list_page; $_SESSION['page'] = $IMAP->list_page;
$jump_back = true; $jump_back = true;
} }
// update message count display // update message count display
@ -97,10 +97,10 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
// add new rows from next page (if any) // add new rows from next page (if any)
if (($jump_back || $nextpage_count > 0)) { if (($jump_back || $nextpage_count > 0)) {
$sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : $CONFIG['message_sort_col']; $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']; $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
$a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count); $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order, $count);
rcmail_js_message_list($a_headers, false, false); rcmail_js_message_list($a_headers, false, false);
} }

4
program/steps/mail/show.inc
Unescape Escape View File

@ -108,7 +108,7 @@ if ($_GET['_uid']) {
$next = $prev = $first = $last = -1; $next = $prev = $first = $last = -1;
if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] != 'DESC' if ($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] != 'DESC'
&& empty($_REQUEST['_search']) && !$IMAP->skip_deleted) && empty($_REQUEST['_search']) && !$IMAP->skip_deleted)
{ {
// this assumes that we are sorted by date_DESC // this assumes that we are sorted by date_DESC
$cnt = $IMAP->messagecount(); $cnt = $IMAP->messagecount();
@ -145,7 +145,7 @@ if ($_GET['_uid']) {
if (!$MESSAGE->headers->seen) if (!$MESSAGE->headers->seen)
$RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid, $RCMAIL->plugins->exec_hook('message_read', array('uid' => $MESSAGE->uid,
'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE)); 'mailbox' => $IMAP->mailbox, 'message' => $MESSAGE));
} }

Write Preview
Loading…
Cancel
Save