Vergleich search.php - 1.4.4 - 1.4.6

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 6Zeile 6
 * Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*

 * Website: http://www.mybboard.net
* License: http://www.mybboard.net/about/license
*

 * $Id: search.php 4267 2008-11-10 21:28:36Z Tikitiki $

 * $Id: search.php 4352 2009-04-18 22:25:55Z Tikitiki $

 */



 */



Zeile 43Zeile 43
}

$now = TIME_NOW;

}

$now = TIME_NOW;

 
$mybb->input['keywords'] = trim($mybb->input['keywords']);

$limitsql = "";
if(intval($mybb->settings['searchhardlimit']) > 0)
{
$limitsql = "LIMIT ".intval($mybb->settings['searchhardlimit']);
}


if($mybb->input['action'] == "results")
{


if($mybb->input['action'] == "results")
{

Zeile 70Zeile 77
			$sortfield = "t.views";
break;
case "subject":

			$sortfield = "t.views";
break;
case "subject":

			if($search['resulttype'] == "threads")
{

			if($search['resulttype'] == "threads")
{

				$sortfield = "t.subject";

				$sortfield = "t.subject";

			}

			}

			else
{
$sortfield = "p.subject";
}

			else
{
$sortfield = "p.subject";
}

			break;

			break;

		case "forum":
$sortfield = "t.fid";
break;
case "starter":

		case "forum":
$sortfield = "t.fid";
break;
case "starter":

			if($search['resulttype'] == "threads")
{

			if($search['resulttype'] == "threads")
{

				$sortfield = "t.username";
}
else

				$sortfield = "t.username";
}
else

Zeile 151Zeile 158
		else
{
$highlight = "&highlight=".urlencode($search['keywords']);

		else
{
$highlight = "&highlight=".urlencode($search['keywords']);

		}
}

		}
}


$sorturl = "search.php?action=results&sid={$sid}";
$thread_url = "";
$post_url = "";


$sorturl = "search.php?action=results&sid={$sid}";
$thread_url = "";
$post_url = "";

	

	

	eval("\$orderarrow['$sortby'] = \"".$templates->get("search_orderarrow")."\";");

// Read some caches we will be using

	eval("\$orderarrow['$sortby'] = \"".$templates->get("search_orderarrow")."\";");

// Read some caches we will be using

Zeile 165Zeile 172
	$icon_cache = $cache->read("posticons");

$threads = array();

	$icon_cache = $cache->read("posticons");

$threads = array();

	
$limitsql = "";
if(intval($mybb->settings['searchhardlimit']) > 0)
{
$limitsql = "LIMIT ".intval($mybb->settings['searchhardlimit']);
}

 

if($mybb->user['uid'] == 0)
{


if($mybb->user['uid'] == 0)
{

Zeile 200Zeile 201
		if($mybb->user['uid'] == 0)
{
if($forumsread[$forum['fid']])

		if($mybb->user['uid'] == 0)
{
if($forumsread[$forum['fid']])

			{

			{

				$forum['lastread'] = $forumsread[$forum['fid']];
}
}
$readforums[$forum['fid']] = $forum['lastread'];

				$forum['lastread'] = $forumsread[$forum['fid']];
}
}
$readforums[$forum['fid']] = $forum['lastread'];

	}

	}

	$fpermissions = forum_permissions();

// Inline Mod Column for moderators

	$fpermissions = forum_permissions();

// Inline Mod Column for moderators

