Vergleich showthread.php - 1.8.0 - 1.8.4

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 11Zeile 11
define("IN_MYBB", 1);
define('THIS_SCRIPT', 'showthread.php');


define("IN_MYBB", 1);
define('THIS_SCRIPT', 'showthread.php');


$templatelist = "showthread,postbit,postbit_author_user,postbit_author_guest,showthread_newthread,showthread_newreply,showthread_newreply_closed,postbit_avatar,postbit_find,postbit_pm,postbit_www,postbit_email,postbit_edit,postbit_quote,postbit_report,postbit_signature,postbit_online,postbit_offline,postbit_away,postbit_gotopost,showthread_ratethread";
$templatelist .= ",multipage,multipage_breadcrumb,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start,showthread_inlinemoderation_softdelete,showthread_inlinemoderation_restore,showthread_inlinemoderation_delete,showthread_inlinemoderation_manage,showthread_quickreply_options_close,showthread_quickreply_options_stick";

$templatelist = "showthread,postbit,postbit_author_user,postbit_author_guest,showthread_newthread,showthread_newreply,showthread_newreply_closed,postbit_avatar,postbit_find,postbit_pm,postbit_www,postbit_email,postbit_edit,postbit_quote,postbit_report,postbit_signature,postbit_online,postbit_offline,postbit_away,showthread_ratethread";
$templatelist .= ",multipage,multipage_breadcrumb,multipage_end,multipage_jump_page,multipage_nextpage,multipage_page,multipage_page_current,multipage_page_link_current,multipage_prevpage,multipage_start,showthread_inlinemoderation_softdelete,showthread_inlinemoderation_restore,showthread_inlinemoderation_delete,postbit_posturl,postbit_icon";

$templatelist .= ",postbit_editedby,showthread_similarthreads,showthread_similarthreads_bit,postbit_iplogged_show,postbit_iplogged_hiden,postbit_profilefield,showthread_quickreply,showthread_add_poll,showthread_send_thread,showthread_poll_editpoll,showthread_poll_undovote,showthread_moderationoptions_standard,postbit_editedby_editreason";

$templatelist .= ",postbit_editedby,showthread_similarthreads,showthread_similarthreads_bit,postbit_iplogged_show,postbit_iplogged_hiden,postbit_profilefield,showthread_quickreply,showthread_add_poll,showthread_send_thread,showthread_poll_editpoll,showthread_poll_undovote,showthread_moderationoptions_standard,postbit_editedby_editreason";

$templatelist .= ",forumjump_advanced,forumjump_special,forumjump_bit,showthread_multipage,postbit_reputation,postbit_quickdelete,postbit_attachments,postbit_attachments_attachment,postbit_attachments_thumbnails,postbit_attachments_images_image,postbit_attachments_images,postbit_posturl,postbit_rep_button,showthread_inlinemoderation_standard";

$templatelist .= ",forumjump_advanced,forumjump_special,forumjump_bit,postbit_reputation,postbit_quickdelete,postbit_attachments,postbit_attachments_attachment,postbit_attachments_thumbnails,postbit_attachments_images_image,postbit_attachments_images,showthread_quickreply_options_stick,showthread_quickreply_options_close,attachment_icon";

$templatelist .= ",postbit_inlinecheck,showthread_inlinemoderation,postbit_attachments_thumbnails_thumbnail,postbit_ignored,postbit_groupimage,postbit_multiquote,showthread_search,showthread_moderationoptions_custom_tool,showthread_moderationoptions_custom,showthread_inlinemoderation_custom_tool,showthread_inlinemoderation_custom";

$templatelist .= ",postbit_inlinecheck,showthread_inlinemoderation,postbit_attachments_thumbnails_thumbnail,postbit_ignored,postbit_groupimage,postbit_multiquote,showthread_search,showthread_moderationoptions_custom_tool,showthread_moderationoptions_custom,showthread_inlinemoderation_custom_tool,showthread_inlinemoderation_custom";

$templatelist .= ",showthread_usersbrowsing,showthread_usersbrowsing_user,showthread_poll_option_multiple,showthread_poll_option,showthread_poll,showthread_threadedbox,showthread_quickreply_options_signature,showthread_threaded_bitactive,showthread_threaded_bit,postbit_attachments_attachment_unapproved,showthread_threadnotes,showthread_threadnotes_viewnotes";

$templatelist .= ",showthread_usersbrowsing,showthread_usersbrowsing_user,showthread_poll_option_multiple,showthread_poll_option,showthread_poll,showthread_quickreply_options_signature,showthread_threaded_bitactive,showthread_threaded_bit,postbit_attachments_attachment_unapproved,showthread_threadnotes,showthread_threadnotes_viewnotes";

