mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-29 12:43:15 +01:00
Code Issues Releases Wiki Activity

[ticket/10532] Remove one unnecessary level of if block nesting.

Browse Source 
PHPBB3-10532
This commit is contained in:
Andreas Fischer 2012-02-26 02:19:12 +01:00
parent 459e8dc095
commit 6548a3094f
1 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
phpBB/search.php
View File

@ -475,57 +475,54 @@ if ($keywords || $author || $author_id || $search_id || $submit)
if ($search_id) if ($search_id)
{ {
if ($sql || $search_id == 'unreadposts') if ($sql)
{ {
if ($sql) // Only return up to $total_matches_limit+1 ids (the last one will be removed later)
{ $result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
$result = $db->sql_query_limit($sql, ($total_matches_limit + 1));
while ($row = $db->sql_fetchrow($result)) while ($row = $db->sql_fetchrow($result))
{
$id_ary[] = (int) $row[$field];
}
$db->sql_freeresult($result);
}
else if ($search_id == 'unreadposts')
{ {
// Only return up to $total_matches_limit+1 ids (the last one will be removed later) $id_ary[] = (int) $row[$field];
$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
}
$total_match_count = sizeof($id_ary);
if ($total_match_count)
{
// Limit the number to $total_matches_limit for pre-made searches
if ($total_match_count > $total_matches_limit)
{
$found_more_search_matches = true;
$total_match_count = $total_matches_limit;
}
// Make sure $start is set to the last page if it exceeds the amount
if ($start < 0)
{
$start = 0;
}
else if ($start >= $total_match_count)
{
$start = floor(($total_match_count - 1) / $per_page) * $per_page;
}
$id_ary = array_slice($id_ary, $start, $per_page);
}
else
{
// Set $start to 0 if no matches were found
$start = 0;
} }
$db->sql_freeresult($result);
}
else if ($search_id == 'unreadposts')
{
// Only return up to $total_matches_limit+1 ids (the last one will be removed later)
$id_ary = array_keys(get_unread_topics($user->data['user_id'], $sql_where, $sql_sort, ($total_matches_limit + 1)));
} }
else else
{ {
$search_id = ''; $search_id = '';
} }
$total_match_count = sizeof($id_ary);
if ($total_match_count)
{
// Limit the number to $total_matches_limit for pre-made searches
if ($total_match_count > $total_matches_limit)
{
$found_more_search_matches = true;
$total_match_count = $total_matches_limit;
}
// Make sure $start is set to the last page if it exceeds the amount
if ($start < 0)
{
$start = 0;
}
else if ($start >= $total_match_count)
{
$start = floor(($total_match_count - 1) / $per_page) * $per_page;
}
$id_ary = array_slice($id_ary, $start, $per_page);
}
else
{
// Set $start to 0 if no matches were found
$start = 0;
}
} }
// make sure that some arrays are always in the same order // make sure that some arrays are always in the same order