Vergleich showthread.php - 1.8.4 - 1.8.9

  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,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 .= ",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 .= ",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 .= ",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";



$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";
$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,postbit_status";
$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,postbit_offline";
$templatelist .= ",forumjump_advanced,forumjump_special,forumjump_bit,postbit_quickdelete,postbit_attachments,postbit_attachments_attachment,postbit_attachments_thumbnails,postbit_attachments_images_image,postbit_attachments_images,showthread_quickreply_options_stick,showthread_classic_header";
$templatelist .= ",postbit_inlinecheck,showthread_inlinemoderation,postbit_attachments_thumbnails_thumbnail,postbit_ignored,postbit_groupimage,postbit_multiquote,showthread_moderationoptions_custom_tool,showthread_moderationoptions_custom,showthread_inlinemoderation_custom_tool,postbit_deleted";
$templatelist .= ",showthread_usersbrowsing,showthread_usersbrowsing_user,showthread_poll_option,showthread_poll,showthread_quickreply_options_signature,showthread_threaded_bitactive,showthread_threaded_bit,postbit_attachments_attachment_unapproved,showthread_threadnotes,postbit_reputation";
$templatelist .= ",showthread_moderationoptions_openclose,showthread_moderationoptions_stickunstick,showthread_moderationoptions_delete,showthread_moderationoptions_threadnotes,showthread_moderationoptions_manage,showthread_moderationoptions_deletepoll,showthread_poll_results,postbit_classic";
$templatelist .= ",postbit_userstar,postbit_reputation_formatted_link,postbit_warninglevel_formatted,postbit_quickrestore,forumdisplay_password,forumdisplay_password_wrongpass,postbit_purgespammer,showthread_inlinemoderation_approve,forumdisplay_thread_icon,showthread_poll_resultbit,postbit_warn";
$templatelist .= ",showthread_moderationoptions_softdelete,showthread_moderationoptions_restore,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,showthread_moderationoptions,showthread_inlinemoderation_standard,showthread_threadedbox,showthread_inlinemoderation_manage,postbit_away";
$templatelist .= ",showthread_ratethread,postbit_posturl,postbit_icon,postbit_editedby_editreason,attachment_icon,global_moderation_notice,showthread_poll_option_multiple,postbit_gotopost,postbit_rep_button,postbit_warninglevel,showthread_threadnoteslink,showthread_search,postbit_deleted_member";
$templatelist .= ",showthread_moderationoptions_approve,showthread_moderationoptions_unapprove,showthread_inlinemoderation_delete,showthread_moderationoptions_standard,showthread_quickreply_options_close,showthread_inlinemoderation_custom,showthread_threadnotes_viewnotes,showthread_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 44Zeile 46
		$options = array(
"limit" => 1
);

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

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

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

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

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

		
if(empty($post))


if(empty($post) || ($post['visible'] == 0 && !is_moderator($post['fid'], 'canviewunapprove')) || ($post['visible'] == -1 && !is_moderator($post['fid'], 'canviewdeleted')))

		{
// post does not exist --> show corresponding error
error($lang->error_invalidpost);

		{
// post does not exist --> show corresponding error
error($lang->error_invalidpost);

Zeile 55Zeile 57
		
$mybb->input['tid'] = $post['tid'];
}

		
$mybb->input['tid'] = $post['tid'];
}

}

}


// Get the thread details from the database.
$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));


// Get the thread details from the database.
$thread = get_thread($mybb->get_input('tid', MyBB::INPUT_INT));

Zeile 69Zeile 71
$thread['threadprefix'] = '';
$thread['displayprefix'] = '';
if($thread['prefix'] != 0)

$thread['threadprefix'] = '';
$thread['displayprefix'] = '';
if($thread['prefix'] != 0)

{

{

	$threadprefix = build_prefixes($thread['prefix']);

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

	$threadprefix = build_prefixes($thread['prefix']);

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

Zeile 94Zeile 96
{
$thread['username'] = $lang->guest;
}

{
$thread['username'] = $lang->guest;
}

 
$thread['username'] = htmlspecialchars_uni($thread['username']);


// Is the currently logged in user a moderator of this forum?
if(is_moderator($fid))


// Is the currently logged in user a moderator of this forum?
if(is_moderator($fid))

Zeile 115Zeile 118
		{
$visibleonly = " AND visible IN (-1,0,1)";
$visibleonly2 = "AND p.visible IN (-1,0,1) AND t.visible IN (-1,0,1)";

		{
$visibleonly = " AND visible IN (-1,0,1)";
$visibleonly2 = "AND p.visible IN (-1,0,1) AND t.visible IN (-1,0,1)";

		}

		}

	}

	}

}

}

