Vergleich inc/functions_search.php - 1.8.21 - 1.8.28

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 54	Zeile 54
$optionselected = ''; $selecteddone = "0"; }	$optionselected = ''; $selecteddone = "0"; }
if($forum['password'] != '')	if(forum_password_validated($forum, true))
{	{
if($mybb->cookies['forumpass'][$forum['fid']] === md5($mybb->user['uid'].$forum['password'])) { $pwverified = 1; } else { $pwverified = 0; } } if(empty($forum['password']) \|\| $pwverified == 1) { eval("\$forumlistbits .= \"".$templates->get("search_forumlist_forum")."\";");	eval("\$forumlistbits .= \"".$templates->get("search_forumlist_forum")."\";");
} if(!empty($pforumcache[$forum['fid']])) {	} if(!empty($pforumcache[$forum['fid']])) {
Zeile 77	Zeile 66
} } }	} } }
}	}
if($addselect)	if($addselect)
{ eval("\$forumlist = \"".$templates->get("search_forumlist")."\";"); }	{ eval("\$forumlist = \"".$templates->get("search_forumlist")."\";"); }
return $forumlist; }	return $forumlist; }

/** * Build a comma separated list of the forums this user cannot search *	/** * Build a comma separated list of the forums this user cannot search *
Zeile 95	Zeile 84
function get_unsearchable_forums($pid=0, $first=1) { global $db, $forum_cache, $permissioncache, $mybb, $unsearchableforums, $unsearchable, $templates, $forumpass;	function get_unsearchable_forums($pid=0, $first=1) { global $db, $forum_cache, $permissioncache, $mybb, $unsearchableforums, $unsearchable, $templates, $forumpass;

$pid = (int)$pid; if(!is_array($forum_cache))	$pid = (int)$pid; if(!is_array($forum_cache))
Zeile 103	Zeile 92
// Get Forums $query = $db->simple_select("forums", "fid,parentlist,password,active", '', array('order_by' => 'pid, disporder')); while($forum = $db->fetch_array($query))	// Get Forums $query = $db->simple_select("forums", "fid,parentlist,password,active", '', array('order_by' => 'pid, disporder')); while($forum = $db->fetch_array($query))
{	{
$forum_cache[$forum['fid']] = $forum;	$forum_cache[$forum['fid']] = $forum;
}	}
} if(!is_array($permissioncache)) {	} if(!is_array($permissioncache)) {
Zeile 120	Zeile 109
else { $perms = $mybb->usergroup;	else { $perms = $mybb->usergroup;
} $pwverified = 1; if($forum['password'] != '') { if(!isset($mybb->cookies['forumpass'][$forum['fid']]) \|\| !my_hash_equals($mybb->cookies['forumpass'][$forum['fid']], md5($mybb->user['uid'].$forum['password']))) { $pwverified = 0; } }	}
$parents = explode(",", $forum['parentlist']); if(is_array($parents))	$parents = explode(",", $forum['parentlist']); if(is_array($parents))
Zeile 143	Zeile 123
} }	} }
if($perms['canview'] != 1 \|\| $perms['cansearch'] != 1 \|\| $pwverified == 0 \|\| $forum['active'] == 0)	if($perms['canview'] != 1 \|\| $perms['cansearch'] != 1 \|\| !forum_password_validated($forum, true) \|\| $forum['active'] == 0)
{ if($unsearchableforums) {	{ if($unsearchableforums) {
Zeile 168	Zeile 148
} return $unsearchable;	} return $unsearchable;
	} /** * Build query condition for threads/posts the user is allowed to see. * Will return for example: * - visible = 1 - for normal users * - visible >= -1 - for admins & super mods * - (visible = 1 OR (visible = ? AND fid IN ...)) - for forum moderators * * @param string $table_alias The alias of the table eg t to use t.visible instead of visible * @return string the query condition */ function get_visible_where($table_alias = null) { global $db, $mybb; $aliasdot = ''; if(!empty($table_alias)) { $aliasdot = $table_alias.'.'; } if($mybb->usergroup['issupermod'] == 1) { // Super moderators (and admins) return "{$aliasdot}visible >= -1"; } elseif(is_moderator()) { // Normal moderators $unapprove_forums = array(); $deleted_forums = array(); $unapproved_where = "({$aliasdot}visible = 1"; $moderated_fids = get_moderated_fids($mybb->user['uid']); if($moderated_fids !== false) { foreach($moderated_fids as $fid) { if(!is_moderator($fid)) { // Shouldn't occur. continue; } // Use moderates this forum $modperms = get_moderator_permissions($fid, $mybb->user['uid']); if($modperms['canviewunapprove'] == 1) { $unapprove_forums[] = $fid; } if($modperms['canviewdeleted'] == 1) { $deleted_forums[] = $fid; } } if(!empty($unapprove_forums)) { $unapproved_where .= " OR ({$aliasdot}visible = 0 AND {$aliasdot}fid IN(".implode(',', $unapprove_forums)."))"; } if(!empty($deleted_forums)) { $unapproved_where .= " OR ({$aliasdot}visible = -1 AND {$aliasdot}fid IN(".implode(',', $deleted_forums)."))"; } $unapproved_where .= ')'; return $unapproved_where; } } // Normal users if($mybb->user['uid'] > 0 && $mybb->settings['showownunapproved'] == 1) { return "({$aliasdot}visible = 1 OR ({$aliasdot}visible = 0 AND {$aliasdot}uid = {$mybb->user['uid']}))"; } return "{$aliasdot}visible = 1";
} /**	} /**
Zeile 202	Zeile 262
$pass_fids = array(); foreach($fids as $fid) {	$pass_fids = array(); foreach($fids as $fid) {
if(empty($forum_cache[$fid]['password'])) { continue; } if(md5($mybb->user['uid'].$forum_cache[$fid]['password']) !== $mybb->cookies['forumpass'][$fid])	if(!forum_password_validated($forum_cache[$fid], true))
{ $pass_fids[] = $fid;	{ $pass_fids[] = $fid;
$child_list = get_child_list($fid); } if(is_array($child_list)) { $pass_fids = array_merge($pass_fids, $child_list);	$pass_fids = array_merge($pass_fids, get_child_list($fid));