Vergleich forumdisplay.php - 1.8.13 - 1.8.24

  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)
{
++$guestcount;
}
else

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





		{

		{

			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 = '';
if($guestcount)
{
$guestsonline = $lang->sprintf($lang->users_browsing_forum_guests, $guestcount);

	$guestsonline = '';
if($guestcount)
{
$guestsonline = $lang->sprintf($lang->users_browsing_forum_guests, $guestcount);

	}


	}


	$invisonline = '';
if($mybb->user['invisible'] == 1)

	$invisonline = '';
if($mybb->user['invisible'] == 1)

	{

	{

		// the user was counted as invisible user --> correct the inviscount
$inviscount -= 1;
}
if($inviscount && $mybb->usergroup['canviewwolinvis'] != 1)
{
$invisonline = $lang->sprintf($lang->users_browsing_forum_invis, $inviscount);

		// the user was counted as invisible user --> correct the inviscount
$inviscount -= 1;
}
if($inviscount && $mybb->usergroup['canviewwolinvis'] != 1)
{
$invisonline = $lang->sprintf($lang->users_browsing_forum_invis, $inviscount);

	}


	}



$onlinesep = '';
if($invisonline != '' && $onlinemembers)


$onlinesep = '';
if($invisonline != '' && $onlinemembers)

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))

{

{

	eval("\$inlinemodcol = \"".$templates->get("forumdisplay_inlinemoderation_col")."\";");
$ismod = true;
$inlinecount = "0";
$inlinemod = '';
$inlinecookie = "inlinemod_forum".$fid;


	eval("\$inlinemodcol = \"".$templates->get("forumdisplay_inlinemoderation_col")."\";");
$ismod = true;
$inlinecount = "0";
$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
{
$inlinemod = $inlinemodcol = '';

	}
}
else
{
$inlinemod = $inlinemodcol = '';

	$ismod = false;










	$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 463Zeile 458
	}
}
// If there was a manual date cut override, use it.

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

else

else

{
$datecut = $mybb->get_input('datecut', MyBB::INPUT_INT);

{
$datecut = $mybb->get_input('datecut', MyBB::INPUT_INT);

}


}


$datecutsel[(int)$datecut] = ' selected="selected"';
if($datecut > 0 && $datecut != 9999)
{

$datecutsel[(int)$datecut] = ' selected="selected"';
if($datecut > 0 && $datecut != 9999)
{

Zeile 479Zeile 474
{
$datecutsql = '';
$datecutsql2 = '';

{
$datecutsql = '';
$datecutsql2 = '';

}


}


// Sort by thread prefix
$tprefix = $mybb->get_input('prefix', MyBB::INPUT_INT);
if($tprefix > 0)
{
$prefixsql = "AND prefix = {$tprefix}";
$prefixsql2 = "AND t.prefix = {$tprefix}";

// Sort by thread prefix
$tprefix = $mybb->get_input('prefix', MyBB::INPUT_INT);
if($tprefix > 0)
{
$prefixsql = "AND prefix = {$tprefix}";
$prefixsql2 = "AND t.prefix = {$tprefix}";

}

}

else if($tprefix == -1)

else if($tprefix == -1)

{

{

	$prefixsql = "AND prefix = 0";
$prefixsql2 = "AND t.prefix = 0";
}

	$prefixsql = "AND prefix = 0";
$prefixsql2 = "AND t.prefix = 0";
}

Zeile 497Zeile 492
{
$prefixsql = "AND prefix != 0";
$prefixsql2 = "AND t.prefix != 0";

{
$prefixsql = "AND prefix != 0";
$prefixsql2 = "AND t.prefix != 0";

}
else

}
else

{
$prefixsql = $prefixsql2 = '';

{
$prefixsql = $prefixsql2 = '';

}

}


// Pick the sort order.
if(!isset($mybb->input['order']) && !empty($foruminfo['defaultsortorder']))


// Pick the sort order.
if(!isset($mybb->input['order']) && !empty($foruminfo['defaultsortorder']))

{

{

	$mybb->input['order'] = $foruminfo['defaultsortorder'];

	$mybb->input['order'] = $foruminfo['defaultsortorder'];

}

}

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'));

switch(my_strtolower($mybb->input['order']))

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

switch(my_strtolower($mybb->input['order']))

{

{

	case "asc":
$sortordernow = "asc";
$ordersel['asc'] = ' selected="selected"';

	case "asc":
$sortordernow = "asc";
$ordersel['asc'] = ' selected="selected"';

Zeile 607Zeile 602
{
$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']}";

}


}


if($fpermissions['canviewthreads'] != 0)
{

if($fpermissions['canviewthreads'] != 0)
{

	// How many posts are there?
if(($datecut > 0 && $datecut != 9999) || isset($fpermissions['canonlyviewownthreads']) && $fpermissions['canonlyviewownthreads'] == 1)
{
$query = $db->simple_select("threads", "COUNT(tid) AS threads", "fid = '$fid' $useronly $visibleonly $datecutsql $prefixsql");
$threadcount = $db->fetch_field($query, "threads");
}
else
{
$query = $db->simple_select("forums", "threads, unapprovedthreads, deletedthreads", "fid = '{$fid}'", array('limit' => 1));
$forum_threads = $db->fetch_array($query);
$threadcount = $forum_threads['threads'];
if($ismod == true)
{
$threadcount += $forum_threads['unapprovedthreads'] + $forum_threads['deletedthreads'];
}

// If we have 0 threads double check there aren't any "moved" threads
if($threadcount == 0)
{
$query = $db->simple_select("threads", "COUNT(tid) AS threads", "fid = '$fid' $useronly $visibleonly", array('limit' => 1));
$threadcount = $db->fetch_field($query, "threads");
}
}

	// How many threads are there?
$query = $db->simple_select("threads t", "COUNT(tid) AS threads", "fid = '$fid' $tuseronly $tvisibleonly $datecutsql2 $prefixsql2");
$threadcount = $db->fetch_field($query, "threads");





















}

// How many pages are there?

}

// How many pages are there?

Zeile 906Zeile 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 917Zeile 899
		while($rating = $db->fetch_array($query))
{
$threadcache[$rating['tid']]['rated'] = 1;

		while($rating = $db->fetch_array($query))
{
$threadcache[$rating['tid']]['rated'] = 1;

		}

		}

	}

	}

}

}