else
{
$ismod = false;

else
{
$ismod = false;

 
	$visibleonly = " AND visible=1";
$visibleonly2 = "AND p.visible=1 AND t.visible=1";

}

// Make sure we are looking at a real thread here.
if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] == 0 && !is_moderator($fid, "canviewunapprove")) || ($thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted")))
{
error($lang->error_invalidthread);

}

// Make sure we are looking at a real thread here.
if(($thread['visible'] != 1 && $ismod == false) || ($thread['visible'] == 0 && !is_moderator($fid, "canviewunapprove")) || ($thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted")))
{
error($lang->error_invalidthread);

}

$forumpermissions = forum_permissions($thread['fid']);

}

$forumpermissions = forum_permissions($thread['fid']);


// Does the user have permission to view this thread?
if($forumpermissions['canview'] != 1 || $forumpermissions['canviewthreads'] != 1)


// Does the user have permission to view this thread?
if($forumpermissions['canview'] != 1 || $forumpermissions['canviewthreads'] != 1)

Zeile 138Zeile 143
}

if(isset($forumpermissions['canonlyviewownthreads']) && $forumpermissions['canonlyviewownthreads'] == 1 && $thread['uid'] != $mybb->user['uid'])

}

if(isset($forumpermissions['canonlyviewownthreads']) && $forumpermissions['canonlyviewownthreads'] == 1 && $thread['uid'] != $mybb->user['uid'])

{

{

	error_no_permission();
}


	error_no_permission();
}


Zeile 230Zeile 235
		"limit" => 1,
"order_by" => "dateline",
"order_dir" => "asc"

		"limit" => 1,
"order_by" => "dateline",
"order_dir" => "asc"

	);


	);


	$lastread = (int)$lastread;
$query = $db->simple_select("posts", "pid", "tid='{$tid}' AND dateline > '{$lastread}' {$visibleonly}", $options);
$newpost = $db->fetch_array($query);

	$lastread = (int)$lastread;
$query = $db->simple_select("posts", "pid", "tid='{$tid}' AND dateline > '{$lastread}' {$visibleonly}", $options);
$newpost = $db->fetch_array($query);

Zeile 448Zeile 453
		$now = TIME_NOW;

// If the poll or the thread is closed or if the poll is expired, show the results.

		$now = TIME_NOW;

// If the poll or the thread is closed or if the poll is expired, show the results.

		if($poll['closed'] == 1 || $thread['closed'] == 1 || ($expiretime < $now && $poll['timeout'] > 0))

		if($poll['closed'] == 1 || $thread['closed'] == 1 || ($expiretime < $now && $poll['timeout'] > 0) || $forumpermissions['canvotepolls'] != 1)

		{
$showresults = 1;
}

		{
$showresults = 1;
}

