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

Fix a few items, ability to read private forums, etc. ... must look at reducing need to join on posts table when not absolutely necessary

Browse source 
git-svn-id: file:///svn/phpbb/trunk@4626 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2003-10-27 13:18:06 +00:00
parent 6114414650
commit edbe99feb6
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
phpBB/search.php
View file

@ -100,6 +100,8 @@ if ($search_keywords || $search_author || $search_id)
$sql_forums = array(); $sql_forums = array();
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{ {
// echo "<br />" . $row['forum_id'] . " -> " . $row['forum_name'] . " :: " . $auth->acl_get('f_read', $row['forum_id']) . " && " . ((!$row['forum_password'] || $row['user_id'] == $user->data['user_id']));
if ($search_child) if ($search_child)
{ {
if (in_array($row['forum_id'], $search_forum) && $row['right_id'] > $right_id) if (in_array($row['forum_id'], $search_forum) && $row['right_id'] > $right_id)
@ -119,7 +121,12 @@ if ($search_keywords || $search_author || $search_id)
} }
$db->sql_freeresult($result); $db->sql_freeresult($result);
$sql_forums = (sizeof($search_forum)) ? ' AND p.forum_id IN (' . implode(', ', $sql_forums) . ')' : ''; if (!sizeof($sql_forums))
{
trigger_error($user->lang['NO_SEARCH_RESULTS']);
}
$sql_forums = ' AND p.forum_id IN (' . implode(', ', $sql_forums) . ')';
unset($search_forum); unset($search_forum);
@ -160,16 +167,20 @@ if ($search_keywords || $search_author || $search_id)
if ($show_results == 'posts') if ($show_results == 'posts')
{ {
$sql = 'SELECT p.post_id $sql = 'SELECT p.post_id
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
WHERE t.topic_replies = 0 WHERE t.topic_replies = 0
AND p.post_id = t.topic_id'; AND p.topic_id = t.topic_id
$sql_forums";
$field = 'post_id'; $field = 'post_id';
} }
else else
{ {
$sql = 'SELECT topic_id $sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t
WHERE topic_replies = 0'; WHERE t.topic_replies = 0
AND p.topic_id = t.topic_id
$sql_forums
GROUP BY p.topic_id";
$field = 'topic_id'; $field = 'topic_id';
} }
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
@ -189,18 +200,20 @@ if ($search_keywords || $search_author || $search_id)
case 'newposts': case 'newposts':
if ($show_results == 'posts') if ($show_results == 'posts')
{ {
$sql = 'SELECT post_id $sql = 'SELECT p.post_id
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . ' p
WHERE post_time > ' . $user->data['user_lastvisit']; WHERE p.post_time > ' . $user->data['user_lastvisit'] . "
$sql_forums";
$field = 'post_id'; $field = 'post_id';
} }
else else
{ {
$sql = 'SELECT t.topic_id $sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p FROM ' . TOPICS_TABLE . ' t, ' . POSTS_TABLE . ' p
WHERE p.post_time > ' . $user->data['user_lastvisit'] . ' WHERE p.post_time > ' . $user->data['user_lastvisit'] . "
AND t.topic_id = p.topic_id AND t.topic_id = p.topic_id
GROUP by t.topic_id'; $sql_forums
GROUP by p.topic_id";
$field = 'topic_id'; $field = 'topic_id';
} }
$result = $db->sql_query($sql); $result = $db->sql_query($sql);