From ed5d29f4b3c57235594931d33dde7cccaf7cd58b Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Thu, 25 May 2006 14:25:04 -0400 Subject: [PATCH] Finalized GoogieSpell integration --- program/steps/mail/show.inc | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 992d06f..27fc44b 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -64,14 +64,28 @@ $javascript = sprintf("%s.set_env('uid', '%s');\n", $JS_OBJECT_NAME, $_GET['_uid']); $javascript .= sprintf("%s.set_env('safemode', '%b');", $JS_OBJECT_NAME, $_GET['_safe']); + $next = $prev = -1; // get previous and next message UID - $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']); - $MESSAGE['index'] = array_search((string)$_GET['_uid'], $a_msg_index, TRUE); + if (!($_SESSION['sort_col'] == 'date' && $_SESSION['sort_order'] == 'DESC') && + $IMAP->get_capability('sort')) { + // Only if we use custom sorting + $a_msg_index = $IMAP->message_index(NULL, $_SESSION['sort_col'], $_SESSION['sort_order']); + + $MESSAGE['index'] = array_search((string)$_GET['_uid'], $a_msg_index, TRUE); + $prev = isset($a_msg_index[$MESSAGE['index']-1]) ? $a_msg_index[$MESSAGE['index']-1] : -1 ; + $next = isset($a_msg_index[$MESSAGE['index']+1]) ? $a_msg_index[$MESSAGE['index']+1] : -1 ; + } else { + // this assumes that we are sorted by date_DESC + $seq = $IMAP->get_id($_GET['_uid']); + $prev = $IMAP->get_uid($seq + 1); + $next = $IMAP->get_uid($seq - 1); + $MESSAGE['index'] = $IMAP->messagecount() - $seq; + } - if (isset($a_msg_index[$MESSAGE['index']-1])) - $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']-1]); - if (isset($a_msg_index[$MESSAGE['index']+1])) - $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $a_msg_index[$MESSAGE['index']+1]); + if ($prev > 0) + $javascript .= sprintf("\n%s.set_env('prev_uid', '%s');", $JS_OBJECT_NAME, $prev); + if ($next > 0) + $javascript .= sprintf("\n%s.set_env('next_uid', '%s');", $JS_OBJECT_NAME, $next); $OUTPUT->add_script($javascript); } @@ -95,18 +109,13 @@ $attach_prop['filename'], show_bytes($attach_prop['size'])); else - $out .= sprintf('<li><a href="#attachment" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", + $out .= sprintf('<li><a href="%s&_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", + $GET_URL, + $attach_prop['part_id'], $JS_OBJECT_NAME, $attach_prop['part_id'], $attach_prop['mimetype'], $attach_prop['filename']); - /* direct link - else - $out .= sprintf('<li><a href="%s&_part=%s&_frame=1" target="rcubemailattachment">%s</a></li>'."\n", - $GET_URL, - $attach_prop['part_id'], - $attach_prop['filename']); - */ } $out .= "</ul>"; -- Gitblit v1.9.1