Zeile 738Zeile 743
	elseif($ismod && is_moderator($fid, "canviewdeleted") == true && is_moderator($fid, "canviewunapprove") == true)
{
$visible = "AND p.visible IN (-1,0,1)";

	elseif($ismod && is_moderator($fid, "canviewdeleted") == true && is_moderator($fid, "canviewunapprove") == true)
{
$visible = "AND p.visible IN (-1,0,1)";

 
	}
elseif($forumpermissions['canviewdeletionnotice'] != 0 && $ismod == false)
{
$visible = "AND p.visible IN (-1,1)";

	}
else
{

	}
else
{

Zeile 756Zeile 765
	{
$ignore_list = explode(',', $mybb->user['ignorelist']);
foreach($ignore_list as $uid)

	{
$ignore_list = explode(',', $mybb->user['ignorelist']);
foreach($ignore_list as $uid)

		{

		{

			$ignored_users[$uid] = 1;
}
}

			$ignored_users[$uid] = 1;
}
}

Zeile 785Zeile 794
	else if($mybb->settings['threadusenetstyle'] == 1)
{
$defaultmode = 'threaded';

	else if($mybb->settings['threadusenetstyle'] == 1)
{
$defaultmode = 'threaded';

	}

	}

	else
{
$defaultmode = 'linear';

	else
{
$defaultmode = 'linear';

Zeile 811Zeile 820
		else
{
$where = " ORDER BY dateline LIMIT 0, 1";

		else
{
$where = " ORDER BY dateline LIMIT 0, 1";

		}
$query = $db->query("

		}
$query = $db->query("

			SELECT u.*, u.username AS userusername, p.*, f.*, eu.username AS editusername
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

			SELECT u.*, u.username AS userusername, p.*, f.*, eu.username AS editusername
FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

Zeile 891Zeile 900
		if(!empty($mybb->input['pid']))
{
$post = get_post($mybb->input['pid']);

		if(!empty($mybb->input['pid']))
{
$post = get_post($mybb->input['pid']);

			if($post)





			if(empty($post) || ($post['visible'] == 0 && !is_moderator($post['fid'], 'canviewunapprove')) || ($post['visible'] == -1 && !is_moderator($post['fid'], 'canviewdeleted')))
{
$footer .= '<script type="text/javascript">$(document).ready(function() { $.jGrowl(\''.$lang->error_invalidpost.'\', {theme: \'jgrowl_error\'}); });</script>';
}
else

			{
$query = $db->query("
SELECT COUNT(p.dateline) AS count FROM ".TABLE_PREFIX."posts p

			{
$query = $db->query("
SELECT COUNT(p.dateline) AS count FROM ".TABLE_PREFIX."posts p

Zeile 1114Zeile 1127
			}
if(!$similar_thread['username'])
{

			}
if(!$similar_thread['username'])
{

				$similar_thread['username'] = $similar_thread['threadusername'];
$similar_thread['profilelink'] = $similar_thread['threadusername'];

				$similar_thread['username'] = $similar_thread['profilelink'] = htmlspecialchars_uni($similar_thread['threadusername']);


			}
else
{

			}
else
{

 
				$similar_thread['username'] = htmlspecialchars_uni($similar_thread['username']);

				$similar_thread['profilelink'] = build_profile_link($similar_thread['username'], $similar_thread['uid']);
}


				$similar_thread['profilelink'] = build_profile_link($similar_thread['username'], $similar_thread['uid']);
}


Zeile 1157Zeile 1170
		if($count)
{
eval("\$similarthreads = \"".$templates->get("showthread_similarthreads")."\";");

		if($count)
{
eval("\$similarthreads = \"".$templates->get("showthread_similarthreads")."\";");

		}

		}

	}

// Decide whether or not to show quick reply.

	}

// Decide whether or not to show quick reply.

Zeile 1295Zeile 1308
		if(is_moderator($forum['fid'], "cansoftdeleteposts"))
{
eval("\$inlinemodsoftdelete = \"".$templates->get("showthread_inlinemoderation_softdelete")."\";");

		if(is_moderator($forum['fid'], "cansoftdeleteposts"))
{
eval("\$inlinemodsoftdelete = \"".$templates->get("showthread_inlinemoderation_softdelete")."\";");

		}


		}


		if(is_moderator($forum['fid'], "canrestoreposts"))
{
eval("\$inlinemodrestore = \"".$templates->get("showthread_inlinemoderation_restore")."\";");

		if(is_moderator($forum['fid'], "canrestoreposts"))
{
eval("\$inlinemodrestore = \"".$templates->get("showthread_inlinemoderation_restore")."\";");

Zeile 1342Zeile 1355
		}

if(is_moderator($forum['fid'], "canstickunstickthreads"))

		}

if(is_moderator($forum['fid'], "canstickunstickthreads"))

		{

		{

			eval("\$stickunstickthread = \"".$templates->get("showthread_moderationoptions_stickunstick")."\";");
}


			eval("\$stickunstickthread = \"".$templates->get("showthread_moderationoptions_stickunstick")."\";");
}


Zeile 1366Zeile 1379
		{
if($thread['visible'] == 0)
{

		{
if($thread['visible'] == 0)
{

				$approveunapprovethread = "<option value=\"approvethread\">".$lang->approve_thread."</option>";

				eval("\$approveunapprovethread = \"".$templates->get("showthread_moderationoptions_approve")."\";");

			}
else
{

			}
else
{

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

				eval("\$approveunapprovethread = \"".$templates->get("showthread_moderationoptions_unapprove")."\";");

			}
}


			}
}


Zeile 1423Zeile 1436
			$add_remove_subscription = 'remove';
$add_remove_subscription_text = $lang->unsubscribe_thread;
}

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

	}





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


	$classic_header = '';
if($mybb->settings['postlayout'] == "classic")

	$classic_header = '';
if($mybb->settings['postlayout'] == "classic")

	{

	{

		eval("\$classic_header = \"".$templates->get("showthread_classic_header")."\";");
}

// Get users viewing this thread
if($mybb->settings['browsingthisthread'] != 0)

		eval("\$classic_header = \"".$templates->get("showthread_classic_header")."\";");
}

// Get users viewing this thread
if($mybb->settings['browsingthisthread'] != 0)

	{

	{

		$timecut = TIME_NOW - $mybb->settings['wolcutoff'];

		$timecut = TIME_NOW - $mybb->settings['wolcutoff'];





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

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

Zeile 1456Zeile 1471
			if($user['uid'] == 0)
{
++$guestcount;

			if($user['uid'] == 0)
{
++$guestcount;

			}

			}

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

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





				$invisiblemark = '';
if($user['invisible'] == 1)

				$invisiblemark = '';
if($user['invisible'] == 1)

				{

				{

					$invisiblemark = "*";
++$inviscount;
}

					$invisiblemark = "*";
++$inviscount;
}

Zeile 1472Zeile 1487
				if($user['invisible'] != 1 || $mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])
{
$user['profilelink'] = get_profile_link($user['uid']);

				if($user['invisible'] != 1 || $mybb->usergroup['canviewwolinvis'] == 1 || $user['uid'] == $mybb->user['uid'])
{
$user['profilelink'] = get_profile_link($user['uid']);

					$user['username'] = format_name($user['username'], $user['usergroup'], $user['displaygroup']);

					$user['username'] = format_name(htmlspecialchars_uni($user['username']), $user['usergroup'], $user['displaygroup']);

					$user['reading'] = my_date($mybb->settings['timeformat'], $user['time']);

eval("\$onlinemembers .= \"".$templates->get("showthread_usersbrowsing_user", 1, 0)."\";");
$comma = $lang->comma;
}
}

					$user['reading'] = my_date($mybb->settings['timeformat'], $user['time']);

eval("\$onlinemembers .= \"".$templates->get("showthread_usersbrowsing_user", 1, 0)."\";");
$comma = $lang->comma;
}
}

		}

		}


$guestsonline = '';
if($guestcount)


$guestsonline = '';
if($guestcount)

Zeile 1496Zeile 1511
		if($inviscount && $mybb->usergroup['canviewwolinvis'] != 1)
{
$invisonline = $lang->sprintf($lang->users_browsing_forum_invis, $inviscount);

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

		}

		}


$onlinesep = '';
if($invisonline != '' && $onlinemembers)
{
$onlinesep = $lang->comma;


$onlinesep = '';
if($invisonline != '' && $onlinemembers)
{
$onlinesep = $lang->comma;

		}

		}

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

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

Zeile 1511Zeile 1526
		}

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

		}

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

	}

	}


