Vergleich modcp.php - 1.8.6 - 1.8.7

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 2208Zeile 2208
		{
$altbg = alt_trow();
$post['threadsubject'] = htmlspecialchars_uni($parser->parse_badwords($post['threadsubject']));

		{
$altbg = alt_trow();
$post['threadsubject'] = htmlspecialchars_uni($parser->parse_badwords($post['threadsubject']));

 
			$post['subject'] = htmlspecialchars_uni($parser->parse_badwords($post['subject']));

			$post['threadlink'] = get_thread_link($post['tid']);
$post['postlink'] = get_post_link($post['pid'], $post['tid']);
$forum_link = get_forum_link($post['fid']);

			$post['threadlink'] = get_thread_link($post['tid']);
$post['postlink'] = get_post_link($post['pid'], $post['tid']);
$forum_link = get_forum_link($post['fid']);

Zeile 3017Zeile 3018
	$lang->edit_profile = $lang->sprintf($lang->edit_profile, $user['username']);
$profile_link = build_profile_link(format_name($user['username'], $user['usergroup'], $user['displaygroup']), $user['uid']);


	$lang->edit_profile = $lang->sprintf($lang->edit_profile, $user['username']);
$profile_link = build_profile_link(format_name($user['username'], $user['usergroup'], $user['displaygroup']), $user['uid']);


 
	$user['signature'] = htmlspecialchars_uni($user['signature']);

	$codebuttons = build_mycode_inserter("signature");

// Do we mark the suspend signature box?

	$codebuttons = build_mycode_inserter("signature");

// Do we mark the suspend signature box?

Zeile 3557Zeile 3559
			{
if(!is_array($ip_range))
{

			{
if(!is_array($ip_range))
{

					$post_ip_sql = "ipaddress=".$db->escape_binary($ip_range);

					$post_ip_sql = "p.ipaddress=".$db->escape_binary($ip_range);

				}
else
{

				}
else
{

					$post_ip_sql = "ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);

					$post_ip_sql = "p.ipaddress BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);

				}
}


				}
}


Zeile 3569Zeile 3571

if($post_ip_sql)
{


if($post_ip_sql)
{

				$query = $db->simple_select('posts', 'COUNT(pid) AS count', "$post_ip_sql AND visible >= -1");







































































				$where_sql = '';

$unviewable_forums = get_unviewable_forums(true);

if($unviewable_forums)
{
$where_sql .= " AND p.fid NOT IN ({$unviewable_forums})";
}

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

// Check group permissions if we can't view threads not started by us
$onlyusfids = array();
$group_permissions = forum_permissions();
foreach($group_permissions as $fid => $forumpermissions)
{
if(isset($forumpermissions['canonlyviewownthreads']) && $forumpermissions['canonlyviewownthreads'] == 1)
{
$onlyusfids[] = $fid;
}
}

if(!empty($onlyusfids))
{
$where_sql .= " AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
}

// Moderators can view unapproved/deleted posts
if($mybb->usergroup['issupermod'] != 1)
{
$unapprove_forums = array();
$deleted_forums = array();
$visible_sql = " AND (p.visible = 1 AND t.visible = 1)";
$query = $db->simple_select("moderators", "fid, canviewunapprove, canviewdeleted", "(id='{$mybb->user['uid']}' AND isgroup='0') OR (id='{$mybb->user['usergroup']}' AND isgroup='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))
{
$visible_sql .= " OR (p.visible = 0 AND p.fid IN(".implode(',', $unapprove_forums).")) OR (t.visible = 0 AND t.fid IN(".implode(',', $unapprove_forums)."))";
}
if(!empty($deleted_forums))
{
$visible_sql .= " OR (p.visible = -1 AND p.fid IN(".implode(',', $deleted_forums).")) OR (t.visible = -1 AND t.fid IN(".implode(',', $deleted_forums)."))";
}
}
else
{
// Super moderators (and admins)
$visible_sql = " AND p.visible >= -1";
}

$query = $db->query("
SELECT COUNT(p.pid) AS count
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid)
WHERE {$post_ip_sql}{$where_sql}{$visible_sql}
");

				$post_results = $db->fetch_field($query, "count");
}
}

				$post_results = $db->fetch_field($query, "count");
}
}

Zeile 3586Zeile 3658
				else
{
$user_ip_sql = "regip BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1])." OR lastip BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);

				else
{
$user_ip_sql = "regip BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1])." OR lastip BETWEEN ".$db->escape_binary($ip_range[0])." AND ".$db->escape_binary($ip_range[1]);

				}
}

				}
}


