Vergleich newthread.php - 1.8.4 - 1.8.7

  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_nocaptcha,post_captcha_ayah,postbit_groupimage,postbit_online,postbit_away";

$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,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_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";

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

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




		}

		}

		// This username does not exist.

		// 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'])
{

Zeile 476Zeile 464
			$url = get_forum_link($fid);

// User must see moderation notice, regardless of redirect settings

			$url = get_forum_link($fid);

// User must see moderation notice, regardless of redirect settings

 
			$force_redirect = true;
}

// The thread is being made in a forum the user cannot see threads in, send them back to the forum.
else if($visible == 1 && $forumpermissions['canviewthreads'] != 1)
{
$lang->redirect_newthread .= $lang->redirect_newthread_unviewable;
$url = get_forum_link($fid);

// User must see permission notice, regardless of redirect settings

			$force_redirect = true;
}


			$force_redirect = true;
}


Zeile 494Zeile 492
			if($mybb->get_input('quoted_ids') == "all")
{
my_unsetcookie("multiquote");

			if($mybb->get_input('quoted_ids') == "all")
{
my_unsetcookie("multiquote");

			}
}

$plugins->run_hooks("newthread_do_newthread_end");

			}
}

$plugins->run_hooks("newthread_do_newthread_end");


// Hop to it! Send them to the next page.
if(!$mybb->get_input('postpoll', MyBB::INPUT_INT))


// Hop to it! Send them to the next page.
if(!$mybb->get_input('postpoll', MyBB::INPUT_INT))

Zeile 507Zeile 505
		redirect($url, $lang->redirect_newthread, "", $force_redirect);
}
}

		redirect($url, $lang->redirect_newthread, "", $force_redirect);
}
}





if($mybb->input['action'] == "newthread" || $mybb->input['action'] == "editdraft")
{
$plugins->run_hooks("newthread_start");

if($mybb->input['action'] == "newthread" || $mybb->input['action'] == "editdraft")
{
$plugins->run_hooks("newthread_start");

Zeile 554Zeile 552
			if(is_moderator($fid))
{
$visible_where = "AND p.visible != 2";

			if(is_moderator($fid))
{
$visible_where = "AND p.visible != 2";

			}
else
{

			}
else
{

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


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


Zeile 569Zeile 567
					LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)
WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}
ORDER BY p.dateline

					LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)
WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}
ORDER BY p.dateline

				");

				");

				while($quoted_post = $db->fetch_array($query))
{
if($quoted_post['userusername'])

				while($quoted_post = $db->fetch_array($query))
{
if($quoted_post['userusername'])

Zeile 580Zeile 578
					$quoted_post['message'] = preg_replace('#(^|\r|\n)/slap ([^\r\n<]*)#i', "\\1* {$quoted_post['username']} {$lang->slaps} \\2 {$lang->with_trout}", $quoted_post['message']);
$quoted_post['message'] = preg_replace("#\[attachment=([0-9]+?)\]#i", '', $quoted_post['message']);
$message .= "[quote='{$quoted_post['username']}' pid='{$quoted_post['pid']}' dateline='{$quoted_post['dateline']}']\n{$quoted_post['message']}\n[/quote]\n\n";

					$quoted_post['message'] = preg_replace('#(^|\r|\n)/slap ([^\r\n<]*)#i', "\\1* {$quoted_post['username']} {$lang->slaps} \\2 {$lang->with_trout}", $quoted_post['message']);
$quoted_post['message'] = preg_replace("#\[attachment=([0-9]+?)\]#i", '', $quoted_post['message']);
$message .= "[quote='{$quoted_post['username']}' pid='{$quoted_post['pid']}' dateline='{$quoted_post['dateline']}']\n{$quoted_post['message']}\n[/quote]\n\n";

				}


				}


				$quoted_ids = "all";
}
else

				$quoted_ids = "all";
}
else

Zeile 593Zeile 591
					WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}
");
$external_quotes = $db->fetch_field($query, 'quotes');

					WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}
");
$external_quotes = $db->fetch_field($query, 'quotes');





				if($external_quotes > 0)
{
if($external_quotes == 1)

				if($external_quotes > 0)
{
if($external_quotes == 1)

Zeile 618Zeile 616
	{
$quoted_ids = htmlspecialchars_uni($mybb->get_input('quoted_ids'));
}

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





	$postoptionschecked = array('signature' => '', 'disablesmilies' => '');
$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = '';
$postpollchecked = '';

	$postoptionschecked = array('signature' => '', 'disablesmilies' => '');
$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = '';
$postpollchecked = '';

Zeile 653Zeile 651
			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)

			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)

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

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

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

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

Zeile 688Zeile 686
		}
else if($postoptions['subscriptionmethod'] == "email")
{

		}
else if($postoptions['subscriptionmethod'] == "email")
{

			$postoptions_subscriptionmethod_email = "checked=\"checked\"";









			$postoptions_subscriptionmethod_email = "checked=\"checked\"";
}
else if($postoptions['subscriptionmethod'] == "pm")
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";

		}

		}

		else if($postoptions['subscriptionmethod'] == "pm")
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
}


	}










	// Otherwise, this is our initial visit to this page.
