Vergleich search.php - 1.8.18 - 1.8.25

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 235	Zeile 235
{ $threadcount = 0;	{ $threadcount = 0;
// Moderators can view unapproved threads $query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')"); if($mybb->usergroup['issupermod'] == 1) { // Super moderators (and admins) $unapproved_where = "t.visible>=-1"; } elseif($db->num_rows($query)) { // Normal moderators $unapprove_forums = array(); $deleted_forums = array(); $unapproved_where = '(t.visible = 1'; while($moderator = $db->fetch_array($query)) { if($moderator['canviewunapprove'] == 1) { $unapprove_forums[] = $moderator['fid']; } if($moderator['canviewdeleted'] == 1) { $deleted_forums[] = $moderator['fid']; } } if(!empty($unapprove_forums)) { $unapproved_where .= " OR (t.visible = 0 AND t.fid IN(".implode(',', $unapprove_forums)."))"; } if(!empty($deleted_forums)) { $unapproved_where .= " OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))"; } $unapproved_where .= ')'; } else { // Normal users $unapproved_where = 't.visible>0'; }	// Moderators can view unapproved threads and deleted threads from forums they moderate $unapproved_where_t = get_visible_where('t');
// If we have saved WHERE conditions, execute them if($search['querycache'] != "") { $where_conditions = $search['querycache'];	// If we have saved WHERE conditions, execute them if($search['querycache'] != "") { $where_conditions = $search['querycache'];
$query = $db->simple_select("threads t", "t.tid", $where_conditions. " AND {$unapproved_where} AND t.closed NOT LIKE 'moved\|%' ORDER BY t.lastpost DESC {$limitsql}");	$query = $db->simple_select("threads t", "t.tid", $where_conditions. " AND ({$unapproved_where_t}) AND t.closed NOT LIKE 'moved\|%' ORDER BY t.lastpost DESC {$limitsql}");
while($thread = $db->fetch_array($query)) { $threads[$thread['tid']] = $thread['tid']; $threadcount++;	while($thread = $db->fetch_array($query)) { $threads[$thread['tid']] = $thread['tid']; $threadcount++;
}	}
// Build our list of threads. if($threadcount > 0) {	// Build our list of threads. if($threadcount > 0) {
Zeile 294	Zeile 255
} // No results. else	} // No results. else
{ error($lang->error_nosearchresults); } $where_conditions = "t.tid IN (".$search['threads'].")"; }	{ error($lang->error_nosearchresults); } $where_conditions = "t.tid IN (".$search['threads'].")"; }
// This search doesn't use a query cache, results stored in search table. else { $where_conditions = "t.tid IN (".$search['threads'].")";	// This search doesn't use a query cache, results stored in search table. else { $where_conditions = "t.tid IN (".$search['threads'].")";
$query = $db->simple_select("threads t", "COUNT(t.tid) AS resultcount", $where_conditions. " AND {$unapproved_where} AND t.closed NOT LIKE 'moved\|%' {$limitsql}");	$query = $db->simple_select("threads t", "COUNT(t.tid) AS resultcount", $where_conditions. " AND ({$unapproved_where_t}) AND t.closed NOT LIKE 'moved\|%' {$limitsql}");
$count = $db->fetch_array($query); if(!$count['resultcount'])	$count = $db->fetch_array($query); if(!$count['resultcount'])
Zeile 315	Zeile 276
$permsql = ""; $onlyusfids = array();	$permsql = ""; $onlyusfids = array();

// Check group permissions if we can't view threads not started by us $group_permissions = forum_permissions(); foreach($group_permissions as $fid => $forum_permissions)	// Check group permissions if we can't view threads not started by us $group_permissions = forum_permissions(); foreach($group_permissions as $fid => $forum_permissions)
{	{
if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1) { $onlyusfids[] = $fid; }	if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1) { $onlyusfids[] = $fid; }
}	}
if(!empty($onlyusfids))	if(!empty($onlyusfids))
{	{
$permsql .= "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))"; }	$permsql .= "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))"; }
Zeile 334	Zeile 295
if($unsearchforums) { $permsql .= " AND t.fid NOT IN ($unsearchforums)";	if($unsearchforums) { $permsql .= " AND t.fid NOT IN ($unsearchforums)";
}	}
$inactiveforums = get_inactive_forums(); if($inactiveforums) {	$inactiveforums = get_inactive_forums(); if($inactiveforums) {
Zeile 360	Zeile 321
FROM ".TABLE_PREFIX."threads t LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=t.uid) LEFT JOIN ".TABLE_PREFIX."forums f ON (t.fid=f.fid)	FROM ".TABLE_PREFIX."threads t LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=t.uid) LEFT JOIN ".TABLE_PREFIX."forums f ON (t.fid=f.fid)
WHERE $where_conditions AND {$unapproved_where} {$permsql} AND t.closed NOT LIKE 'moved\|%'	WHERE $where_conditions AND ({$unapproved_where_t}) {$permsql} AND t.closed NOT LIKE 'moved\|%'
ORDER BY $sortfield $order LIMIT $start, $perpage ");	ORDER BY $sortfield $order LIMIT $start, $perpage ");
Zeile 386	Zeile 347
// Fetch dot icons if enabled if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] && $thread_cache) {	// Fetch dot icons if enabled if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] && $thread_cache) {
$p_unapproved_where = str_replace('t.', '', $unapproved_where); $query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='{$mybb->user['uid']}' AND tid IN({$thread_ids}) AND {$p_unapproved_where}");	$unapproved_where_p = str_replace('t.', '', $unapproved_where_t); $query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='{$mybb->user['uid']}' AND tid IN({$thread_ids}) AND ({$unapproved_where_p})");
while($thread = $db->fetch_array($query)) { $thread_cache[$thread['tid']]['dot_icon'] = 1;	while($thread = $db->fetch_array($query)) { $thread_cache[$thread['tid']]['dot_icon'] = 1;
} }	} }
// Fetch the read threads. if($mybb->user['uid'] && $mybb->settings['threadreadcut'] > 0) {	// Fetch the read threads. if($mybb->user['uid'] && $mybb->settings['threadreadcut'] > 0) {
Zeile 430	Zeile 391
if($thread['userusername']) { $thread['username'] = $thread['userusername'];	if($thread['userusername']) { $thread['username'] = $thread['userusername'];
}	}