Vergleich newthread.php - 1.8.3 - 1.8.5

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 14Zeile 14
$templatelist = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,smilieinsert,newthread_multiquote_external,post_attachments_attachment_unapproved,newthread_disablesmilies_hidden";
$templatelist .= ",newthread_disablesmilies,newreply_modoptions,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,posticons_icon,postbit_warninglevel_formatted";
$templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,post_attachments_add,newthread_options_signature,post_prefixselect_prefix,post_prefixselect_single";

$templatelist = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,smilieinsert,newthread_multiquote_external,post_attachments_attachment_unapproved,newthread_disablesmilies_hidden";
$templatelist .= ",newthread_disablesmilies,newreply_modoptions,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,posticons_icon,postbit_warninglevel_formatted";
$templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,post_attachments_add,newthread_options_signature,post_prefixselect_prefix,post_prefixselect_single";

$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_ayah,postbit_groupimage,postbit_online,postbit_away";
$templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,postbit_author_guest,postbit_offline";

$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,member_register_regimage_ayah,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,post_captcha_ayah,postbit_groupimage,postbit_online,postbit_away";
$templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,postbit_author_guest,postbit_offline,postbit_icon,postbit_userstar";

$templatelist .= ",postbit_signature,postbit_classic,postbit,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved,post_attachments_update";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_gotopost,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,attachment_icon,postbit_reputation_formatted_link,global_moderation_notice";


$templatelist .= ",postbit_signature,postbit_classic,postbit,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved,post_attachments_update";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_gotopost,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,attachment_icon,postbit_reputation_formatted_link,global_moderation_notice";


Zeile 28Zeile 28

$tid = $pid = 0;
$mybb->input['action'] = $mybb->get_input('action');


$tid = $pid = 0;
$mybb->input['action'] = $mybb->get_input('action');

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

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

if($mybb->input['action'] == "editdraft" || ($mybb->get_input('savedraft') && $mybb->input['tid']) || ($mybb->input['tid'] && $mybb->input['pid']))
{
$thread = get_thread($mybb->input['tid']);


if($mybb->input['action'] == "editdraft" || ($mybb->get_input('savedraft') && $mybb->input['tid']) || ($mybb->input['tid'] && $mybb->input['pid']))
{
$thread = get_thread($mybb->input['tid']);


	$query = $db->simple_select("posts", "*", "tid='".$mybb->get_input('tid', 1)."' AND visible='-2'", array('order_by' => 'dateline', 'limit' => 1));

	$query = $db->simple_select("posts", "*", "tid='".$mybb->get_input('tid', MyBB::INPUT_INT)."' AND visible='-2'", array('order_by' => 'dateline', 'limit' => 1));

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

if(!$thread['tid'] || !$post['pid'] || $thread['visible'] != -2 || $thread['uid'] != $mybb->user['uid'])

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

if(!$thread['tid'] || !$post['pid'] || $thread['visible'] != -2 || $thread['uid'] != $mybb->user['uid'])

Zeile 49Zeile 49
}
else
{

}
else
{

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

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

	$editdraftpid = '';
}


	$editdraftpid = '';
}


Zeile 146Zeile 146
	$mybb->input['posthash'] = md5($mybb->user['uid'].random_str());
}


	$mybb->input['posthash'] = md5($mybb->user['uid'].random_str());
}


if((empty($_POST) && empty($_FILES)) && $mybb->get_input('processed', 1) == 1)

if((empty($_POST) && empty($_FILES)) && $mybb->get_input('processed', MyBB::INPUT_INT) == 1)

{
error($lang->error_cannot_upload_php_post);
}

{
error($lang->error_cannot_upload_php_post);
}

Zeile 155Zeile 155
$maximageserror = $attacherror = '';

// Handle attachments if we've got any.

$maximageserror = $attacherror = '';

// Handle attachments if we've got any.

if($mybb->settings['enableattachments'] == 1 && !$mybb->get_input('attachmentaid', 1) && ($mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || ($mybb->input['action'] == "do_newthread" && $mybb->get_input('submit') && $_FILES['attachment'])))

if($mybb->settings['enableattachments'] == 1 && !$mybb->get_input('attachmentaid', MyBB::INPUT_INT) && ($mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || ($mybb->input['action'] == "do_newthread" && $mybb->get_input('submit') && $_FILES['attachment'])))

{
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));

{
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));

Zeile 212Zeile 212
}

// Are we removing an attachment from the thread?

}

// Are we removing an attachment from the thread?