$templatelist .= ",showthread_moderationoptions_openclose,showthread_moderationoptions_stickunstick,showthread_moderationoptions_delete,showthread_moderationoptions_threadnotes,showthread_moderationoptions_manage,showthread_moderationoptions_deletepoll,showthread_threadnoteslink,showthread_poll_results,showthread_classic_header,postbit_warn";

$templatelist .= ",showthread_moderationoptions_openclose,showthread_moderationoptions_stickunstick,showthread_moderationoptions_delete,showthread_moderationoptions_threadnotes,showthread_moderationoptions_manage,showthread_moderationoptions_deletepoll,showthread_threadnoteslink,showthread_poll_results,showthread_classic_header,postbit_warn";

$templatelist .= ",postbit_userstar,postbit_reputation_formatted_link,postbit_warninglevel_formatted,postbit_quickrestore,forumdisplay_password,forumdisplay_password_wrongpass,postbit_classic,postbit_purgespammer,showthread_inlinemoderation_approve,showthread_moderationoptions,forumdisplay_thread_icon,postbit_warninglevel,showthread_poll_resultbit,global_moderation_notice";


$templatelist .= ",postbit_userstar,postbit_reputation_formatted_link,postbit_warninglevel_formatted,postbit_quickrestore,forumdisplay_password,forumdisplay_password_wrongpass,postbit_classic,postbit_purgespammer,showthread_inlinemoderation_approve,forumdisplay_thread_icon,showthread_poll_resultbit,postbit_warninglevel,postbit_gotopost";
$templatelist .= ",showthread_moderationoptions_softdelete,showthread_moderationoptions_restore,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,showthread_moderationoptions,showthread_inlinemoderation_standard,showthread_threadedbox,postbit_rep_button,showthread_inlinemoderation_manage,global_moderation_notice";


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 33Zeile 34
if(!empty($mybb->input['pid']) && !isset($mybb->input['tid']))
{
// see if we already have the post information

if(!empty($mybb->input['pid']) && !isset($mybb->input['tid']))
{
// see if we already have the post information

	if(isset($style) && $style['pid'] == $mybb->get_input('pid', 1) && $style['tid'])

	if(isset($style) && $style['pid'] == $mybb->get_input('pid', MyBB::INPUT_INT) && $style['tid'])

	{
$mybb->input['tid'] = $style['tid'];
unset($style['tid']); // stop the thread caching code from being tricked

	{
$mybb->input['tid'] = $style['tid'];
unset($style['tid']); // stop the thread caching code from being tricked

Zeile 43Zeile 44
		$options = array(
"limit" => 1
);

		$options = array(
"limit" => 1
);

		$query = $db->simple_select("posts", "tid", "pid=".$mybb->get_input('pid', 1), $options);

		$query = $db->simple_select("posts", "tid", "pid=".$mybb->get_input('pid', MyBB::INPUT_INT), $options);

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

if(empty($post))

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

if(empty($post))

Zeile 57Zeile 58
}

// Get the thread details from the database.

}

// Get the thread details from the database.

$thread = get_thread($mybb->get_input('tid', 1));

$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));


if(!$thread || substr($thread['closed'], 0, 6) == "moved|")
{


if(!$thread || substr($thread['closed'], 0, 6) == "moved|")
{

Zeile 73Zeile 74

if(!empty($threadprefix['prefix']))
{


if(!empty($threadprefix['prefix']))
{

		$thread['threadprefix'] = $threadprefix['prefix'].' ';

		$thread['threadprefix'] = htmlspecialchars_uni($threadprefix['prefix']).' ';

		$thread['displayprefix'] = $threadprefix['displaystyle'].' ';
}
}

		$thread['displayprefix'] = $threadprefix['displaystyle'].' ';
}
}

Zeile 349Zeile 350
	exit;
}


	exit;
}


$pid = $mybb->input['pid'] = $mybb->get_input('pid', 1);

$pid = $mybb->input['pid'] = $mybb->get_input('pid', MyBB::INPUT_INT);


// Forumdisplay cache
$forum_stats = $cache->read("forumsdisplay");


// Forumdisplay cache
$forum_stats = $cache->read("forumsdisplay");

Zeile 882Zeile 883
		// Figure out if we need to display multiple pages.
$page = 1;
$perpage = $mybb->settings['postsperpage'];

		// Figure out if we need to display multiple pages.
$page = 1;
$perpage = $mybb->settings['postsperpage'];

		if($mybb->get_input('page', 1) && $mybb->get_input('page') != "last")

		if($mybb->get_input('page', MyBB::INPUT_INT) && $mybb->get_input('page') != "last")

		{

		{

			$page = $mybb->get_input('page', 1);

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

		}

if(!empty($mybb->input['pid']))

		}