else
{
if($mybb->user['signature'] != '')

	// Otherwise, this is our initial visit to this page.
else
{
if($mybb->user['signature'] != '')

		{

		{

			$postoptionschecked['signature'] = " checked=\"checked\"";
}
if($mybb->user['subscriptionmethod'] == 1)
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";

			$postoptionschecked['signature'] = " checked=\"checked\"";
}
if($mybb->user['subscriptionmethod'] == 1)
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";

		}

		}

		else if($mybb->user['subscriptionmethod'] == 2)
{
$postoptions_subscriptionmethod_email = "checked=\"checked\"";

		else if($mybb->user['subscriptionmethod'] == 2)
{
$postoptions_subscriptionmethod_email = "checked=\"checked\"";

Zeile 734Zeile 732
		// 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 859Zeile 847
			if($mybb->get_input('pid', MyBB::INPUT_INT))
{
$attachwhere = "pid='".$mybb->get_input('pid', MyBB::INPUT_INT)."'";

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

			}
else

			}
else

			{
$attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'";

			{
$attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'";

			}


			}


			$query = $db->simple_select("attachments", "*", $attachwhere);
while($attachment = $db->fetch_array($query))
{

			$query = $db->simple_select("attachments", "*", $attachwhere);
while($attachment = $db->fetch_array($query))
{

Zeile 873Zeile 861

$postbit = build_postbit($post, 1);
eval("\$preview = \"".$templates->get("previewpost")."\";");


$postbit = build_postbit($post, 1);
eval("\$preview = \"".$templates->get("previewpost")."\";");

		}

		}

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

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

Zeile 909Zeile 897
	$modoptions = '';
// Show the moderator options
if(is_moderator($fid))

	$modoptions = '';
// Show the moderator options
if(is_moderator($fid))

	{

	{

		$modoptions = $mybb->get_input('modoptions', MyBB::INPUT_ARRAY);
if(isset($modoptions['closethread']) && $modoptions['closethread'] == 1)

		$modoptions = $mybb->get_input('modoptions', MyBB::INPUT_ARRAY);
if(isset($modoptions['closethread']) && $modoptions['closethread'] == 1)

		{

		{

			$closecheck = "checked=\"checked\"";
}
else
{
$closecheck = '';

			$closecheck = "checked=\"checked\"";
}
else
{
$closecheck = '';

		}

		}

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

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

		}

		}

		else
{
$stickycheck = '';

		else
{
$stickycheck = '';

Zeile 946Zeile 934
		if($mybb->input['action'] == "editdraft" || ($mybb->input['tid'] && $mybb->input['pid']))
{
$attachwhere = "pid='$pid'";

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

		}

		}

		else

		else

		{

		{

			$attachwhere = "posthash='".$db->escape_string($posthash)."'";
}
$query = $db->simple_select("attachments", "*", $attachwhere);

			$attachwhere = "posthash='".$db->escape_string($posthash)."'";
}
$query = $db->simple_select("attachments", "*", $attachwhere);

Zeile 958Zeile 946
			$attachment['size'] = get_friendly_size($attachment['filesize']);
$attachment['icon'] = get_attachment_icon(get_extension($attachment['filename']));
$attachment['filename'] = htmlspecialchars_uni($attachment['filename']);

			$attachment['size'] = get_friendly_size($attachment['filesize']);
$attachment['icon'] = get_attachment_icon(get_extension($attachment['filename']));
$attachment['filename'] = htmlspecialchars_uni($attachment['filename']);





			if($mybb->settings['bbcodeinserter'] != 0 && $forum['allowmycode'] != 0 && (!$mybb->user['uid'] || $mybb->user['showcodebuttons'] != 0))
{
eval("\$postinsert = \"".$templates->get("post_attachments_attachment_postinsert")."\";");

			if($mybb->settings['bbcodeinserter'] != 0 && $forum['allowmycode'] != 0 && (!$mybb->user['uid'] || $mybb->user['showcodebuttons'] != 0))
{
eval("\$postinsert = \"".$templates->get("post_attachments_attachment_postinsert")."\";");

Zeile 1031Zeile 1019
			// If previewing a post - check their current captcha input - if correct, hide the captcha input area
// ... but only if it's a default one, reCAPTCHA and Are You a Human must be filled in every time due to draconian limits
if($post_captcha->validate_captcha() == true)

			// If previewing a post - check their current captcha input - if correct, hide the captcha input area
// ... but only if it's a default one, reCAPTCHA and Are You a Human must be filled in every time due to draconian limits
if($post_captcha->validate_captcha() == true)

			{

			{

				$correct = true;

// Generate a hidden list of items for our captcha

				$correct = true;

// Generate a hidden list of items for our captcha

Zeile 1045Zeile 1033
			{
$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();
}

			elseif($post_captcha->type == 3)
{
$post_captcha->build_ayah();
}

if($post_captcha->html)
{
$captcha = $post_captcha->html;
}
}
else if($correct && $post_captcha->type == 2)
{
$post_captcha->build_recaptcha();

 

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


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

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

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

		{

		{

			$post_captcha->build_ayah();

			$post_captcha->build_recaptcha();


if($post_captcha->html)
{


if($post_captcha->html)
{