diff -urp privatemsg/privatemsg.module privatemsg.new/privatemsg.module --- privatemsg.module 2009-11-26 18:42:54.000000000 +0000 +++ privatemsg.module 2009-11-29 05:32:33.181200000 +0000 @@ -257,8 +257,8 @@ function privatemsg_view_access() { * @param $account * User object for which the thread should be loaded, defaults to * the current user. - * @param $limit - * How many messages should be loaded. Note that counting starts from the end. + * @param $start + * Message offset from the start of the thread. * * @return * $thread object, with keys messages, participants, title and user. messages @@ -270,7 +270,7 @@ function privatemsg_view_access() { * @ingroup api */ -function privatemsg_thread_load($thread_id, $account = NULL, $limit = NULL) { +function privatemsg_thread_load($thread_id, $account = NULL, $start = NULL) { static $threads = array(); if ((int)$thread_id > 0) { $thread = array('thread_id' => $thread_id); @@ -297,43 +297,69 @@ function privatemsg_thread_load($thread_ $thread['read_all'] = TRUE; } - // If limit is NULL, select based on get params. - if (is_null($limit)) { - if (isset($_GET['start'])) { - $limit = $_GET['start']; - } - else { - $limit = variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : variable_get('privatemsg_view_max_amount', 20); - } - } - $thread['limit'] = $limit; - // Load messages returned by the messages query with privatemsg_message_load_multiple(). $query = _privatemsg_assemble_query('messages', array($thread_id), $thread['read_all'] ? NULL : $account); $thread['message_count'] = $thread['to'] = db_result(db_query($query['count'])); $thread['from'] = 1; // Check if we need to limit the messages. $max_amount = variable_get('privatemsg_view_max_amount', 20); - if ($limit != PRIVATEMSG_UNLIMITED) { + + // If there is no start value, select based on get params. + if (is_null($start)) { + if (isset($_GET['start'])) { + $start = $_GET['start']; + } + else { + $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : variable_get('privatemsg_view_max_amount', 20)); + } + } + + if ($start >= $thread['message_count']) { + $start = $thread['message_count'] - (variable_get('privatemsg_view_use_max_as_default', FALSE) ? variable_get('privatemsg_view_default_amount', 10) : variable_get('privatemsg_view_max_amount', 20)); + } + + if ($start != PRIVATEMSG_UNLIMITED) { if ($max_amount == PRIVATEMSG_UNLIMITED) { $max_amount = $thread['older_start'] = $thread['message_count']; } - if ($thread['message_count'] > $limit) { - $thread['from'] = $thread['message_count'] - $limit + 1; - if ($thread['from'] + $max_amount - 1 < $thread['message_count']) { - $thread['to'] = $thread['from'] + $max_amount - 1; - $thread['newer_start'] = $limit - $max_amount; - } - if (empty($thread['older_start'])) { - $thread['older_start'] = $limit + $max_amount; - } + + // Sanity check - we cannot start from a negative number. + if ($start < 0) { + $start = 0; } - elseif ($limit > $thread['message_count'] && ($thread['from'] + $max_amount - 1 < $thread['message_count'])) { - $thread['newer_start'] = $limit - $max_amount; - $thread['to'] = $max_amount = $thread['message_count'] - $limit + $max_amount; + $thread['start'] = $start; + + // Calculate the number of messages on the "last" page to avoid message overlap. + // Note - the last page lists the earliest messages, not the latest. + $last_page = (($thread['message_count'] / $max_amount) - floor($thread['message_count'] / $max_amount)) * $max_amount; + + //If there are newer messages on the page, show pager link allowing to go to the newer messages. + if (($start + $max_amount + 1) < $thread['message_count']) { + $thread['to'] = $start + $max_amount; + $thread['newer_start'] = $start + $max_amount; } - $conversation = db_query_range($query['query'], $thread['from'] - 1, $max_amount); + if (empty($thread['older_start'])) { + $thread['older_start'] = $start - $max_amount; + if ($thread['older_start'] < 0) { + $thread['older_start'] = 0; + } } + + // Do not show messages on the last page that would show on the page before. + // This will only work when using the visual pager. + if ($start <= $last_page) { + unset($thread['older_start']); + $thread['to'] = $thread['newer_start'] = $max_amount = $last_page; + // Start from the first message - this is a specific hack to make sure the message display has sane paging on the last page. + if ($start <> 0) { + $start = 0; + } + } + // Visual counts start from 1 instead of zero, so plus one. + $thread['from'] = $start + 1; + + $conversation = db_query_range($query['query'], $start, $max_amount); + } else { $conversation = db_query($query['query']); } @@ -739,7 +765,7 @@ function privatemsg_view($thread) { } $substitutions = array('@from' => $thread['from'], '@to' => $thread['to'], '@total' => $thread['message_count'], '!previous_link' => $older, '!newer_link' => $newer); $title = t('!previous_link Displaying messages @from - @to of @total !newer_link', $substitutions); - $content['display_all'] = array( + $content['pager_top'] = array( '#value' => trim($title), '#prefix' => '
', '#suffix' => '
', @@ -747,8 +773,8 @@ function privatemsg_view($thread) { ); // Display a copy at the end. - $content['display_all_bottom'] = $content['display_all']; - $content['display_all_bottom']['#weight'] = 3; + $content['pager_bottom'] = $content['pager_top']; + $content['pager_bottom']['#weight'] = 3; // Render the participants. $content['participants']['#value'] = theme('privatemsg_recipients', $thread); diff -urp privatemsg/styles/privatemsg-view.css privatemsg.new/styles/privatemsg-view.css --- styles/privatemsg-view.css 2009-11-26 18:42:54.000000000 +0000 +++ styles/privatemsg-view.css 2009-11-29 05:19:53.866700000 +0000 @@ -54,7 +54,6 @@ } .privatemsg-view-pager { - border: 1px solid #C5C5C5; margin: 20px 0 20px 200px; padding-left: 10px; width: 300px;