diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/js/app.js | 30 | ||||
| -rw-r--r-- | program/localization/en_US/labels.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 10 |
3 files changed, 43 insertions, 1 deletions
diff --git a/program/js/app.js b/program/js/app.js index ae68ea816..6485a98d7 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -141,9 +141,15 @@ function rcube_webmail() { this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'viewsource', 'print', 'load-attachment', true); if (this.env.next_uid) + { this.enable_command('nextmessage', true); + this.enable_command('lastmessage', true); + } if (this.env.prev_uid) + { this.enable_command('previousmessage', true); + this.enable_command('firstmessage', true); + } } if (this.env.action=='show' && this.env.blockedobjects) @@ -478,10 +484,18 @@ function rcube_webmail() this.list_page('next'); break; + case 'lastpage': + this.list_page('last'); + break; + case 'previouspage': this.list_page('prev'); break; + case 'firstpage': + this.list_page('first'); + break; + case 'expunge': if (this.env.messagecount) this.expunge_mailbox(this.env.mailbox); @@ -656,10 +670,20 @@ function rcube_webmail() this.show_message(this.env.next_uid); break; + case 'lastmessage': + if (this.env.last_uid) + this.show_message(this.env.last_uid); + break; + case 'previousmessage': if (this.env.prev_uid) this.show_message(this.env.prev_uid); break; + + case 'firstmessage': + if (this.env.first_uid) + this.show_message(this.env.first_uid); + break; case 'checkmail': this.check_for_recent(); @@ -1095,8 +1119,12 @@ function rcube_webmail() { if (page=='next') page = this.env.current_page+1; + if (page=='last') + page = this.env.pagecount; if (page=='prev' && this.env.current_page>1) page = this.env.current_page-1; + if (page=='first' && this.env.current_page>1) + page = 1; if (page > 0 && page <= this.env.pagecount) { @@ -2634,7 +2662,9 @@ function rcube_webmail() this.set_page_buttons = function() { this.enable_command('nextpage', (this.env.pagecount > this.env.current_page)); + this.enable_command('lastpage', (this.env.pagecount > this.env.current_page)); this.enable_command('previouspage', (this.env.current_page > 1)); + this.enable_command('firstpage', (this.env.current_page > 1)); } diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc index b27c17940..8b183626a 100644 --- a/program/localization/en_US/labels.inc +++ b/program/localization/en_US/labels.inc @@ -98,7 +98,9 @@ $labels['forwardmessage'] = 'Forward the message'; $labels['deletemessage'] = 'Move message to trash'; $labels['printmessage'] = 'Print this message'; $labels['previousmessages'] = 'Show previous set of messages'; +$labels['firstmessages'] = 'Show first set of messages'; $labels['nextmessages'] = 'Show next set of messages'; +$labels['lastmessages'] = 'Show last set of messages'; $labels['backtolist'] = 'Back to message list'; $labels['viewsource'] = 'Show source'; @@ -171,7 +173,9 @@ $labels['print'] = 'Print'; $labels['export'] = 'Export'; $labels['previouspage'] = 'Show previous set'; +$labels['firstpage'] = 'Show first set'; $labels['nextpage'] = 'Show next set'; +$labels['lastpage'] = 'Show last set'; // LDAP search diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 51633fa7b..c8e493756 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -60,7 +60,7 @@ if ($_GET['_uid']) $javascript .= sprintf("%s.set_env('safemode', '%b');", $JS_OBJECT_NAME, $_GET['_safe']); $next = $prev = -1; - // get previous and next message UID + // get previous, first, next and last message UID if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') && $IMAP->get_capability('sort')) { @@ -69,21 +69,29 @@ if ($_GET['_uid']) $MESSAGE['index'] = array_search((string)$MESSAGE['UID'], $a_msg_index, TRUE); $prev = isset($a_msg_index[$MESSAGE['index']-1]) ? $a_msg_index[$MESSAGE['index']-1] : -1 ; + $first = count($a_msg_index)>0 ? $a_msg_index[0] : -1; $next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ; + $last = count($a_msg_index)>0 ? $a_msg_index[count($a_msg_index)-1] : -1; } else { // this assumes that we are sorted by date_DESC $seq = $IMAP->get_id($MESSAGE['UID']); $prev = $IMAP->get_uid($seq + 1); + $first = $IMAP->get_uid($IMAP->messagecount()); $next = $IMAP->get_uid($seq - 1); + $last = $IMAP->get_uid(1); $MESSAGE['index'] = $IMAP->messagecount() - $seq; } if ($prev > 0) $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $prev); + if ($first >0) + $javascript .= sprintf("\n%s.set_env('first_uid', '%s');", $JS_OBJECT_NAME, $first); if ($next > 0) $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $next); + if ($last >0) + $javascript .= sprintf("\n%s.set_env('last_uid', '%s');", $JS_OBJECT_NAME, $last); $OUTPUT->add_script($javascript); } |