Vergleich forumdisplay.php - 1.8.17 - 1.8.25

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 19Zeile 19
$templatelist .= ",forumdisplay_announcements_announcement,forumdisplay_announcements,forumdisplay_threads_sep,forumbit_depth3_statusicon,forumbit_depth3,forumdisplay_sticky_sep,forumdisplay_thread_attachment_count,forumdisplay_rssdiscovery,forumbit_moderators_group";
$templatelist .= ",forumdisplay_inlinemoderation_openclose,forumdisplay_inlinemoderation_stickunstick,forumdisplay_inlinemoderation_softdelete,forumdisplay_inlinemoderation_restore,forumdisplay_inlinemoderation_delete,forumdisplay_inlinemoderation_manage,forumdisplay_nopermission";
$templatelist .= ",forumbit_depth2_forum_unapproved_posts,forumbit_depth2_forum_unapproved_threads,forumbit_moderators_user,forumdisplay_inlinemoderation_standard,forumdisplay_threadlist_prefixes_prefix,forumdisplay_threadlist_prefixes,forumdisplay_thread_icon,forumdisplay_rules";

$templatelist .= ",forumdisplay_announcements_announcement,forumdisplay_announcements,forumdisplay_threads_sep,forumbit_depth3_statusicon,forumbit_depth3,forumdisplay_sticky_sep,forumdisplay_thread_attachment_count,forumdisplay_rssdiscovery,forumbit_moderators_group";
$templatelist .= ",forumdisplay_inlinemoderation_openclose,forumdisplay_inlinemoderation_stickunstick,forumdisplay_inlinemoderation_softdelete,forumdisplay_inlinemoderation_restore,forumdisplay_inlinemoderation_delete,forumdisplay_inlinemoderation_manage,forumdisplay_nopermission";
$templatelist .= ",forumbit_depth2_forum_unapproved_posts,forumbit_depth2_forum_unapproved_threads,forumbit_moderators_user,forumdisplay_inlinemoderation_standard,forumdisplay_threadlist_prefixes_prefix,forumdisplay_threadlist_prefixes,forumdisplay_thread_icon,forumdisplay_rules";

$templatelist .= ",forumdisplay_thread_deleted,forumdisplay_announcements_announcement_modbit,forumbit_depth2_forum_viewers,forumdisplay_threadlist_sortrating,forumdisplay_inlinemoderation_custom,forumdisplay_announcement_rating,forumdisplay_inlinemoderation_approveunapprove";

$templatelist .= ",forumdisplay_thread_deleted,forumdisplay_announcements_announcement_modbit,forumbit_depth2_forum_viewers,forumdisplay_threadlist_sortrating,forumdisplay_inlinemoderation_custom,forumdisplay_announcement_rating,forumdisplay_inlinemoderation_approveunapprove,forumdisplay_threadlist_subscription";


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 282Zeile 282
	$inviscount = 0;
$onlinemembers = '';
$doneusers = array();

	$inviscount = 0;
$onlinemembers = '';
$doneusers = array();

 

$query = $db->simple_select("sessions", "COUNT(DISTINCT ip) AS guestcount", "uid = 0 AND time > $timecut AND location1 = $fid AND nopermission != 1");
$guestcount = $db->fetch_field($query, 'guestcount');