if(!empty($mybb->input['pid']))

Zeile 997Zeile 998
        }

$multipage = multipage($postcount, $perpage, $page, str_replace("{tid}", $tid, THREAD_URL_PAGED.$highlight.$threadmode));

        }

$multipage = multipage($postcount, $perpage, $page, str_replace("{tid}", $tid, THREAD_URL_PAGED.$highlight.$threadmode));

		if($postcount > $perpage)
{
eval("\$threadpages = \"".$templates->get("showthread_multipage")."\";");
}

 

// Lets get the pids of the posts on this page.
$pids = "";


// Lets get the pids of the posts on this page.
$pids = "";

Zeile 1022Zeile 1019
		if($pids)
{
$pids = "pid IN($pids)";

		if($pids)
{
$pids = "pid IN($pids)";





			$attachcache = array();
if($mybb->settings['enableattachments'] == 1 && $thread['attachmentcount'] > 0 || is_moderator($fid, 'caneditposts'))
{

			$attachcache = array();
if($mybb->settings['enableattachments'] == 1 && $thread['attachmentcount'] > 0 || is_moderator($fid, 'caneditposts'))
{

Zeile 1059Zeile 1056
			}
$posts .= build_postbit($post);
$post = '';

			}
$posts .= build_postbit($post);
$post = '';

		}

		}

		$plugins->run_hooks("showthread_linear");
}


		$plugins->run_hooks("showthread_linear");
}


Zeile 1106Zeile 1103
			if($similar_thread['icon'] > 0 && $icon_cache[$similar_thread['icon']])
{
$icon = $icon_cache[$similar_thread['icon']];

			if($similar_thread['icon'] > 0 && $icon_cache[$similar_thread['icon']])
{
$icon = $icon_cache[$similar_thread['icon']];

 
				$icon['path'] = str_replace("{theme}", $theme['imgdir'], $icon['path']);
$icon['path'] = htmlspecialchars_uni($icon['path']);
$icon['name'] = htmlspecialchars_uni($icon['name']);

				eval("\$icon = \"".$templates->get("forumdisplay_thread_icon")."\";");
}
else

				eval("\$icon = \"".$templates->get("forumdisplay_thread_icon")."\";");
}
else

Zeile 1177Zeile 1177
			if($post_captcha->html)
{
$captcha = $post_captcha->html;

			if($post_captcha->html)
{
$captcha = $post_captcha->html;

			}
}


			}
}


		$postoptionschecked = array('signature' => '', 'emailnotify' => '');
if($mybb->user['signature'])
{

		$postoptionschecked = array('signature' => '', 'emailnotify' => '');
if($mybb->user['signature'])
{

Zeile 1247Zeile 1247

if(is_moderator($forum['fid'], "canusecustomtools") && (!empty($forum_stats[-1]['modtools']) || !empty($forum_stats[$forum['fid']]['modtools'])))
{


if(is_moderator($forum['fid'], "canusecustomtools") && (!empty($forum_stats[-1]['modtools']) || !empty($forum_stats[$forum['fid']]['modtools'])))
{

 
			$gids = explode(',', $mybb->user['additionalgroups']);
$gids[] = $mybb->user['usergroup'];
$gids = array_filter(array_unique($gids));

			switch($db->type)
{
case "pgsql":
case "sqlite":

			switch($db->type)
{
case "pgsql":
case "sqlite":

					$query = $db->simple_select("modtools", "tid, name, type", "','||forums||',' LIKE '%,$fid,%' OR ','||forums||',' LIKE '%,-1,%' OR forums=''");






					foreach($gids as $gid)
{
$gid = (int)$gid;
$gidswhere .= " OR ','||groups||',' LIKE '%,{$gid},%'";
}
$query = $db->simple_select("modtools", 'tid, name, type', "(','||forums||',' LIKE '%,$fid,%' OR ','||forums||',' LIKE '%,-1,%' OR forums='') AND (groups='' OR ','||groups||',' LIKE '%,-1,%'{$gidswhere})");

					break;
default:

					break;
default:

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






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

					break;
}


					break;
}


Zeile 1359Zeile 1372
			{
$approveunapprovethread = "<option value=\"unapprovethread\">".$lang->unapprove_thread."</option>";
}

			{
$approveunapprovethread = "<option value=\"unapprovethread\">".$lang->unapprove_thread."</option>";
}

		}

if(is_moderator($forum['fid'], "cansoftdeletethreads"))
{
if($thread['visible'] == -1)
{
$softdeletethread = "<option value=\"restorethread\">".$lang->restore_thread."</option>";
}
else
{
$softdeletethread = "<option value=\"softdeletethread\">".$lang->soft_delete_thread."</option>";
}

		}

if(is_moderator($forum['fid'], "cansoftdeletethreads") && $thread['visible'] != -1)
{
eval("\$softdeletethread = \"".$templates->get("showthread_moderationoptions_softdelete")."\";");
}
elseif(is_moderator($forum['fid'], "canrestorethreads") && $thread['visible'] == -1)
{
eval("\$softdeletethread = \"".$templates->get("showthread_moderationoptions_restore")."\";");




		}

if(!empty($openclosethread) || !empty($stickunstickthread) || !empty($deletethread) || !empty($managethread) || !empty($adminpolloptions) || !empty($approveunapprovethread) || !empty($softdeletethread))

		}

if(!empty($openclosethread) || !empty($stickunstickthread) || !empty($deletethread) || !empty($managethread) || !empty($adminpolloptions) || !empty($approveunapprovethread) || !empty($softdeletethread))

Zeile 1380Zeile 1390

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


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

		{

		{

			eval("\$moderationoptions = \"".$templates->get("showthread_moderationoptions")."\";");
}
}

			eval("\$moderationoptions = \"".$templates->get("showthread_moderationoptions")."\";");
}
}