$plugins->run_hooks("showthread_end");



$plugins->run_hooks("showthread_end");


Zeile 1522Zeile 1537
/**
* Build a navigation tree for threaded display.
*

/**
* Build a navigation tree for threaded display.
*

 * @param unknown_type $replyto
* @param unknown_type $indent
* @return unknown

 * @param int $replyto
* @param int $indent
* @return string

 */

 */

function buildtree($replyto="0", $indent="0")

function buildtree($replyto=0, $indent=0)

{

{

	global $tree, $mybb, $theme, $mybb, $pid, $tid, $templates, $parser;

	global $tree, $mybb, $theme, $mybb, $pid, $tid, $templates, $parser, $lang;





	if($indent)
{
$indentsize = 13 * $indent;
}
else
{
$indentsize = 0;
}

	$indentsize = 13 * $indent;









++$indent;


++$indent;

 
	$posts = '';

	if(is_array($tree[$replyto]))
{
foreach($tree[$replyto] as $key => $post)

	if(is_array($tree[$replyto]))
{
foreach($tree[$replyto] as $key => $post)

Zeile 1552Zeile 1561
				$post['subject'] = "[".$lang->no_subject."]";
}


				$post['subject'] = "[".$lang->no_subject."]";
}


 
			$post['username'] = htmlspecialchars_uni($post['username']);

			$post['profilelink'] = build_profile_link($post['username'], $post['uid']);

if($mybb->input['pid'] == $post['pid'])

			$post['profilelink'] = build_profile_link($post['username'], $post['uid']);

if($mybb->input['pid'] == $post['pid'])