$query = $db->query("


$query = $db->query("

		SELECT s.ip, s.uid, u.username, s.time, u.invisible, u.usergroup, u.usergroup, u.displaygroup
FROM ".TABLE_PREFIX."sessions s
LEFT JOIN ".TABLE_PREFIX."users u ON (s.uid=u.uid)
WHERE s.time > '$timecut' AND location1='$fid' AND nopermission != 1



		SELECT
s.ip, s.uid, u.username, s.time, u.invisible, u.usergroup, u.usergroup, u.displaygroup
FROM
".TABLE_PREFIX."sessions s
LEFT JOIN ".TABLE_PREFIX."users u ON (s.uid=u.uid)
WHERE s.uid != 0 AND s.time > $timecut AND location1 = $fid AND nopermission != 1

		ORDER BY u.username ASC, s.time DESC
");

		ORDER BY u.username ASC, s.time DESC
");





	while($user = $db->fetch_array($query))
{

	while($user = $db->fetch_array($query))
{

		if($user['uid'] == 0)

		if(empty($doneusers[$user['uid']]) || $doneusers[$user['uid']] < $user['time'])

		{

		{

			++$guestcount;
}
else
{
if(empty($doneusers[$user['uid']]) || $doneusers[$user['uid']] < $user['time'])

			$doneusers[$user['uid']] = $user['time'];
++$membercount;
if($user['invisible'] == 1)



			{

			{

				$doneusers[$user['uid']] = $user['time'];
++$membercount;
if($user['invisible'] == 1)
{
$invisiblemark = "*";
++$inviscount;
}
else
{
$invisiblemark = '';
}

				$invisiblemark = "*";
++$inviscount;
}
else
{
$invisiblemark = '';
}









				if($user['invisible'] != 1 || $mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])
{
$user['username'] = format_name(htmlspecialchars_uni($user['username']), $user['usergroup'], $user['displaygroup']);
$user['profilelink'] = build_profile_link($user['username'], $user['uid']);
eval("\$onlinemembers .= \"".$templates->get("forumdisplay_usersbrowsing_user", 1, 0)."\";");
$comma = $lang->comma;
}

			if($user['invisible'] != 1 || $mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])
{
$user['username'] = format_name(htmlspecialchars_uni($user['username']), $user['usergroup'], $user['displaygroup']);
$user['profilelink'] = build_profile_link($user['username'], $user['uid']);
eval("\$onlinemembers .= \"".$templates->get("forumdisplay_usersbrowsing_user", 1, 0)."\";");
$comma = $lang->comma;


			}

			}

		}

		}

	}

$guestsonline = '';

	}

$guestsonline = '';

Zeile 355Zeile 353
	}

eval("\$usersbrowsing = \"".$templates->get("forumdisplay_usersbrowsing")."\";");

	}

eval("\$usersbrowsing = \"".$templates->get("forumdisplay_usersbrowsing")."\";");

}


}


// Do we have any forum rules to show for this forum?
$forumrules = '';
if($foruminfo['rulestype'] != 0 && $foruminfo['rules'])

// Do we have any forum rules to show for this forum?
$forumrules = '';
if($foruminfo['rulestype'] != 0 && $foruminfo['rules'])

Zeile 387Zeile 385
$bgcolor = "trow1";

// Set here to fetch only approved/deleted topics (and then below for a moderator we change this).

$bgcolor = "trow1";

// Set here to fetch only approved/deleted topics (and then below for a moderator we change this).

 
$visible_states = array("1");


if($fpermissions['canviewdeletionnotice'] != 0)

if($fpermissions['canviewdeletionnotice'] != 0)

{
$visibleonly = "AND visible IN (-1,1)";
$tvisibleonly = "AND t.visible IN (-1,1)";
}
else
{
$visibleonly = "AND visible='1'";
$tvisibleonly = "AND t.visible='1'";
}


{
$visible_states[] = "-1";
}








// Check if the active user is a moderator and get the inline moderation tools.
if(is_moderator($fid))
{

// Check if the active user is a moderator and get the inline moderation tools.
if(is_moderator($fid))
{

Zeile 407Zeile 401
	$inlinemod = '';
$inlinecookie = "inlinemod_forum".$fid;


	$inlinemod = '';
$inlinecookie = "inlinemod_forum".$fid;


	if(is_moderator($fid, "canviewdeleted") == true || is_moderator($fid, "canviewunapprove") == true)

	if(is_moderator($fid, "canviewdeleted") == true)

	{

	{

		if(is_moderator($fid, "canviewunapprove") == true && is_moderator($fid, "canviewdeleted") == false)
{
$visibleonly = "AND visible IN (0,1)";
$tvisibleonly = "AND t.visible IN (0,1)";
}
elseif(is_moderator($fid, "canviewdeleted") == true && is_moderator($fid, "canviewunapprove") == false)
{
$visibleonly = "AND visible IN (-1,1)";
$tvisibleonly = "AND t.visible IN (-1,1)";
}
else
{
$visibleonly = " AND visible IN (-1,0,1)";
$tvisibleonly = " AND t.visible IN (-1,0,1)";
}

		$visible_states[] = "-1";
}
if(is_moderator($fid, "canviewunapprove") == true)
{
$visible_states[] = "0";











	}
}
else

	}
}
else