Zeile 1388Zeile 1398
	// Display 'send thread' link if permissions allow
$sendthread = '';
if($mybb->usergroup['cansendemail'] == 1)

	// Display 'send thread' link if permissions allow
$sendthread = '';
if($mybb->usergroup['cansendemail'] == 1)

	{

	{

		eval("\$sendthread = \"".$templates->get("showthread_send_thread")."\";");
}


		eval("\$sendthread = \"".$templates->get("showthread_send_thread")."\";");
}


Zeile 1403Zeile 1413
	// Subscription status
$add_remove_subscription = 'add';
$add_remove_subscription_text = $lang->subscribe_thread;

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





	if($mybb->user['uid'])
{
$query = $db->simple_select("threadsubscriptions", "tid", "tid='".(int)$tid."' AND uid='".(int)$mybb->user['uid']."'", array('limit' => 1));

	if($mybb->user['uid'])
{
$query = $db->simple_select("threadsubscriptions", "tid", "tid='".(int)$tid."' AND uid='".(int)$mybb->user['uid']."'", array('limit' => 1));

Zeile 1425Zeile 1435
	if($mybb->settings['browsingthisthread'] != 0)
{
$timecut = TIME_NOW - $mybb->settings['wolcutoff'];

	if($mybb->settings['browsingthisthread'] != 0)
{
$timecut = TIME_NOW - $mybb->settings['wolcutoff'];





		$comma = '';
$guestcount = 0;
$membercount = 0;

		$comma = '';
$guestcount = 0;
$membercount = 0;

Zeile 1440Zeile 1450
			WHERE s.time > '$timecut' AND location2='$tid' AND nopermission != 1
ORDER BY u.username ASC, s.time DESC
");

			WHERE s.time > '$timecut' AND location2='$tid' AND nopermission != 1
ORDER BY u.username ASC, s.time DESC
");





		while($user = $db->fetch_array($query))
{
if($user['uid'] == 0)

		while($user = $db->fetch_array($query))
{
if($user['uid'] == 0)

Zeile 1469Zeile 1479
					$comma = $lang->comma;
}
}

					$comma = $lang->comma;
}
}

		}


		}


		$guestsonline = '';
if($guestcount)

		$guestsonline = '';
if($guestcount)

		{

		{

			$guestsonline = $lang->sprintf($lang->users_browsing_thread_guests, $guestcount);

			$guestsonline = $lang->sprintf($lang->users_browsing_thread_guests, $guestcount);

 
		}

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

		}

$onlinesep = '';

		}

$onlinesep = '';

		if($guestcount && $onlinemembers)

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

		{
$onlinesep = $lang->comma;
}

		{
$onlinesep = $lang->comma;
}


$invisonline = '';
if($inviscount && $mybb->usergroup['canviewwolinvis'] != 1 && ($inviscount != 1 && $mybb->user['invisible'] != 1))
{
$invisonline = $lang->sprintf($lang->users_browsing_thread_invis, $inviscount);
}


		







		$onlinesep2 = '';

		$onlinesep2 = '';

		if($invisonline != '' && $guestcount)

		if($invisonline != '' && $guestcount || $onlinemembers && $guestcount)

		{
$onlinesep2 = $lang->comma;
}

		{
$onlinesep2 = $lang->comma;
}