makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

One more unread posts search adjustment.

Browse source 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10057 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ruslan Uzdenov 2009-08-25 13:52:35 +00:00
parent c9ecb5dee7
commit fa754d1576
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/functions.php
View file

@ -1649,12 +1649,13 @@ function get_complete_topic_tracking($forum_id, $topic_ids, $global_announce_lis
* *
* @param int $user_id User ID (or false for current user) * @param int $user_id User ID (or false for current user)
* @param string $sql_extra Extra WHERE SQL statement * @param string $sql_extra Extra WHERE SQL statement
* @param string $sql_limit Limits the size of unread topics list * @param string $sql_sort ORDER BY SQL sorting statement
* @param string $sql_limit Limits the size of unread topics list, 0 for unlimited query
* *
* @return array[int][int] Topic ids as keys, mark_time of topic as value * @return array[int][int] Topic ids as keys, mark_time of topic as value
* @author rxu * @author rxu
*/ */
function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit = 1001) function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_sort = '', $sql_limit = 1001)
{ {
global $config, $db, $user; global $config, $db, $user;
@ -1663,6 +1664,11 @@ function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit =
$user_id = (int) $user->data['user_id']; $user_id = (int) $user->data['user_id'];
} }
if (empty($sql_sort))
{
$sql_sort = 'ORDER BY t.topic_last_post_time DESC';
}
$tracked_topics_list = $unread_topics_list = $read_topics_list = array(); $tracked_topics_list = $unread_topics_list = $read_topics_list = array();
$tracked_forums_list = $mark_time = array(); $tracked_forums_list = $mark_time = array();
@ -1674,7 +1680,7 @@ function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit =
WHERE t.topic_id = tt.topic_id WHERE t.topic_id = tt.topic_id
AND tt.user_id = $user_id AND tt.user_id = $user_id
$sql_extra $sql_extra
ORDER BY t.topic_last_post_time DESC"; $sql_sort";
$result = $db->sql_query_limit($sql, $sql_limit); $result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -1706,7 +1712,7 @@ function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit =
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . " AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
AND ft.user_id = $user_id AND ft.user_id = $user_id
$sql_extra $sql_extra
ORDER BY t.topic_last_post_time DESC"; $sql_sort";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count)); $result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -1742,7 +1748,7 @@ function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit =
AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . ' AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . '
AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . " AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . "
$sql_extra $sql_extra
ORDER BY t.topic_last_post_time DESC"; $sql_sort";
$result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count)); $result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
@ -1776,9 +1782,9 @@ function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_limit =
FROM ' . TOPICS_TABLE . ' t FROM ' . TOPICS_TABLE . ' t
WHERE t.topic_last_post_time > ' . $user_lastmark . " WHERE t.topic_last_post_time > ' . $user_lastmark . "
$sql_extra $sql_extra
ORDER BY t.topic_last_post_time DESC"; $sql_sort";
$result = $db->sql_query_limit($sql, 1000); $result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {

11
phpBB/search.php
View file

@ -376,24 +376,23 @@ if ($keywords || $author || $author_id || $search_id || $submit)
// force sorting // force sorting
$show_results = 'topics'; $show_results = 'topics';
$sort_key = 't'; $sort_key = 't';
$sort_dir = 'd';
$sort_by_sql['t'] = 't.topic_last_post_time'; $sort_by_sql['t'] = 't.topic_last_post_time';
$sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
$sql_where = 'AND t.topic_moved_id = 0
' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '');
gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = ''; $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
$unread_list = array(); $unread_list = array();
$unread_list = get_unread_topics_list(); $unread_list = get_unread_topics_list($user->data['user_id'], $sql_where, $sql_sort);
if (!empty($unread_list)) if (!empty($unread_list))
{ {
$sql = 'SELECT t.topic_id $sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t FROM ' . TOPICS_TABLE . ' t
WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . ' WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . "
AND t.topic_moved_id = 0
' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . "
$sql_sort"; $sql_sort";
$field = 'topic_id'; $field = 'topic_id';
} }