Zeile 431Zeile 415
	$inlinemod = $inlinemodcol = '';
$ismod = false;
}

	$inlinemod = $inlinemodcol = '';
$ismod = false;
}

 

$visible_condition = "visible IN (".implode(',', array_unique($visible_states)).")";
$visibleonly = "AND ".$visible_condition;

// Allow viewing own unapproved threads for logged in users
if($mybb->user['uid'] && $mybb->settings['showownunapproved'])
{
$visible_condition .= " OR (t.visible=0 AND t.uid=".(int)$mybb->user['uid'].")";
}

$tvisibleonly = "AND (t.".$visible_condition.")";


if(is_moderator($fid, "caneditposts") || $fpermissions['caneditposts'] == 1)
{


if(is_moderator($fid, "caneditposts") || $fpermissions['caneditposts'] == 1)
{

Zeile 459Zeile 454
		if(!empty($foruminfo['defaultdatecut']))
{
$datecut = $foruminfo['defaultdatecut'];

		if(!empty($foruminfo['defaultdatecut']))
{
$datecut = $foruminfo['defaultdatecut'];

		}

		}

	}
}
// If there was a manual date cut override, use it.

	}
}
// If there was a manual date cut override, use it.

Zeile 511Zeile 506
else
{
$mybb->input['order'] = $mybb->get_input('order');

else
{
$mybb->input['order'] = $mybb->get_input('order');

}

$mybb->input['order'] = htmlspecialchars_uni($mybb->get_input('order'));


}

$mybb->input['order'] = htmlspecialchars_uni($mybb->get_input('order'));


switch(my_strtolower($mybb->input['order']))
{
case "asc":

switch(my_strtolower($mybb->input['order']))
{
case "asc":

Zeile 550Zeile 545
{
case "subject":
$sortfield = "subject";

{
case "subject":
$sortfield = "subject";

		break;

		break;

	case "replies":
$sortfield = "replies";
break;

	case "replies":
$sortfield = "replies";
break;

Zeile 586Zeile 581
else
{
$string = "&amp;";

else
{
$string = "&amp;";

}

}


// Are we viewing a specific page?
$mybb->input['page'] = $mybb->get_input('page', MyBB::INPUT_INT);
if($mybb->input['page'] > 1)


// Are we viewing a specific page?
$mybb->input['page'] = $mybb->get_input('page', MyBB::INPUT_INT);
if($mybb->input['page'] > 1)

{

{

	$sorturl = get_forum_link($fid, $mybb->input['page']).$string."datecut=$datecut&amp;prefix=$tprefix";

	$sorturl = get_forum_link($fid, $mybb->input['page']).$string."datecut=$datecut&amp;prefix=$tprefix";

}

}

else
{
$sorturl = get_forum_link($fid).$string."datecut=$datecut&amp;prefix=$tprefix";
}

else
{
$sorturl = get_forum_link($fid).$string."datecut=$datecut&amp;prefix=$tprefix";
}





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

$threadcount = 0;
$useronly = $tuseronly = "";
if(isset($fpermissions['canonlyviewownthreads']) && $fpermissions['canonlyviewownthreads'] == 1)

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

$threadcount = 0;
$useronly = $tuseronly = "";
if(isset($fpermissions['canonlyviewownthreads']) && $fpermissions['canonlyviewownthreads'] == 1)

{

{

	$useronly = "AND uid={$mybb->user['uid']}";
$tuseronly = "AND t.uid={$mybb->user['uid']}";
}

	$useronly = "AND uid={$mybb->user['uid']}";
$tuseronly = "AND t.uid={$mybb->user['uid']}";
}

Zeile 612Zeile 607
if($fpermissions['canviewthreads'] != 0)
{
// How many threads are there?

if($fpermissions['canviewthreads'] != 0)
{
// How many threads are there?

	$query = $db->simple_select("threads", "COUNT(tid) AS threads", "fid = '$fid' $useronly $visibleonly $datecutsql $prefixsql");

	$query = $db->simple_select("threads t", "COUNT(tid) AS threads", "fid = '$fid' $tuseronly $tvisibleonly $datecutsql2 $prefixsql2");

	$threadcount = $db->fetch_field($query, "threads");
}


	$threadcount = $db->fetch_field($query, "threads");
}


Zeile 886Zeile 881
			}
}
}

			}
}
}

 

