Dev November 2006

dev@lists.roundcube.net

48 participants
44 discussions

Conditional HTML and preview pane
by Robin Elfrink 20 Nov '07

20 Nov '07

Hi, Another go at a preview pane. I implemented conditional HTML which works like this: <roundcube:if condition="config:preview==true" /> html bla bla <roundcube:else /> other html bla bla <roundcube:endif /> The preview code was mostly Thomas', plus a bit of myself to let the user decide for herself. Code is not yet optimized, so it looks like poo, and I suspect IE6 will have problems, because I delete some CSS which made it look strange in IE7. Robin Index: config/main.inc.php.dist =================================================================== --- config/main.inc.php.dist (revision 380) +++ config/main.inc.php.dist (working copy) @@ -228,5 +228,11 @@ // save compose message every 300 seconds (5min) $rcmail_config['draft_autosave'] = 300; +// Enable preview pane +$rcmail_config['enable_preview'] = FALSE; + +// Default setting if preview pane is enabled +$rcmail_config['preview'] = FALSE; + // end of config file ?> Index: program/include/main.inc =================================================================== --- program/include/main.inc (revision 380) +++ program/include/main.inc (working copy) @@ -1106,9 +1106,8 @@ return FALSE; } - // parse for specialtags - $output = parse_rcube_xml($templ); + $output = parse_rcube_xml(parse_rcube_conditions($templ)); $OUTPUT->write(trim(parse_with_globals($output)), $skin_path); @@ -1269,6 +1268,48 @@ } +// parse conditional code +function parse_rcube_conditions($input) + { + global $CONFIG; + if (($matches = preg_split('/<roundcube:(if|elseif|else|endif)\s+([^>]+)>/is', $input, 2, PREG_SPLIT_DELIM_CAPTURE)) && + (count($matches)==4)) + { + if (preg_match('/^(else|endif)$/i', $matches[1])) + return $matches[0] . '' . parse_rcube_conditions($matches[3]); + else + { + $attrib = parse_attrib_string($matches[2]); + if (isset($attrib['condition']) && + preg_match('/^(session|config):([a-zA-Z0-9_]+)([=<>!]+)(.*)$/i', $attrib['condition'], $opts)) + { + $condmet = false; + if ($opts[1]=='session') + $condmet = eval("return (\$_SESSION['" . $opts[2] . "']" . $opts[3] . "'" . $opts[4] . "');"); + elseif ($opts[1]=='config') + $condmet = eval("return (\$CONFIG['" . $opts[2] . "']" . $opts[3] . "'" . $opts[4] . "');"); + $submatches = preg_split('/<roundcube:(elseif|else|endif)\s+([^>]+)>/is', $matches[3], 2, PREG_SPLIT_DELIM_CAPTURE); + if ($condmet) + $result = $submatches[0] . preg_replace('/.*<roundcube:endif\s+[^>]+>/is', '', $submatches[3]); + else + $result = '<roundcube:' . $submatches[1] . $submatches[2] . $submatches[3]; + return $matches[0] . '' . parse_rcube_conditions($result); + } + else + { + raise_error(array('code' => 500, + 'type' => 'php', + 'line' => __LINE__, + 'file' => __FILE__, + 'message' => "Unable to parse conditional tag " . $matches[2]), TRUE, FALSE); + } + } + } + else + return $input; + } + + // create and register a button function rcube_button($attrib) { Index: program/localization/en_US/labels.inc =================================================================== --- program/localization/en_US/labels.inc (revision 380) +++ program/localization/en_US/labels.inc (working copy) @@ -211,6 +211,7 @@ $labels['dstactive'] = 'Daylight savings'; $labels['htmleditor'] = 'Compose HTML messages'; $labels['htmlsignature'] = 'HTML signature'; +$labels['preview'] = 'Show preview pane'; $labels['autosavedraft'] = 'Automatically save draft'; $labels['everynminutes'] = 'every $n minutes'; Index: program/js/app.js =================================================================== --- program/js/app.js (revision 380) +++ program/js/app.js (working copy) @@ -151,8 +151,15 @@ this.enable_command('firstmessage', true); } } + + // make preview/message frame visible + if (this.env.action == 'preview' && this.env.framed && parent.rcmail) + { + this.enable_command('compose', 'add-contact', false); + parent.rcmail.show_messageframe(true); + } - if (this.env.action=='show' && this.env.blockedobjects) + if ((this.env.action=='show' || this.env.action=='preview') && this.env.blockedobjects) { if (this.gui_objects.remoteobjectsmsg) this.gui_objects.remoteobjectsmsg.style.display = 'block'; @@ -637,7 +644,7 @@ case 'load-images': if (this.env.uid) - this.show_message(this.env.uid, true); + this.show_message(this.env.uid, true, this.env.action=='preview'); break; case 'load-attachment': @@ -667,22 +674,22 @@ case 'nextmessage': if (this.env.next_uid) - this.show_message(this.env.next_uid); + this.show_message(this.env.next_uid, false, this.env.action=='preview'); break; case 'lastmessage': if (this.env.last_uid) - this.show_message(this.env.last_uid); + this.show_message(this.env.last_uid, false, this.env.action=='preview'); break; case 'previousmessage': if (this.env.prev_uid) - this.show_message(this.env.prev_uid); + this.show_message(this.env.prev_uid, false, this.env.action=='preview'); break; case 'firstmessage': if (this.env.first_uid) - this.show_message(this.env.first_uid); + this.show_message(this.env.first_uid, false, this.env.action=='preview'); break; case 'checkmail': @@ -1052,6 +1059,9 @@ this.msglist_select = function(list) { + if (this.preview_timer) + clearTimeout(this.preview_timer); + var selected = list.selection.length==1; if (this.env.mailbox == this.env.drafts_mailbox) { @@ -1063,16 +1073,25 @@ this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected); this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false); } + + // start timer for message preview (wait for double click) + if (selected && this.env.contentframe) + this.preview_timer = setTimeout(this.ref+'.msglist_get_preview()', this.dblclick_time + 10); + else if (this.env.contentframe) + this.show_messageframe(false); }; this.msglist_dbl_click = function(list) { + if (this.preview_timer) + clearTimeout(this.preview_timer); + var uid = list.get_single_selection(); if (uid && this.env.mailbox == this.env.drafts_mailbox) this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true); else if (uid) - this.show_message(uid); + this.show_message(uid, false, false); }; @@ -1085,18 +1104,29 @@ }; + this.msglist_get_preview = function() + { + var uid = this.get_single_uid(); + if (uid && this.env.contentframe) + this.show_message(uid, false, true); + else if (this.env.contentframe) + this.show_messageframe(false); + }; + + /*********************************************************/ /********* (message) list functionality *********/ /*********************************************************/ // when user doble-clicks on a row - this.show_message = function(id, safe) + this.show_message = function(id, safe, preview) { var add_url = ''; + var action = preview ? 'preview': 'show'; var target = window; - if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) + if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) { target = window.frames[this.env.contentframe]; add_url = '&_framed=1'; @@ -1107,13 +1137,27 @@ if (id) { - this.set_busy(true, 'loading'); - target.location.href = this.env.comm_path+'&_action=show&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url; + var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url; + if (action == 'preview' && String(target.location.href).indexOf(url) >= 0) + this.show_messageframe(true); + else + { + this.set_busy(true, 'loading'); + target.location.href = this.env.comm_path+url; + } } }; + this.show_messageframe = function(show) + { + var frm; + if (this.env.contentframe && (frm = rcube_find_object(this.env.contentframe))) + frm.style.display = show ? 'block' : 'none'; + }; + + // list a specific page this.list_page = function(page) { Index: program/steps/settings/func.inc =================================================================== --- program/steps/settings/func.inc (revision 380) +++ program/steps/settings/func.inc (working copy) @@ -155,6 +155,16 @@ rep_specialchars_output(rcube_label('htmleditor')), $input_htmleditor->show($CONFIG['htmleditor']?1:0)); + if ($CONFIG['enable_preview']) + { + $field_id = 'rcmfd_preview'; + $input_preview = new checkbox(array('name' => '_preview', 'id' => $field_id, 'value' => 1)); + $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", + $field_id, + rep_specialchars_output(rcube_label('preview')), + $input_preview->show($CONFIG['preview']?1:0)); + } + if (!empty($CONFIG['drafts_mbox'])) { $field_id = 'rcmfd_autosave'; @@ -242,4 +252,4 @@ } -?> \ No newline at end of file +?> Index: program/steps/settings/save_prefs.inc =================================================================== --- program/steps/settings/save_prefs.inc (revision 380) +++ program/steps/settings/save_prefs.inc (working copy) @@ -29,6 +29,8 @@ $a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize']; $a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE; $a_user_prefs['htmleditor'] = isset($_POST['_htmleditor']) ? TRUE : FALSE; +if ($CONFIG['enable_preview']) + $a_user_prefs['preview'] = isset($_POST['_preview']) ? TRUE : FALSE; $a_user_prefs['draft_autosave'] = isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0; // MM: Date format toggle (Pretty / Standard) Index: program/steps/mail/show.inc =================================================================== --- program/steps/mail/show.inc (revision 380) +++ program/steps/mail/show.inc (working copy) @@ -34,8 +34,14 @@ // go back to list if message not found (wrong UID) if (!$MESSAGE['headers'] || !$MESSAGE['structure']) { - $_action = 'list'; - return; + show_message('messageopenerror', 'error'); + if ($_action=='preview' && template_exists('messagepreview')) + parse_template('messagepreview'); + else + { + $_action = 'list'; + return; + } } $MESSAGE['subject'] = $IMAP->decode_header($MESSAGE['headers']->subject); @@ -131,28 +137,6 @@ -// return an HTML iframe for loading mail content -function rcmail_messagecontent_frame($attrib) - { - global $COMM_PATH, $OUTPUT, $GET_URL, $JS_OBJECT_NAME; - - // allow the following attributes to be added to the <iframe> tag - $attrib_str = create_attrib_string($attrib); - $framename = 'rcmailcontentwindow'; - - $out = sprintf('<iframe src="%s" name="%s"%s>%s</iframe>'."\n", - $GET_URL, - $framename, - $attrib_str, - rcube_label('loading')); - - - $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');"); - - return $out; - } - - function rcmail_remote_objects_msg($attrib) { global $CONFIG, $OUTPUT, $JS_OBJECT_NAME; @@ -177,8 +161,10 @@ } -if ($_action=='print') +if ($_action=='print' && template_exists('printmessage')) parse_template('printmessage'); +else if ($_action=='preview' && template_exists('messagepreview')) + parse_template('messagepreview'); else parse_template('message'); -?> \ No newline at end of file +?> Index: program/steps/mail/func.inc =================================================================== --- program/steps/mail/func.inc (revision 380) +++ program/steps/mail/func.inc (working copy) @@ -481,6 +481,7 @@ $javascript .= sprintf("%s.set_env('pagecount', %d);\n", $JS_OBJECT_NAME, ceil($message_count/$IMAP->page_size)); $javascript .= sprintf("%s.set_env('sort_col', '%s');\n", $JS_OBJECT_NAME, $sort_col); $javascript .= sprintf("%s.set_env('sort_order', '%s');\n", $JS_OBJECT_NAME, $sort_order); + $javascript .= sprintf("%s.set_env('preview', '%s');\n", $JS_OBJECT_NAME, $CONFIG['enable_preview'] && $CONFIG['preview']); if ($attrib['messageicon']) $javascript .= sprintf("%s.set_env('messageicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['messageicon']); @@ -558,6 +559,28 @@ } +// return an HTML iframe for loading mail content +function rcmail_messagecontent_frame($attrib) + { + global $OUTPUT, $JS_OBJECT_NAME; + + if (empty($attrib['id'])) + $attrib['id'] = 'rcmailcontentwindow'; + + // allow the following attributes to be added to the <iframe> tag + $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); + $framename = $attrib['id']; + + $out = sprintf('<iframe name="%s"%s></iframe>'."\n", + $framename, + $attrib_str); + + $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');"); + + return $out; + } + + // return code for search function function rcmail_search_form($attrib) { Index: skins/default/templates/mail.html =================================================================== --- skins/default/templates/mail.html (revision 380) +++ skins/default/templates/mail.html (working copy) @@ -42,6 +42,22 @@ </div> +<roundcube:if condition="config:preview==true" /> +<div id="mailcontframe" class="preview"> +<roundcube:object name="messages" + id="messagelist" + cellspacing="0" + summary="Message list" + messageIcon="/images/icons/dot.png" + unreadIcon="/images/icons/unread.png" + deletedIcon="/images/icons/deleted.png" + repliedIcon="/images/icons/replied.png" + attachmentIcon="/images/icons/attachment.png" /> +</div> +<div id="mailpreviewframe"> +<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" /> +</div> +<roundcube:else /> <div id="mailcontframe"> <roundcube:object name="messages" id="messagelist" @@ -53,6 +69,7 @@ repliedIcon="/images/icons/replied.png" attachmentIcon="/images/icons/attachment.png" /> </div> +<roundcube:endif /> <div id="listcontrols"> <roundcube:label name="select" />:  Index: skins/default/templates/messagepreview.html =================================================================== --- skins/default/templates/messagepreview.html (revision 0) +++ skins/default/templates/messagepreview.html (revision 0) @@ -0,0 +1,19 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<title><roundcube:object name="pagetitle" /></title> +<link rel="stylesheet" type="text/css" href="/common.css" /> +<link rel="stylesheet" type="text/css" href="/mail.css" /> +</head> +<body class="iframe"> + +<div class="messageheaderbox"> +<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" /> +<roundcube:object name="messageAttachments" id="attachment-list" /> +</div> + +<roundcube:object name="blockedObjects" id="remote-objects-message" /> +<roundcube:object name="messageBody" id="messagebody" /> + +</body> +</html> Index: skins/default/mail.css =================================================================== --- skins/default/mail.css (revision 380) +++ skins/default/mail.css (working copy) @@ -117,10 +117,34 @@ overflow: auto; /* css hack for IE */ width: expression((parseInt(document.documentElement.clientWidth)-240)+'px'); - height: expression((parseInt(document.documentElement.clientHeight)-125)+'px'); } +#mailcontframe.preview { + bottom: auto; + height: 210px; +} +#mailpreviewframe +{ + position: absolute; + top: 300px; + left: 200px; + right: 40px; + bottom: 40px; + border: 1px solid #999999; + background-color: #F9F9F9; + /* css hack for IE */ + width: expression((parseInt(document.documentElement.clientWidth)-240)+'px'); + height: expression((parseInt(document.documentElement.clientHeight)-340)+'px'); +} + +#messagecontframe +{ + width: 100%; + height: 100%; + border: 0; +} + #messagepartframe { border: 1px solid #999999; Index: index.php =================================================================== --- index.php (revision 380) +++ index.php (working copy) @@ -262,7 +262,7 @@ { include_once('program/steps/mail/func.inc'); - if ($_action=='show' || $_action=='print') + if ($_action=='show' || $_action=='preview' || $_action=='print') include('program/steps/mail/show.inc'); if ($_action=='get')

