From 84f9312e1d17725db6040554a993db38292d46bd Mon Sep 17 00:00:00 2001 From: svncommit <devs@roundcube.net> Date: Tue, 21 Nov 2006 07:30:48 -0500 Subject: [PATCH] Updated Russian localization --- program/steps/mail/show.inc | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index f381818..c8e4937 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -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); } @@ -108,7 +116,7 @@ show_bytes($attach_prop->size)); else $out .= sprintf('<li><a href="%s&_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", - htmlentities($GET_URL), + htmlspecialchars($GET_URL), $attach_prop->mime_id, $JS_OBJECT_NAME, $attach_prop->mime_id, -- Gitblit v1.9.1