$args = array(
'threadcache' => &$threadcache,
'tids' => &$tids
);

$plugins->run_hooks("forumdisplay_before_thread", $args);


if($mybb->settings['allowthreadratings'] != 0 && $foruminfo['allowtratings'] != 0 && $mybb->user['uid'] && !empty($threadcache) && $ratings == true)
{


if($mybb->settings['allowthreadratings'] != 0 && $foruminfo['allowtratings'] != 0 && $mybb->user['uid'] && !empty($threadcache) && $ratings == true)
{

Zeile 1332Zeile 1334
		$plugins->run_hooks("forumdisplay_thread_end");

if($fpermissions['canviewdeletionnotice'] != 0 && $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted"))

		$plugins->run_hooks("forumdisplay_thread_end");

if($fpermissions['canviewdeletionnotice'] != 0 && $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted"))

		{

		{

			eval("\$threads .= \"".$templates->get("forumdisplay_thread_deleted")."\";");
}
else
{

			eval("\$threads .= \"".$templates->get("forumdisplay_thread_deleted")."\";");
}
else
{

 
			$thread['start_datetime'] = my_date('relative', $thread['dateline']);

			eval("\$threads .= \"".$templates->get("forumdisplay_thread")."\";");
}
}

			eval("\$threads .= \"".$templates->get("forumdisplay_thread")."\";");
}
}

Zeile 1366Zeile 1369
					foreach($gids as $gid)
{
$gid = (int)$gid;

					foreach($gids as $gid)
{
$gid = (int)$gid;

						$gidswhere .= " OR CONCAT(',',groups,',') LIKE '%,{$gid},%'";

						$gidswhere .= " OR CONCAT(',',`groups`,',') LIKE '%,{$gid},%'";

					}

					}

					$query = $db->simple_select("modtools", 'tid, name', "(CONCAT(',',forums,',') LIKE '%,$fid,%' OR CONCAT(',',forums,',') LIKE '%,-1,%' OR forums='') AND (groups='' OR CONCAT(',',groups,',') LIKE '%,-1,%'{$gidswhere}) AND type = 't'");

					$query = $db->simple_select("modtools", 'tid, name', "(CONCAT(',',forums,',') LIKE '%,$fid,%' OR CONCAT(',',forums,',') LIKE '%,-1,%' OR forums='') AND (`groups`='' OR CONCAT(',',`groups`,',') LIKE '%,-1,%'{$gidswhere}) AND type = 't'");

					break;

					break;

			}


			}


			while($tool = $db->fetch_array($query))
{
$tool['name'] = htmlspecialchars_uni($tool['name']);
eval("\$customthreadtools .= \"".$templates->get("forumdisplay_inlinemoderation_custom_tool")."\";");

			while($tool = $db->fetch_array($query))
{
$tool['name'] = htmlspecialchars_uni($tool['name']);
eval("\$customthreadtools .= \"".$templates->get("forumdisplay_inlinemoderation_custom_tool")."\";");

			}

			}


if($customthreadtools)
{
eval("\$customthreadtools = \"".$templates->get("forumdisplay_inlinemoderation_custom")."\";");
}
}


if($customthreadtools)
{
eval("\$customthreadtools = \"".$templates->get("forumdisplay_inlinemoderation_custom")."\";");
}
}





		$inlinemodopenclose = $inlinemodstickunstick = $inlinemodsoftdelete = $inlinemodrestore = $inlinemoddelete = $inlinemodmanage = $inlinemodapproveunapprove = '';

if(is_moderator($fid, "canopenclosethreads"))
{
eval("\$inlinemodopenclose = \"".$templates->get("forumdisplay_inlinemoderation_openclose")."\";");

		$inlinemodopenclose = $inlinemodstickunstick = $inlinemodsoftdelete = $inlinemodrestore = $inlinemoddelete = $inlinemodmanage = $inlinemodapproveunapprove = '';

if(is_moderator($fid, "canopenclosethreads"))
{
eval("\$inlinemodopenclose = \"".$templates->get("forumdisplay_inlinemoderation_openclose")."\";");

		}

		}


if(is_moderator($fid, "canstickunstickthreads"))