if($mybb->settings['enableattachments'] == 1 && $mybb->get_input('attachmentaid', 1) && $mybb->get_input('attachmentact') == "remove")

if($mybb->settings['enableattachments'] == 1 && $mybb->get_input('attachmentaid', MyBB::INPUT_INT) && $mybb->get_input('attachmentact') == "remove")

{
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));

require_once MYBB_ROOT."inc/functions_upload.php";

{
// Verify incoming POST request
verify_post_check($mybb->get_input('my_post_key'));

require_once MYBB_ROOT."inc/functions_upload.php";

	remove_attachment($pid, $mybb->get_input('posthash'), $mybb->get_input('attachmentaid', 1));

	remove_attachment($pid, $mybb->get_input('posthash'), $mybb->get_input('attachmentaid', MyBB::INPUT_INT));

	if(!$mybb->get_input('submit'))
{
$mybb->input['action'] = "newthread";

	if(!$mybb->get_input('submit'))
{
$mybb->input['action'] = "newthread";

Zeile 252Zeile 252
	// If this isn't a logged in user, then we need to do some special validation.
if($mybb->user['uid'] == 0)
{

	// If this isn't a logged in user, then we need to do some special validation.
if($mybb->user['uid'] == 0)
{

		$username = htmlspecialchars_uni($mybb->get_input('username'));

// Check if username exists.
if(username_exists($mybb->get_input('username')))
{
// If it does throw back "username is taken"
error($lang->error_usernametaken);
}
// This username does not exist.

		// If they didn't specify a username then give them "Guest"
if(!$mybb->get_input('username'))
{
$username = $lang->guest;
}
// Otherwise use the name they specified.




		else
{

		else
{

			// If they didn't specify a username then give them "Guest"
if(!$mybb->get_input('username'))
{
$username = $lang->guest;
}
// Otherwise use the name they specified.
else
{
$username = htmlspecialchars_uni($mybb->get_input('username'));
}
$uid = 0;

			$username = $mybb->get_input('username');











		}

		}

 
		$uid = 0;


if(!$mybb->user['uid'] && $mybb->settings['stopforumspam_on_newthread'])


if(!$mybb->user['uid'] && $mybb->settings['stopforumspam_on_newthread'])

		{

		{

			require_once MYBB_ROOT . '/inc/class_stopforumspamchecker.php';

$stop_forum_spam_checker = new StopForumSpamChecker(

			require_once MYBB_ROOT . '/inc/class_stopforumspamchecker.php';

$stop_forum_spam_checker = new StopForumSpamChecker(

Zeile 291Zeile 279

try {
if($stop_forum_spam_checker->is_user_a_spammer($mybb->get_input('username'), '', get_ip()))


try {
if($stop_forum_spam_checker->is_user_a_spammer($mybb->get_input('username'), '', get_ip()))

				{
$errors[] = $lang->error_stop_forum_spam_spammer;





				{
$errors[] = $lang->sprintf($lang->error_stop_forum_spam_spammer,
$stop_forum_spam_checker->getErrorText(array(
'stopforumspam_check_usernames',
'stopforumspam_check_ips'
)));

				}
}
catch (Exception $e)

				}
}
catch (Exception $e)

Zeile 327Zeile 319
		if($duplicate_check)
{
error($lang->error_post_already_submitted);

		if($duplicate_check)
{
error($lang->error_post_already_submitted);

		}
}

		}
}


// Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";


// Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";

Zeile 339Zeile 331
	$new_thread = array(
"fid" => $forum['fid'],
"subject" => $mybb->get_input('subject'),

	$new_thread = array(
"fid" => $forum['fid'],
"subject" => $mybb->get_input('subject'),

		"prefix" => $mybb->get_input('threadprefix', 1),
"icon" => $mybb->get_input('icon', 1),

		"prefix" => $mybb->get_input('threadprefix', MyBB::INPUT_INT),
"icon" => $mybb->get_input('icon', MyBB::INPUT_INT),

		"uid" => $uid,
"username" => $username,
"message" => $mybb->get_input('message'),

		"uid" => $uid,
"username" => $username,
"message" => $mybb->get_input('message'),

Zeile 369Zeile 361
		$new_thread['tid'] = $thread['tid'];
}


		$new_thread['tid'] = $thread['tid'];
}


	$postoptions = $mybb->get_input('postoptions', 2);

	$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

	if(!isset($postoptions['signature']))
{
$postoptions['signature'] = 0;

	if(!isset($postoptions['signature']))
{
$postoptions['signature'] = 0;

Zeile 391Zeile 383
	);

// Apply moderation options if we have them

	);

// Apply moderation options if we have them

	$new_thread['modoptions'] = $mybb->get_input('modoptions', 2);

	$new_thread['modoptions'] = $mybb->get_input('modoptions', MyBB::INPUT_ARRAY);


$posthandler->set_data($new_thread);



$posthandler->set_data($new_thread);


Zeile 458Zeile 450
		}

// A poll was being posted with this thread, throw them to poll posting page.

		}

// A poll was being posted with this thread, throw them to poll posting page.

		else if($mybb->get_input('postpoll', 1) && $forumpermissions['canpostpolls'])

		else if($mybb->get_input('postpoll', MyBB::INPUT_INT) && $forumpermissions['canpostpolls'])

		{

		{

			$url = "polls.php?action=newpoll&tid=$tid&polloptions=".$mybb->get_input('numpolloptions', 1);

			$url = "polls.php?action=newpoll&tid=$tid&polloptions=".$mybb->get_input('numpolloptions', MyBB::INPUT_INT);

			$lang->redirect_newthread .= $lang->redirect_newthread_poll;
}


			$lang->redirect_newthread .= $lang->redirect_newthread_poll;
}


Zeile 496Zeile 488
		$plugins->run_hooks("newthread_do_newthread_end");

// Hop to it! Send them to the next page.

		$plugins->run_hooks("newthread_do_newthread_end");

// Hop to it! Send them to the next page.

		if(!$mybb->get_input('postpoll', 1))

		if(!$mybb->get_input('postpoll', MyBB::INPUT_INT))

		{
$lang->redirect_newthread .= $lang->sprintf($lang->redirect_return_forum, get_forum_link($fid));
}

		{
$lang->redirect_newthread .= $lang->sprintf($lang->redirect_return_forum, get_forum_link($fid));
}

Zeile 556Zeile 548
				$visible_where = "AND p.visible > 0";
}


				$visible_where = "AND p.visible > 0";
}


			if($mybb->get_input('load_all_quotes', 1) == 1)

			if($mybb->get_input('load_all_quotes', MyBB::INPUT_INT) == 1)

			{
$query = $db->query("
SELECT p.subject, p.message, p.pid, p.tid, p.username, p.dateline, u.username AS userusername

			{
$query = $db->query("
SELECT p.subject, p.message, p.pid, p.tid, p.username, p.dateline, u.username AS userusername

Zeile 625Zeile 617
	// c -> adding a new attachment
// d -> have errors from posting


	// c -> adding a new attachment
// d -> have errors from posting


	if(!empty($mybb->input['previewpost']) || $mybb->get_input('attachmentaid', 1) || $mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || $thread_errors)

	if(!empty($mybb->input['previewpost']) || $mybb->get_input('attachmentaid', MyBB::INPUT_INT) || $mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || $thread_errors)

	{

	{

		$postoptions = $mybb->get_input('postoptions', 2);

		$postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

		if(isset($postoptions['signature']) && $postoptions['signature'] == 1)
{
$postoptionschecked['signature'] = " checked=\"checked\"";

		if(isset($postoptions['signature']) && $postoptions['signature'] == 1)
{
$postoptionschecked['signature'] = " checked=\"checked\"";

Zeile 652Zeile 644
		{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}

		{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}

		if($mybb->get_input('postpoll', 1) == 1)

		if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1)

		{
$postpollchecked = "checked=\"checked\"";
}

		{
$postpollchecked = "checked=\"checked\"";
}

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

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

	}

// Editing a draft thread

	}

// Editing a draft thread

Zeile 730Zeile 722
		// If this isn't a logged in user, then we need to do some special validation.
if($mybb->user['uid'] == 0)
{

		// If this isn't a logged in user, then we need to do some special validation.
if($mybb->user['uid'] == 0)
{

			// Check if username exists.
if(username_exists($mybb->get_input('username')))
{
// If it does throw back "username is taken"
error($lang->error_usernametaken);
}
// This username does not exist.

			// If they didn't specify a username then give them "Guest"
if(!$mybb->get_input('username'))
{
$username = $lang->guest;
}
// Otherwise use the name they specified.


			else
{

			else
{

				// If they didn't specify a username then give them "Guest"
if(!$mybb->get_input('username'))
{
$username = $lang->guest;
}
// Otherwise use the name they specified.
else
{
$username = htmlspecialchars_uni($mybb->get_input('username'));
}
$uid = 0;

				$username = $mybb->get_input('username');











			}

			}

 
			$uid = 0;

		}
// This user is logged in.
else

		}
// This user is logged in.
else

Zeile 767Zeile 749
		// Set the thread data that came from the input to the $thread array.
$new_thread = array(
"fid" => $forum['fid'],

		// Set the thread data that came from the input to the $thread array.
$new_thread = array(
"fid" => $forum['fid'],

			"prefix" => $mybb->get_input('threadprefix', 1),

			"prefix" => $mybb->get_input('threadprefix', MyBB::INPUT_INT),

			"subject" => $mybb->get_input('subject'),
"icon" => $mybb->get_input('icon'),
"uid" => $uid,

			"subject" => $mybb->get_input('subject'),
"icon" => $mybb->get_input('icon'),
"uid" => $uid,

Zeile 835Zeile 817
			$previewmessage = $mybb->get_input('message');
$post['message'] = $previewmessage;
$post['subject'] = $mybb->get_input('subject');

			$previewmessage = $mybb->get_input('message');
$post['message'] = $previewmessage;
$post['subject'] = $mybb->get_input('subject');

			$post['icon'] = $mybb->get_input('icon', 1);
$mybb->input['postoptions'] = $mybb->get_input('postoptions', 2);

			$post['icon'] = $mybb->get_input('icon', MyBB::INPUT_INT);
$mybb->input['postoptions'] = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);

			if(isset($mybb->input['postoptions']['disablesmilies']))
{
$post['smilieoff'] = $mybb->input['postoptions']['disablesmilies'];

			if(isset($mybb->input['postoptions']['disablesmilies']))
{
$post['smilieoff'] = $mybb->input['postoptions']['disablesmilies'];

Zeile 852Zeile 834
			}

// Fetch attachments assigned to this post

			}

// Fetch attachments assigned to this post

			if($mybb->get_input('pid', 1))

			if($mybb->get_input('pid', MyBB::INPUT_INT))

			{

			{

				$attachwhere = "pid='".$mybb->get_input('pid', 1)."'";

				$attachwhere = "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'";

			}
else
{

			}
else
{

Zeile 875Zeile 857
	}

// Removing an attachment or adding a new one, or showing thread errors.

	}

// Removing an attachment or adding a new one, or showing thread errors.

	else if($mybb->get_input('attachmentaid', 1) || $mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || $thread_errors)

	else if($mybb->get_input('attachmentaid', MyBB::INPUT_INT) || $mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || $thread_errors)

	{
$message = htmlspecialchars_uni($mybb->get_input('message'));
$subject = htmlspecialchars_uni($mybb->get_input('subject'));
}

// Generate thread prefix selector

	{
$message = htmlspecialchars_uni($mybb->get_input('message'));
$subject = htmlspecialchars_uni($mybb->get_input('subject'));
}

// Generate thread prefix selector

	if(!$mybb->get_input('threadprefix', 1))

	if(!$mybb->get_input('threadprefix', MyBB::INPUT_INT))

	{
$mybb->input['threadprefix'] = 0;
}


	{
$mybb->input['threadprefix'] = 0;
}


	$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', 1));

	$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', MyBB::INPUT_INT));


$posthash = htmlspecialchars_uni($mybb->get_input('posthash'));



$posthash = htmlspecialchars_uni($mybb->get_input('posthash'));


Zeile 906Zeile 888
	// Show the moderator options
if(is_moderator($fid))
{

	// Show the moderator options
if(is_moderator($fid))
{

		$modoptions = $mybb->get_input('modoptions', 2);

		$modoptions = $mybb->get_input('modoptions', MyBB::INPUT_ARRAY);

		if(isset($modoptions['closethread']) && $modoptions['closethread'] == 1)
{
$closecheck = "checked=\"checked\"";

		if(isset($modoptions['closethread']) && $modoptions['closethread'] == 1)
{
$closecheck = "checked=\"checked\"";

Zeile 1041Zeile 1023
			{
$post_captcha->build_captcha();
}

			{
$post_captcha->build_captcha();
}

			elseif($post_captcha->type == 2)

			elseif($post_captcha->type == 2 || $post_captcha->type == 4)

			{
$post_captcha->build_recaptcha();
}

			{
$post_captcha->build_recaptcha();
}

Zeile 1055Zeile 1037
				$captcha = $post_captcha->html;
}
}

				$captcha = $post_captcha->html;
}
}

		else if($correct && $post_captcha->type == 2)

		else if($correct && ($post_captcha->type == 2 || $post_captcha->type == 4))

		{
$post_captcha->build_recaptcha();


		{
$post_captcha->build_recaptcha();