// If user has moderation tools available, prepare the Select All feature
$selectall = '';


// If user has moderation tools available, prepare the Select All feature
$selectall = '';

Zeile 929Zeile 911
	$lang->select_all = $lang->sprintf($lang->select_all, (int)$threadcount);
$lang->all_selected = $lang->sprintf($lang->all_selected, (int)$threadcount);
eval("\$selectall = \"".$templates->get("forumdisplay_inlinemoderation_selectall")."\";");

	$lang->select_all = $lang->sprintf($lang->select_all, (int)$threadcount);
$lang->all_selected = $lang->sprintf($lang->all_selected, (int)$threadcount);
eval("\$selectall = \"".$templates->get("forumdisplay_inlinemoderation_selectall")."\";");

}

}


if(!empty($tids))
{
$tids = implode(",", $tids);


if(!empty($tids))
{
$tids = implode(",", $tids);

}


}


// Check participation by the current user in any of these threads - for 'dot' folder icons
if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] && !empty($threadcache))
{

// Check participation by the current user in any of these threads - for 'dot' folder icons
if($mybb->settings['dotfolders'] != 0 && $mybb->user['uid'] && !empty($threadcache))
{

Zeile 971Zeile 953
}

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

}

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

{

{

	$query = $db->simple_select("forumsread", "dateline", "fid='{$fid}' AND uid='{$mybb->user['uid']}'");
$forum_read = $db->fetch_field($query, "dateline");


	$query = $db->simple_select("forumsread", "dateline", "fid='{$fid}' AND uid='{$mybb->user['uid']}'");
$forum_read = $db->fetch_field($query, "dateline");


Zeile 1025Zeile 1007
		}

if($thread['sticky'] == 1)

		}

if($thread['sticky'] == 1)

		{

		{

			$thread_type_class = " forumdisplay_sticky";
}
else

			$thread_type_class = " forumdisplay_sticky";
}
else

Zeile 1062Zeile 1044
			if(!empty($threadprefix))
{
$thread['threadprefix'] = $threadprefix['displaystyle'].'&nbsp;';

			if(!empty($threadprefix))
{
$thread['threadprefix'] = $threadprefix['displaystyle'].'&nbsp;';

			}

			}

		}

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

		}

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

Zeile 1264Zeile 1246

if($thread['closed'] == 1)
{


if($thread['closed'] == 1)
{

			$folder .= "lock";
$folder_label .= $lang->icon_lock;

			$folder .= "close";
$folder_label .= $lang->icon_close;

		}

if($moved[0] == "moved")

		}

if($moved[0] == "moved")

Zeile 1354Zeile 1336
		if($fpermissions['canviewdeletionnotice'] != 0 && $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted"))
{
eval("\$threads .= \"".$templates->get("forumdisplay_thread_deleted")."\";");

		if($fpermissions['canviewdeletionnotice'] != 0 && $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted"))
{
eval("\$threads .= \"".$templates->get("forumdisplay_thread_deleted")."\";");

		}

		}

		else
{

		else
{

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

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

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

Zeile 1386Zeile 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))
{

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

 
				$tool['name'] = htmlspecialchars_uni($tool['name']);

				eval("\$customthreadtools .= \"".$templates->get("forumdisplay_inlinemoderation_custom_tool")."\";");

				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")."\";");

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

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

		}


		}


		if(is_moderator($fid, "canstickunstickthreads"))
{
eval("\$inlinemodstickunstick = \"".$templates->get("forumdisplay_inlinemoderation_stickunstick")."\";");

		if(is_moderator($fid, "canstickunstickthreads"))
{
eval("\$inlinemodstickunstick = \"".$templates->get("forumdisplay_inlinemoderation_stickunstick")."\";");

Zeile 1465Zeile 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 1475Zeile 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 1499Zeile 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")."\";");