if(is_moderator($fid, "canstickunstickthreads"))

		{

		{

			eval("\$inlinemodstickunstick = \"".$templates->get("forumdisplay_inlinemoderation_stickunstick")."\";");

			eval("\$inlinemodstickunstick = \"".$templates->get("forumdisplay_inlinemoderation_stickunstick")."\";");

		}

		}


if(is_moderator($fid, "cansoftdeletethreads"))
{


if(is_moderator($fid, "cansoftdeletethreads"))
{

Zeile 1407Zeile 1410
		}

if(is_moderator($fid, "candeletethreads"))

		}

if(is_moderator($fid, "candeletethreads"))

		{

		{

			eval("\$inlinemoddelete = \"".$templates->get("forumdisplay_inlinemoderation_delete")."\";");

			eval("\$inlinemoddelete = \"".$templates->get("forumdisplay_inlinemoderation_delete")."\";");

		}

		}


if(is_moderator($fid, "canmanagethreads"))
{
eval("\$inlinemodmanage = \"".$templates->get("forumdisplay_inlinemoderation_manage")."\";");


if(is_moderator($fid, "canmanagethreads"))
{
eval("\$inlinemodmanage = \"".$templates->get("forumdisplay_inlinemoderation_manage")."\";");

		}


		}


		if(is_moderator($fid, "canapproveunapprovethreads"))

		if(is_moderator($fid, "canapproveunapprovethreads"))

		{

		{

			eval("\$inlinemodapproveunapprove = \"".$templates->get("forumdisplay_inlinemoderation_approveunapprove")."\";");

			eval("\$inlinemodapproveunapprove = \"".$templates->get("forumdisplay_inlinemoderation_approveunapprove")."\";");

		}

		}


if(!empty($inlinemodopenclose) || !empty($inlinemodstickunstick) || !empty($inlinemodsoftdelete) || !empty($inlinemodrestore) || !empty($inlinemoddelete) || !empty($inlinemodmanage) || !empty($inlinemodapproveunapprove))
{
eval("\$standardthreadtools = \"".$templates->get("forumdisplay_inlinemoderation_standard")."\";");


if(!empty($inlinemodopenclose) || !empty($inlinemodstickunstick) || !empty($inlinemodsoftdelete) || !empty($inlinemodrestore) || !empty($inlinemoddelete) || !empty($inlinemodmanage) || !empty($inlinemodapproveunapprove))
{
eval("\$standardthreadtools = \"".$templates->get("forumdisplay_inlinemoderation_standard")."\";");

		}


		}


		// Only show inline mod menu if there's options to show
if(!empty($standardthreadtools) || !empty($customthreadtools))
{

		// Only show inline mod menu if there's options to show
if(!empty($standardthreadtools) || !empty($customthreadtools))
{

Zeile 1446Zeile 1449
// Subscription status
$add_remove_subscription = 'add';
$add_remove_subscription_text = $lang->subscribe_forum;

// Subscription status
$add_remove_subscription = 'add';
$add_remove_subscription_text = $lang->subscribe_forum;

 
$addremovesubscription = '';


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


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

Zeile 1456Zeile 1460
		$add_remove_subscription = 'remove';
$add_remove_subscription_text = $lang->unsubscribe_forum;
}

		$add_remove_subscription = 'remove';
$add_remove_subscription_text = $lang->unsubscribe_forum;
}

 

eval("\$addremovesubscription = \"".$templates->get("forumdisplay_threadlist_subscription")."\";");

}

$inline_edit_js = $clearstoredpass = '';

}

$inline_edit_js = $clearstoredpass = '';

Zeile 1480Zeile 1486
	}

$prefixselect = build_forum_prefix_select($fid, $tprefix);

	}

$prefixselect = build_forum_prefix_select($fid, $tprefix);

 

$plugins->run_hooks("forumdisplay_threadlist");


$lang->rss_discovery_forum = $lang->sprintf($lang->rss_discovery_forum, htmlspecialchars_uni(strip_tags($foruminfo['name'])));
eval("\$rssdiscovery = \"".$templates->get("forumdisplay_rssdiscovery")."\";");


$lang->rss_discovery_forum = $lang->sprintf($lang->rss_discovery_forum, htmlspecialchars_uni(strip_tags($foruminfo['name'])));
eval("\$rssdiscovery = \"".$templates->get("forumdisplay_rssdiscovery")."\";");