2 3

Re: Next Beta Release
by chasd 22 Dec '06

22 Dec '06

> Matt Kaatman said: > > Do we have any goals before we release the next beta? > > Maybe a feature freeze is in order to get a newer beta out? I think a release that includes the vulnerability fix - <http://trac.roundcube.net/trac.cgi/ticket/1484109> should be made, so new RoundCube users don't have to patch their fresh install. Many first time users will likely choose to download a beta release rather than an SVN snapshot that contains the fix. Charles Dostale System Admin - Silver Oaks Communications http://www.silveroaks.com/ 824 17th Street, Moline IL 61265

2 1

Security: Why is user password stored in session?
by Stefan Rompf 05 Dec '06

05 Dec '06

Hi, I've just installed Roundcubemail on my server to replace another webmail package. First impression: Very nice work! However, I'm one of those who at least try to review the software they use, and there is one thing that really caught my eye: The user password is stored in the PHP session. I think authentication data should be end to end data, especially if you're running Roundcubemail over https as you should. The attached, slightly tested patch moves the password from the session into a browser cookie. Thoughts? Stefan

8 10

dragging messages while checking for new messages broken
by Jason 04 Dec '06

04 Dec '06

I was having this problem, then finially upgraded to revision 361, but I'm still seeing it. If I'm in my inbox, and I try to click and drag a message over to another folder it works normally, but not while the periodic "checking for new messages" message is at the top of the page. I searched the trac tickets and the mailing list and didn't find anything. Is anyone else having this problem? Is there a way to fix it?