$plugins->run_hooks("modcp_ipsearch_users_start");


$plugins->run_hooks("modcp_ipsearch_users_start");





			if($user_ip_sql)
{
$query = $db->simple_select('users', 'COUNT(uid) AS count', $user_ip_sql);

			if($user_ip_sql)
{
$query = $db->simple_select('users', 'COUNT(uid) AS count', $user_ip_sql);





				$user_results = $db->fetch_field($query, "count");
}
}

				$user_results = $db->fetch_field($query, "count");
}
}

Zeile 3604Zeile 3676
		if(!$total_results)
{
$total_results = 1;

		if(!$total_results)
{
$total_results = 1;

		}


		}


		// Now we have the result counts, paginate
$perpage = $mybb->get_input('perpage', MyBB::INPUT_INT);
if(!$perpage || $perpage <= 0)
{
$perpage = $mybb->settings['threadsperpage'];

		// Now we have the result counts, paginate
$perpage = $mybb->get_input('perpage', MyBB::INPUT_INT);
if(!$perpage || $perpage <= 0)
{
$perpage = $mybb->settings['threadsperpage'];

		}


		}


		// Figure out if we need to display multiple pages.
if($mybb->get_input('page') != "last")
{

		// Figure out if we need to display multiple pages.
if($mybb->get_input('page') != "last")
{

Zeile 3623Zeile 3695
		$pages = ceil($pages);

if($mybb->get_input('page') == "last")

		$pages = ceil($pages);

if($mybb->get_input('page') == "last")

		{

		{

			$page = $pages;

			$page = $pages;

		}


		}


		if($page > $pages || $page <= 0)

		if($page > $pages || $page <= 0)

		{
$page = 1;
}

		{
$page = 1;
}


if($page)
{


if($page)
{

Zeile 3640Zeile 3712
		{
$start = 0;
$page = 1;

		{
$start = 0;
$page = 1;

		}

		}


$page_url = "modcp.php?action=ipsearch&amp;perpage={$perpage}";
foreach(array('ipaddress', 'search_users', 'search_posts') as $input)


$page_url = "modcp.php?action=ipsearch&amp;perpage={$perpage}";
foreach(array('ipaddress', 'search_users', 'search_posts') as $input)

Zeile 3711Zeile 3783
		if(isset($mybb->input['search_posts']) && $post_results && (!isset($mybb->input['search_users']) || (isset($mybb->input['search_users']) && $post_limit > 0)))
{
$ipaddresses = $tids = $uids = array();

		if(isset($mybb->input['search_posts']) && $post_results && (!isset($mybb->input['search_users']) || (isset($mybb->input['search_users']) && $post_limit > 0)))
{
$ipaddresses = $tids = $uids = array();

			
$query = $db->simple_select('posts', 'username AS postusername, uid, subject, pid, tid, ipaddress', "$post_ip_sql AND visible >= -1",
array('order_by' => 'dateline', 'order_dir' => 'DESC', 'limit_start' => $post_start, 'limit' => $post_limit));

 




 
			$query = $db->query("
SELECT p.username AS postusername, p.uid, p.subject, p.pid, p.tid, p.ipaddress
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid = p.tid)
WHERE {$post_ip_sql}{$where_sql}{$visible_sql}
ORDER BY p.dateline desc
LIMIT {$post_start}, {$post_limit}
");

			while($ipaddress = $db->fetch_array($query))
{
$tids[$ipaddress['tid']] = $ipaddress['pid'];

			while($ipaddress = $db->fetch_array($query))
{
$tids[$ipaddress['tid']] = $ipaddress['pid'];