Vergleich search.php - 1.8.3 - 1.8.13

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 13	Zeile 13
define('THIS_SCRIPT', 'search.php'); $templatelist = "search,forumdisplay_thread_gotounread,search_results_threads_thread,search_results_threads,search_results_posts,search_results_posts_post,search_results_icon,search_forumlist_forum,search_forumlist";	define('THIS_SCRIPT', 'search.php'); $templatelist = "search,forumdisplay_thread_gotounread,search_results_threads_thread,search_results_threads,search_results_posts,search_results_posts_post,search_results_icon,search_forumlist_forum,search_forumlist";
$templatelist .= ",multipage,multipage_breadcrumb,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start,forumdisplay_thread_multipage_more,forumdisplay_thread_multipage_page,forumdisplay_thread_multipage"; $templatelist .= ",search_results_posts_inlinecheck,search_results_posts_nocheck,search_results_threads_inlinecheck,search_results_threads_nocheck,search_results_inlinemodcol,search_results_posts_inlinemoderation_custom_tool"; $templatelist .= ",search_results_posts_inlinemoderation_custom,search_results_posts_inlinemoderation,search_results_threads_inlinemoderation_custom_tool,search_results_threads_inlinemoderation_custom,search_results_threads_inlinemoderation,search_orderarrow,search_moderator_options"; $templatelist .= ",forumdisplay_thread_attachment_count,search_threads_inlinemoderation_selectall,search_posts_inlinemoderation_selectall,post_prefixselect_prefix,post_prefixselect_multiple";	$templatelist .= ",multipage,multipage_breadcrumb,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start"; $templatelist .= ",search_results_posts_inlinecheck,search_results_posts_nocheck,search_results_threads_inlinecheck,search_results_threads_nocheck,search_results_inlinemodcol,search_results_inlinemodcol_empty,search_results_posts_inlinemoderation_custom_tool"; $templatelist .= ",search_results_posts_inlinemoderation_custom,search_results_posts_inlinemoderation,search_results_threads_inlinemoderation_custom_tool,search_results_threads_inlinemoderation_custom,search_results_threads_inlinemoderation"; $templatelist .= ",forumdisplay_thread_attachment_count,search_threads_inlinemoderation_selectall,search_posts_inlinemoderation_selectall,post_prefixselect_prefix,post_prefixselect_multiple,search_orderarrow"; $templatelist .= ",search_results_posts_forumlink,search_results_threads_forumlink,forumdisplay_thread_multipage_more,forumdisplay_thread_multipage_page,forumdisplay_thread_multipage,search_moderator_options";
require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";	require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";
Zeile 166	Zeile 167
$sorturl = "search.php?action=results&sid={$sid}"; $thread_url = ""; $post_url = "";	$sorturl = "search.php?action=results&sid={$sid}"; $thread_url = ""; $post_url = "";

$orderarrow = array('replies' => '', 'views' => '', 'subject' => '', 'forum' => '', 'starter' => '', 'lastpost' => '', 'dateline' => ''); eval("\$orderarrow['$sortby'] = \"".$templates->get("search_orderarrow")."\";");	$orderarrow = array('replies' => '', 'views' => '', 'subject' => '', 'forum' => '', 'starter' => '', 'lastpost' => '', 'dateline' => ''); eval("\$orderarrow['$sortby'] = \"".$templates->get("search_orderarrow")."\";");
Zeile 216	Zeile 217
// Inline Mod Column for moderators $inlinemodcol = $inlinecookie = '';	// Inline Mod Column for moderators $inlinemodcol = $inlinecookie = '';
$is_mod = $is_supermod = false;	$is_mod = $is_supermod = $show_inline_moderation = false;
if($mybb->usergroup['issupermod']) { $is_supermod = true; } if($is_supermod \|\| is_moderator()) {	if($mybb->usergroup['issupermod']) { $is_supermod = true; } if($is_supermod \|\| is_moderator()) {
eval("\$inlinemodcol = \"".$templates->get("search_results_inlinemodcol")."\";");
$inlinecookie = "inlinemod_search".$sid; $inlinecount = 0; $is_mod = true; $return_url = 'search.php?'.htmlspecialchars_uni($_SERVER['QUERY_STRING']); }	$inlinecookie = "inlinemod_search".$sid; $inlinecount = 0; $is_mod = true; $return_url = 'search.php?'.htmlspecialchars_uni($_SERVER['QUERY_STRING']); }

// Show search results as 'threads' if($search['resulttype'] == "threads") { $threadcount = 0; // Moderators can view unapproved threads	// Show search results as 'threads' if($search['resulttype'] == "threads") { $threadcount = 0; // Moderators can view unapproved threads
$query = $db->simple_select("moderators", "fid", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='1')");	$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)	if($mybb->usergroup['issupermod'] == 1) { // Super moderators (and admins)
Zeile 245	Zeile 245
elseif($db->num_rows($query)) { // Normal moderators	elseif($db->num_rows($query)) { // Normal moderators
$moderated_forums = '0'; while($forum = $db->fetch_array($query))	$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))
{	{
$moderated_forums .= ','.$forum['fid'];	$unapproved_where .= " OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))";
}	}
$unapproved_where = "(t.visible>0 OR (t.visible IN (-1,0) AND t.fid IN ({$moderated_forums})))";	$unapproved_where .= ')';
} else {	} else {
Zeile 334	Zeile 353
FROM ".TABLE_PREFIX."threads t LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=t.uid) WHERE $where_conditions AND {$unapproved_where} {$permsql} AND t.closed NOT LIKE 'moved\|%'	FROM ".TABLE_PREFIX."threads t LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=t.uid) WHERE $where_conditions AND {$unapproved_where} {$permsql} AND t.closed NOT LIKE 'moved\|%'
ORDER BY $sortfield $order	ORDER BY $sortfield $order
LIMIT $start, $perpage ");	LIMIT $start, $perpage ");
Zeile 359	Zeile 378
// 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) {
$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='".$mybb->user['uid']."' AND tid IN(".$thread_ids.")");	$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}");
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;
Zeile 373	Zeile 393
while($readthread = $db->fetch_array($query)) { $thread_cache[$readthread['tid']]['lastread'] = $readthread['dateline'];	while($readthread = $db->fetch_array($query)) { $thread_cache[$readthread['tid']]['lastread'] = $readthread['dateline'];
} }	} }
if(!$mybb->settings['maxmultipagelinks'])	if(!$mybb->settings['maxmultipagelinks'])
{	{
$mybb->settings['maxmultipagelinks'] = 5; } $results = '';	$mybb->settings['maxmultipagelinks'] = 5; } $results = '';