1 1

conditional objects in templates
by Edgar Bueltemeyer 02 Dec '06

02 Dec '06

Hello, i would like to make following proposal to the conditional objects in templates: Its rather flexible and supports normal variables and Session-vars..... in the template file: <roundcube:button command="print" imageSel="/images/buttons/ print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/ images/buttons/print_pas.png" width="32" height="32" title="printmessage" condition="session:username:test"/> </div> in main.inc: function rcube_xml_command($command, $str_attrib, $add_attrib=array()) { global $IMAP, $CONFIG, $OUTPUT; $command = strtolower($command); $attrib = parse_attrib_string($str_attrib) + $add_attrib; //check if tag is conditional if($attrib['condition']) { $condition=explode(':',$attrib['condition']); $logmesg="condition:".$condition[0].'='.print_array($condition); //console($logmesg); if(strpos($condition[2],',')) $condition_array=explode(',', $condition[2]); else $condition_array=array(0=>$condition[2]); switch ($condition[0]) { case 'session': // if sesion var is not set -> switch off command if(!in_array($_SESSION[$condition[1]],$condition_array)) $command='none'; break; default: if(!$condition[0]==$condition[1])) $command='none'; // condition is not handled -> switch off command break; } } Regards!

3 5

Re: Conditional HTML and preview pane
by dmandell 29 Nov '06

29 Nov '06

I thought Robin and everybody else would like to know that I've been using the preview pane for the last few days in R380 in Firefox, and to a lesser extent IE7, with great results. Hopefully Robin will consider checking this code in so that it will get included with the next release. Thanks, Doug Mandell

2 1

(no subject)
by Kiril Dimeski 28 Nov '06

28 Nov '06

Hello, First > Sorry about my language, maybe I will make some mistakes in my e-mail. I'm web developer and I've heard about your webmail project, I've seen the screens and I've loved in it. But the main problem is, in your localisation packs there isn't Macedonian. I like to help you and change the language in Macedonian. Can you help me? Just send me the name of the software, with I can change the language. Thanks ----------------------------------- Kiril Dimeski Prilep WWW.SKORPION.ORG.MK WWW.TARATUR.COM WWW.FAUNA-SHOP.TK ------------------------------------

5 8

Time off by one hour
by Jason Dixon 27 Nov '06

27 Nov '06

RC is showing all messages with timestamps one hour fast. If I change my timezone to GMT -0600, it looks correct. I've tried turning the various main.inc.php knobs (timezone, dst_active), but they have no effect. I see this behavior on three different versions of RC, all on (mostly) different platforms: svn-373, OpenBSD 4.0 -stable svn-297, OpenBSD 3.7 svn-297, CentOS 3.8 It's entirely possible this is a sysadmin error, but I can't duplicate with Squirrelmail. Any ideas? Thanks, -- Jason Dixon DixonGroup Consulting http://www.dixongroup.net

2 3

Re: Delete open email button in svn 380
by Martin Marques 23 Nov '06

23 Nov '06

On Wed, 22 Nov 2006 08:17:45 -0600, Matt Kaatman <roundcube-dev(a)matt.kaatman.com> wrote: > Do we have any goals before we release the next beta? > > Maybe a feature freeze is in order to get a newer beta out? > > Grabbing the head from SVN will probably never be bug free but I know I > and many others are using it in a "production" environment which is > never a great idea. If you are doing it this way, probably the best > thing you can do is constantly grab the latest source. > > Robin and any other devs are impressively responsive to fixing problems > we find and discuss on here. > > Maybe we should make a list of features that need to be finished before > the next beta and once those are knocked out set a bug-scrub day or two > where everyone combs over everything to find any remaining issues. Like, when I click on an html link that's attached to my mail RC opens a new window with RC (the folder list). Very odd. Another one is that the behavior when deleting a mail in the message list changed again. Before, when you deleted a message, the next one got selected, which doesn't happen now. Trash and spam folders can't get emptied (empty botton is grey). Configuration (at least sone things) don't get applied. Example, changing the interval in which drafts get saved. It's always in a default of 5 minutes (could this be realted to DB changes I haven't applied yet?) -- --------------------------------------------------------- Lic. Martín Marqués | SELECT 'mmarques' || Centro de Telemática | '@' || 'unl.edu.ar'; Universidad Nacional | DBA, Programador, del Litoral | Administrador --------------------------------------------------------- -- --------------------------------------------------------- Lic. Martín Marqués | SELECT 'mmarques' || Centro de Telemática | '@' || 'unl.edu.ar'; Universidad Nacional | DBA, Programador, del Litoral | Administrador ---------------------------------------------------------