Zeile 214Zeile 215
	if($mybb->usergroup['issupermod'])
{
$is_supermod = true;

	if($mybb->usergroup['issupermod'])
{
$is_supermod = true;

	}

	}

	if($is_supermod || is_moderator())
{
eval("\$inlinemodcol = \"".$templates->get("search_results_inlinemodcol")."\";");

	if($is_supermod || is_moderator())
{
eval("\$inlinemodcol = \"".$templates->get("search_results_inlinemodcol")."\";");

Zeile 228Zeile 229
	if($search['resulttype'] == "threads")
{
$threadcount = 0;

	if($search['resulttype'] == "threads")
{
$threadcount = 0;

		

		

		// Moderators can view unapproved threads
$query = $db->simple_select("moderators", "fid", "uid='{$mybb->user['uid']}'");
if($mybb->usergroup['issupermod'] == 1)

		// Moderators can view unapproved threads
$query = $db->simple_select("moderators", "fid", "uid='{$mybb->user['uid']}'");
if($mybb->usergroup['issupermod'] == 1)

Zeile 268Zeile 269
				$search['threads'] = implode(",", $threads);
}
// No results.

				$search['threads'] = implode(",", $threads);
}
// No results.

			else
{

			else
{

				error($lang->error_nosearchresults);
}
$where_conditions = "t.tid IN (".$search['threads'].")";

				error($lang->error_nosearchresults);
}
$where_conditions = "t.tid IN (".$search['threads'].")";

Zeile 313Zeile 314
		// 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.")");

			$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='".$mybb->user['uid']."' AND tid IN(".$thread_ids.")"); // Why are we querying the posts table?

			while($post = $db->fetch_array($query))
{
$thread_cache[$post['tid']]['dot_icon'] = 1;

			while($post = $db->fetch_array($query))
{
$thread_cache[$post['tid']]['dot_icon'] = 1;

Zeile 493Zeile 494
			else
{
$lastposterlink = build_profile_link($lastposter, $lastposteruid);

			else
{
$lastposterlink = build_profile_link($lastposter, $lastposteruid);

			}

			}


$thread['replies'] = my_number_format($thread['replies']);
$thread['views'] = my_number_format($thread['views']);

if($forumcache[$thread['fid']])


$thread['replies'] = my_number_format($thread['replies']);
$thread['views'] = my_number_format($thread['views']);

if($forumcache[$thread['fid']])

			{

			{

				$thread['forumlink'] = "<a href=\"".get_forum_link($thread['fid'])."\">".$forumcache[$thread['fid']]['name']."</a>";
}
else
{
$thread['forumlink'] = "";

				$thread['forumlink'] = "<a href=\"".get_forum_link($thread['fid'])."\">".$forumcache[$thread['fid']]['name']."</a>";
}
else
{
$thread['forumlink'] = "";

			}


			}


			// If this user is the author of the thread and it is not closed or they are a moderator, they can edit
if(($thread['uid'] == $mybb->user['uid'] && $thread['closed'] != 1 && $mybb->user['uid'] != 0 && $fpermissions[$thread['fid']]['caneditposts'] == 1) || is_moderator($fid, "caneditposts"))
{

			// If this user is the author of the thread and it is not closed or they are a moderator, they can edit
if(($thread['uid'] == $mybb->user['uid'] && $thread['closed'] != 1 && $mybb->user['uid'] != 0 && $fpermissions[$thread['fid']]['caneditposts'] == 1) || is_moderator($fid, "caneditposts"))
{

Zeile 520Zeile 521

// If this thread has 1 or more attachments show the papperclip
if($thread['attachmentcount'] > 0)


// If this thread has 1 or more attachments show the papperclip
if($thread['attachmentcount'] > 0)

			{

			{

				if($thread['attachmentcount'] > 1)

				if($thread['attachmentcount'] > 1)

				{

				{

					$attachment_count = $lang->sprintf($lang->attachment_count_multiple, $thread['attachmentcount']);

					$attachment_count = $lang->sprintf($lang->attachment_count_multiple, $thread['attachmentcount']);

				}

				}

				else
{
$attachment_count = $lang->attachment_count;

				else
{
$attachment_count = $lang->attachment_count;

Zeile 533Zeile 534
				eval("\$attachment_count = \"".$templates->get("forumdisplay_thread_attachment_count")."\";");
}
else

				eval("\$attachment_count = \"".$templates->get("forumdisplay_thread_attachment_count")."\";");
}
else

			{

			{

				$attachment_count = '';
}


				$attachment_count = '';
}


Zeile 588Zeile 589
			while($tool = $db->fetch_array($query))
{
eval("\$customthreadtools .= \"".$templates->get("search_results_threads_inlinemoderation_custom_tool")."\";");

			while($tool = $db->fetch_array($query))
{
eval("\$customthreadtools .= \"".$templates->get("search_results_threads_inlinemoderation_custom_tool")."\";");

			}

			}

			// Build inline moderation dropdown
if(!empty($customthreadtools))
{

			// Build inline moderation dropdown
if(!empty($customthreadtools))
{

Zeile 602Zeile 603
		output_page($searchresults);
}
else // Displaying results as posts

		output_page($searchresults);
}
else // Displaying results as posts

	{






	{
if(!$search['posts'])
{
error($lang->error_nosearchresults);
}


		$postcount = 0;

		$postcount = 0;

		if($search['querycache'] != "")
{
$where_conditions = $search['querycache'];
}
else
{
if(!$search['posts'])
{
error($lang->error_nosearchresults);
}
$where_conditions = "p.pid IN (".$search['posts'].")";
}

 
		
// Moderators can view unapproved threads
$query = $db->simple_select("moderators", "fid", "uid='{$mybb->user['uid']}'");
if($mybb->usergroup['issupermod'] == 1)
{
// Super moderators (and admins)

		
// Moderators can view unapproved threads
$query = $db->simple_select("moderators", "fid", "uid='{$mybb->user['uid']}'");
if($mybb->usergroup['issupermod'] == 1)
{
// Super moderators (and admins)

			$unapproved_where = "t.visible>-1 AND p.visible>-1";


			$p_unapproved_where = "visible >= 0";
$t_unapproved_where = "visible < 0";

		}
elseif($db->num_rows($query))
{

		}
elseif($db->num_rows($query))
{

Zeile 631Zeile 626
			while($forum = $db->fetch_array($query))
{
$moderated_forums .= ','.$forum['fid'];

			while($forum = $db->fetch_array($query))
{
$moderated_forums .= ','.$forum['fid'];

 
				$test_moderated_forums[$forum['fid']] = $forum['fid'];

			}

			}

			$unapproved_where = "((t.visible>0 AND p.visible>0) OR ((p.visible=0 OR t.visible>-1) AND t.fid IN ({$moderated_forums})))";


			$p_unapproved_where = "visible >= 0";
$t_unapproved_where = "visible < 0 OR fid NOT IN ({$moderated_forums})";

		}
else
{
// Normal users

		}
else
{
// Normal users

			$unapproved_where = 't.visible>0 AND p.visible>0';









































			$p_unapproved_where = 'visible=1';
$t_unapproved_where = 'visible < 1';
}

$tids = array();
$pids = array();
// Make sure the posts we're viewing we have permission to view.
$query = $db->simple_select("posts", "pid, tid", "pid IN(".$db->escape_string($search['posts']).") AND {$p_unapproved_where} {$limitsql}");
while($post = $db->fetch_array($query))
{
$pids[$post['pid']] = $post['tid'];
$tids[$post['tid']][$post['pid']] = $post['pid'];
}

if(!empty($pids))
{
$temp_pids = array();

// Check the thread records as well. If we don't have permissions, remove them from the listing.
$query = $db->simple_select("threads", "tid", "tid IN(".$db->escape_string(implode(',', $pids)).") AND ({$t_unapproved_where} OR closed LIKE 'moved|%')");
while($thread = $db->fetch_array($query))
{
if(array_key_exists($thread['tid'], $tids) != false)
{
$temp_pids = $tids[$thread['tid']];
foreach($temp_pids as $pid)
{
unset($pids[$pid]);
unset($tids[$thread['tid']]);
}
}
}
unset($temp_pids);
}

// Declare our post count
$postcount = count($pids);

if(!$postcount)
{
error($lang->error_nosearchresults);

		}


		}


		$query = $db->query("
SELECT COUNT(p.pid) AS resultcount
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
WHERE {$where_conditions} AND {$unapproved_where} AND t.closed NOT LIKE 'moved|%'
{$limitsql}
");
$count = $db->fetch_array($query);

if(!$count['resultcount'])
{
error($lang->error_nosearchresults);
}
$postcount = $count['resultcount'];

$tids = array();
$query = $db->query("
SELECT p.tid
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
WHERE {$where_conditions} AND {$unapproved_where} AND t.closed NOT LIKE 'moved|%'
ORDER BY $sortfield $order
LIMIT $start, $perpage
");
while($post = $db->fetch_array($query))
{
$tids[$post['tid']] = $post['tid'];
}
$tids = implode(",", $tids);


		// And now we have our sanatized post list
$search['posts'] = implode(',', array_keys($pids));

$tids = implode(",", array_keys($tids));



























		// Read threads
if($mybb->user['uid'] && $mybb->settings['threadreadcut'] > 0)
{

		// Read threads
if($mybb->user['uid'] && $mybb->settings['threadreadcut'] > 0)
{

			$query = $db->simple_select("threadsread", "tid, dateline", "uid='".$mybb->user['uid']."' AND tid IN(".$tids.")");

			$query = $db->simple_select("threadsread", "tid, dateline", "uid='".$mybb->user['uid']."' AND tid IN(".$db->escape_string($tids).")");

			while($readthread = $db->fetch_array($query))
{
$readthreads[$readthread['tid']] = $readthread['dateline'];

			while($readthread = $db->fetch_array($query))
{
$readthreads[$readthread['tid']] = $readthread['dateline'];

Zeile 683Zeile 695
		$dot_icon = array();
if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] != 0)
{

		$dot_icon = array();
if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] != 0)
{

			$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='".$mybb->user['uid']."' AND tid IN(".$tids.")");

			$query = $db->simple_select("posts", "DISTINCT tid,uid", "uid='".$mybb->user['uid']."' AND tid IN(".$db->escape_string($tids).")");

			while($post = $db->fetch_array($query))
{
$dot_icon[$post['tid']] = true;

			while($post = $db->fetch_array($query))
{
$dot_icon[$post['tid']] = true;

Zeile 695Zeile 707
			FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

			FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

			WHERE $where_conditions AND {$unapproved_where} AND t.closed NOT LIKE 'moved|%'

			WHERE p.pid IN (".$db->escape_string($search['posts']).")

			ORDER BY $sortfield $order
LIMIT $start, $perpage
");

			ORDER BY $sortfield $order
LIMIT $start, $perpage
");

Zeile 908Zeile 920
}
elseif($mybb->input['action'] == "findguest")
{

}
elseif($mybb->input['action'] == "findguest")
{

	$where_sql = "p.uid='0'";

	$where_sql = "uid='0'";


$unsearchforums = get_unsearchable_forums();
if($unsearchforums)
{


$unsearchforums = get_unsearchable_forums();
if($unsearchforums)
{

		$where_sql .= " AND t.fid NOT IN ($unsearchforums)";
}
$inactiveforums = get_inactive_forums();
if($inactiveforums)
{
$where_sql .= " AND t.fid NOT IN ($inactiveforums)";
}

$sid = md5(uniqid(microtime(), 1));
$searcharray = array(
"sid" => $db->escape_string($sid),
"uid" => $mybb->user['uid'],
"dateline" => TIME_NOW,
"ipaddress" => $db->escape_string($session->ipaddress),
"threads" => '',
"posts" => '',
"resulttype" => "posts",
"querycache" => $db->escape_string($where_sql),



















		$where_sql .= " AND fid NOT IN ($unsearchforums)";
}
$inactiveforums = get_inactive_forums();
if($inactiveforums)
{
$where_sql .= " AND fid NOT IN ($inactiveforums)";
}

$pids = '';
$comma = '';
$query = $db->simple_select("posts", "pid", "{$where_sql} {$limitsql}");
while($pid = $db->fetch_field($query, "pid"))
{
$pids .= $comma.$pid;
$comma = ',';
}

$tids = '';
$comma = '';
$query = $db->simple_select("threads", "tid", $where_sql);
while($tid = $db->fetch_field($query, "tid"))
{
$tids .= $comma.$tid;
$comma = ',';
}

$sid = md5(uniqid(microtime(), 1));
$searcharray = array(
"sid" => $db->escape_string($sid),
"uid" => $mybb->user['uid'],
"dateline" => TIME_NOW,
"ipaddress" => $db->escape_string($session->ipaddress),
"threads" => $db->escape_string($tids),
"posts" => $db->escape_string($pids),
"resulttype" => "posts",
"querycache" => '',

		"keywords" => ''
);
$plugins->run_hooks("search_do_search_process");

		"keywords" => ''
);
$plugins->run_hooks("search_do_search_process");

Zeile 939Zeile 969
}
elseif($mybb->input['action'] == "finduser")
{

}
elseif($mybb->input['action'] == "finduser")
{

	$where_sql = "p.uid='".intval($mybb->input['uid'])."'";

	$where_sql = "uid='".intval($mybb->input['uid'])."'";

	
$unsearchforums = get_unsearchable_forums();
if($unsearchforums)

	
$unsearchforums = get_unsearchable_forums();
if($unsearchforums)

	{
$where_sql .= " AND t.fid NOT IN ($unsearchforums)";
}

	{
$where_sql .= " AND fid NOT IN ($unsearchforums)";
}

	$inactiveforums = get_inactive_forums();
if($inactiveforums)
{

	$inactiveforums = get_inactive_forums();
if($inactiveforums)
{

		$where_sql .= " AND t.fid NOT IN ($inactiveforums)";



















		$where_sql .= " AND fid NOT IN ($inactiveforums)";
}

$pids = '';
$comma = '';
$query = $db->simple_select("posts", "pid", "{$where_sql} {$limitsql}");
while($pid = $db->fetch_field($query, "pid"))
{
$pids .= $comma.$pid;
$comma = ',';
}

$tids = '';
$comma = '';
$query = $db->simple_select("threads", "tid", $where_sql);
while($tid = $db->fetch_field($query, "tid"))
{
$tids .= $comma.$tid;
$comma = ',';

	}

$sid = md5(uniqid(microtime(), 1));

	}

$sid = md5(uniqid(microtime(), 1));

Zeile 958Zeile 1006
		"uid" => $mybb->user['uid'],
"dateline" => TIME_NOW,
"ipaddress" => $db->escape_string($session->ipaddress),

		"uid" => $mybb->user['uid'],
"dateline" => TIME_NOW,
"ipaddress" => $db->escape_string($session->ipaddress),

		"threads" => '',
"posts" => '',

		"threads" => $db->escape_string($tids),
"posts" => $db->escape_string($pids),

		"resulttype" => "posts",

		"resulttype" => "posts",

		"querycache" => $db->escape_string($where_sql),

		"querycache" => '',

		"keywords" => ''
);
$plugins->run_hooks("search_do_search_process");

		"keywords" => ''
);
$plugins->run_hooks("search_do_search_process");

Zeile 1128Zeile 1176
			$conditions = "uid='0' AND ipaddress='".$db->escape_string($session->ipaddress)."'";
}
$timecut = TIME_NOW-$mybb->settings['searchfloodtime'];

			$conditions = "uid='0' AND ipaddress='".$db->escape_string($session->ipaddress)."'";
}
$timecut = TIME_NOW-$mybb->settings['searchfloodtime'];

		$query = $db->simple_select("searchlog", "*", "$conditions AND dateline >= '$timecut'", array('order_by' => "dateline", 'order_dir' => "DESC"));

		$query = $db->simple_select("searchlog", "*", "$conditions AND dateline > '$timecut'", array('order_by' => "dateline", 'order_dir' => "DESC"));

		$last_search = $db->fetch_array($query);
// Users last search was within the flood time, show the error
if($last_search['sid'])

		$last_search = $db->fetch_array($query);
// Users last search was within the flood time, show the error
if($last_search['sid'])

Zeile 1251Zeile 1299
			$conditions = "uid='0' AND ipaddress='".$db->escape_string($session->ipaddress)."'";
}
$timecut = TIME_NOW-$mybb->settings['searchfloodtime'];

			$conditions = "uid='0' AND ipaddress='".$db->escape_string($session->ipaddress)."'";
}
$timecut = TIME_NOW-$mybb->settings['searchfloodtime'];

		$query = $db->simple_select("searchlog", "*", "$conditions AND dateline >= '$timecut'", array('order_by' => "dateline", 'order_dir' => "DESC"));

		$query = $db->simple_select("searchlog", "*", "$conditions AND dateline > '$timecut'", array('order_by' => "dateline", 'order_dir' => "DESC"));

		$last_search = $db->fetch_array($query);

// We shouldn't show remaining time if time is 0 or under.

		$last_search = $db->fetch_array($query);

// We shouldn't show remaining time if time is 0 or under.