3 6

First & last buttons
by Robin Elfrink 22 Nov '06

22 Nov '06

Hi, I added first and last buttons to the main page, the single-email page and the address book. If it's OK I'll commit this. Robin Index: program/localization/en_US/labels.inc =================================================================== --- program/localization/en_US/labels.inc (revision 371) +++ program/localization/en_US/labels.inc (working copy) @@ -98,7 +98,9 @@ $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['export'] = 'Export'; $labels['previouspage'] = 'Show previous set'; +$labels['firstpage'] = 'Show first set'; $labels['nextpage'] = 'Show next set'; +$labels['lastpage'] = 'Show last set'; // LDAP search Index: program/js/app.js =================================================================== --- program/js/app.js (revision 371) +++ program/js/app.js (working copy) @@ -141,9 +141,15 @@ { 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 @@ 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 @@ 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 @@ { 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 @@ 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)); } Index: program/steps/mail/show.inc =================================================================== --- program/steps/mail/show.inc (revision 371) +++ program/steps/mail/show.inc (working copy) @@ -60,7 +60,7 @@ $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 @@ $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); } @@ -173,4 +181,4 @@ parse_template('printmessage'); else parse_template('message'); -?> \ No newline at end of file +?> Index: skins/default/templates/mail.html =================================================================== --- skins/default/templates/mail.html (revision 371) +++ skins/default/templates/mail.html (working copy) @@ -25,9 +25,11 @@ </div> <div id="messagecountbar"> +<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" /> <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />  <roundcube:object name="messageCountDisplay" />  <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" /> +<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" /> </div> <div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div> Index: skins/default/templates/message.html =================================================================== --- skins/default/templates/message.html (revision 371) +++ skins/default/templates/message.html (working copy) @@ -11,9 +11,11 @@ <roundcube:include file="/includes/header.html" /> <div id="messagecountbar"> +<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" /> <roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />  <roundcube:object name="messageCountDisplay" />  <roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" /> +<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" /> </div> <div id="messagetoolbar"> Index: skins/default/templates/addressbook.html =================================================================== --- skins/default/templates/addressbook.html (revision 371) +++ skins/default/templates/addressbook.html (working copy) @@ -20,9 +20,11 @@ </div> <div id="abookcountbar"> +<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" /> <roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />  <roundcube:object name="recordsCountDisplay" />  <roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" /> +<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" /> </div> <div id="addresslist">

2 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Dev November 2006