Vergleich newthread.php - 1.8.4 - 1.8.10

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


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


$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 .= ",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 = "newthread,previewpost,loginbox,changeuserbox,newthread_postpoll,posticons,codebuttons,postbit,post_attachments_attachment_unapproved,newreply_modoptions_close,newreply_modoptions_stick";
$templatelist .= ",newthread_disablesmilies,post_attachments_new,post_attachments,post_savedraftbutton,post_subscription_method,post_attachments_attachment_remove,postbit_warninglevel_formatted,postbit_icon";
$templatelist .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,newthread_signature,post_prefixselect_prefix,post_prefixselect_single";
$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,postbit_gotopost,newthread_postoptions";
$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";
$templatelist .= ",postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_reputation_formatted_link,post_attachments_update,postbit_offline,newreply_modoptions,posticons_icon";
$templatelist .= ",newthread_draftinput,global_moderation_notice,postbit_online,postbit_away,attachment_icon,postbit_userstar,newthread_multiquote_external,postbit_groupimage,post_attachments_add";


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 45Zeile 46
	$pid = $post['pid'];
$fid = $thread['fid'];
$tid = $thread['tid'];

	$pid = $post['pid'];
$fid = $thread['fid'];
$tid = $thread['tid'];

	$editdraftpid = "<input type=\"hidden\" name=\"pid\" value=\"$pid\" />";

	eval("\$editdraftpid = \"".$templates->get("newthread_draftinput")."\";");

}
else
{

}
else
{

Zeile 111Zeile 112
// If we have a currently logged in user then fetch the change user box.
if($mybb->user['uid'] != 0)
{

// If we have a currently logged in user then fetch the change user box.
if($mybb->user['uid'] != 0)
{

 
	$mybb->user['username'] = htmlspecialchars_uni($mybb->user['username']);

	eval("\$loginbox = \"".$templates->get("changeuserbox")."\";");
}


	eval("\$loginbox = \"".$templates->get("changeuserbox")."\";");
}


Zeile 252Zeile 254
	// 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 456Zeile 446

// We were updating a draft thread, send them back to the draft listing.
if($new_thread['savedraft'] == 1)


// We were updating a draft thread, send them back to the draft listing.
if($new_thread['savedraft'] == 1)

		{

		{

			$lang->redirect_newthread = $lang->draft_saved;
$url = "usercp.php?action=drafts";
}

			$lang->redirect_newthread = $lang->draft_saved;
$url = "usercp.php?action=drafts";
}

Zeile 476Zeile 466
			$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;
}

// This is just a normal thread - send them to it.
else

			$force_redirect = true;
}

// This is just a normal thread - send them to it.
else

		{

		{

			// Visible thread
$lang->redirect_newthread .= $lang->redirect_newthread_thread;
$url = get_thread_link($tid);

			// Visible thread
$lang->redirect_newthread .= $lang->redirect_newthread_thread;
$url = get_thread_link($tid);

Zeile 494Zeile 494
			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");

Zeile 543Zeile 543
			$unviewable_forums = get_unviewable_forums();
$inactiveforums = get_inactive_forums();
if($unviewable_forums)

			$unviewable_forums = get_unviewable_forums();
$inactiveforums = get_inactive_forums();
if($unviewable_forums)

			{

			{

				$unviewable_forums = "AND t.fid NOT IN ({$unviewable_forums})";

				$unviewable_forums = "AND t.fid NOT IN ({$unviewable_forums})";

			}

			}

			if($inactiveforums)

			if($inactiveforums)

			{

			{

				$inactiveforums = "AND t.fid NOT IN ({$inactiveforums})";

				$inactiveforums = "AND t.fid NOT IN ({$inactiveforums})";

			}

			}


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 580Zeile 580
					$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";
}


$quoted_ids = "all";
}

Zeile 593Zeile 593
					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 653Zeile 653
			$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 665Zeile 665

// Editing a draft thread
else if($mybb->input['action'] == "editdraft" && $mybb->user['uid'])


// Editing a draft thread
else if($mybb->input['action'] == "editdraft" && $mybb->user['uid'])

	{

	{

		$mybb->input['threadprefix'] = $thread['prefix'];
$message = htmlspecialchars_uni($post['message']);
$subject = htmlspecialchars_uni($post['subject']);
if($post['includesig'] != 0)

		$mybb->input['threadprefix'] = $thread['prefix'];
$message = htmlspecialchars_uni($post['message']);
$subject = htmlspecialchars_uni($post['subject']);
if($post['includesig'] != 0)

		{

		{

			$postoptionschecked['signature'] = " checked=\"checked\"";
}
if($post['smilieoff'] == 1)
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";

			$postoptionschecked['signature'] = " checked=\"checked\"";
}
if($post['smilieoff'] == 1)
{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";

		}

		}

		$icon = $post['icon'];
if($forum['allowpicons'] != 0)

		$icon = $post['icon'];
if($forum['allowpicons'] != 0)

		{

		{

			$posticons = get_post_icons();

			$posticons = get_post_icons();

		}

		}

		if($postoptions['subscriptionmethod'] == "none")
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";
}
else if($postoptions['subscriptionmethod'] == "email")

		if($postoptions['subscriptionmethod'] == "none")
{
$postoptions_subscriptionmethod_none = "checked=\"checked\"";
}
else if($postoptions['subscriptionmethod'] == "email")

		{

		{

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

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

		}

		}

		else if($postoptions['subscriptionmethod'] == "pm")

		else if($postoptions['subscriptionmethod'] == "pm")

		{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
}

		{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
}


// Otherwise, this is our initial visit to this page.
else


// Otherwise, this is our initial visit to this page.
else

Zeile 720Zeile 720
			$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else

			$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else

		{

		{

			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
$numpolloptions = "2";

			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
$numpolloptions = "2";

Zeile 734Zeile 734
		// 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 863Zeile 853
			else
{
$attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'";

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

			}


			}


			$query = $db->simple_select("attachments", "*", $attachwhere);
while($attachment = $db->fetch_array($query))
{
$attachcache[0][$attachment['aid']] = $attachment;
}

			$query = $db->simple_select("attachments", "*", $attachwhere);
while($attachment = $db->fetch_array($query))
{
$attachcache[0][$attachment['aid']] = $attachment;
}





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


	// Removing an attachment or adding a new one, or showing thread errors.
else if($mybb->get_input('attachmentaid', MyBB::INPUT_INT) || $mybb->get_input('newattachment') || $mybb->get_input('updateattachment') || $thread_errors)

	// Removing an attachment or adding a new one, or showing 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'));
}

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

Zeile 889Zeile 879
	if(!$mybb->get_input('threadprefix', MyBB::INPUT_INT))
{
$mybb->input['threadprefix'] = 0;

	if(!$mybb->get_input('threadprefix', MyBB::INPUT_INT))
{
$mybb->input['threadprefix'] = 0;

	}

	}


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

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


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

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

 

// Hide signature option if no permission
$signature = '';
if($mybb->usergroup['canusesig'] == 1 && !$mybb->user['suspendsignature'])
{
eval("\$signature = \"".$templates->get('newthread_signature')."\";");
}


// Can we disable smilies or are they disabled already?
$disablesmilies = '';
if($forum['allowsmilies'] != 0)
{
eval("\$disablesmilies = \"".$templates->get("newthread_disablesmilies")."\";");


// Can we disable smilies or are they disabled already?
$disablesmilies = '';
if($forum['allowsmilies'] != 0)
{
eval("\$disablesmilies = \"".$templates->get("newthread_disablesmilies")."\";");

	}
else
{
eval("\$disablesmilies = \"".$templates->get("newthread_disablesmilies_hidden")."\";");










	}

$postoptions = '';
if(!empty($signature) || !empty($disablesmilies))
{
eval("\$postoptions = \"".$templates->get("newthread_postoptions")."\";");
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}
else
{
$bgcolor = "trow1";
$bgcolor2 = "trow2";

	}

$modoptions = '';

	}

$modoptions = '';

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

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

		}
else

		}
else

		{
$closecheck = '';

		{
$closecheck = '';

		}

		}

		if(isset($modoptions['stickthread']) && $modoptions['stickthread'] == 1)

		if(isset($modoptions['stickthread']) && $modoptions['stickthread'] == 1)

		{

		{

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

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

		}
eval("\$modoptions = \"".$templates->get("newreply_modoptions")."\";");
$bgcolor = "trow1";
$bgcolor2 = "trow2";






















		}

$closeoption = '';
if(is_moderator($thread['fid'], "canopenclosethreads"))
{
eval("\$closeoption = \"".$templates->get("newreply_modoptions_close")."\";");
}

$stickoption = '';
if(is_moderator($thread['fid'], "canstickunstickthreads"))
{
eval("\$stickoption = \"".$templates->get("newreply_modoptions_stick")."\";");
}

if(!empty($closeoption) || !empty($stickoption))
{
eval("\$modoptions = \"".$templates->get("newreply_modoptions")."\";");
$bgcolor = "trow1";
$bgcolor2 = "trow2";
}
else
{
$bgcolor = "trow2";
$bgcolor2 = "trow1";
}

	}
else
{

	}
else
{

Zeile 965Zeile 992
			}

eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";");

			}

eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";");





			$attach_mod_options = '';
if($attachment['visible'] != 1)

			$attach_mod_options = '';
if($attachment['visible'] != 1)

			{

			{

				eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");

				eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");

			}

			}

			else
{
eval("\$attachments .= \"".$templates->get("post_attachments_attachment")."\";");
}
$attachcount++;

			else
{
eval("\$attachments .= \"".$templates->get("post_attachments_attachment")."\";");
}
$attachcount++;

		}

		}

		$query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'");
$usage = $db->fetch_array($query);
if($usage['ausage'] > ($mybb->usergroup['attachquota']*1024) && $mybb->usergroup['attachquota'] != 0)

		$query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'");
$usage = $db->fetch_array($query);
if($usage['ausage'] > ($mybb->usergroup['attachquota']*1024) && $mybb->usergroup['attachquota'] != 0)

Zeile 999Zeile 1026
		}

if(($mybb->usergroup['caneditattachments'] || $forumpermissions['caneditattachments']) && $attachcount > 0)

		}

if(($mybb->usergroup['caneditattachments'] || $forumpermissions['caneditattachments']) && $attachcount > 0)

		{

		{

			eval("\$attach_update_options = \"".$templates->get("post_attachments_update")."\";");

			eval("\$attach_update_options = \"".$templates->get("post_attachments_update")."\";");

		}

		}


if($attach_add_options || $attach_update_options)
{


if($attach_add_options || $attach_update_options)
{

Zeile 1010Zeile 1037
		eval("\$attachbox = \"".$templates->get("post_attachments")."\";");

$bgcolor = alt_trow();

		eval("\$attachbox = \"".$templates->get("post_attachments")."\";");

$bgcolor = alt_trow();

	}

	}


if($mybb->user['uid'])
{


if($mybb->user['uid'])
{

Zeile 1033Zeile 1060
			if($post_captcha->validate_captcha() == true)
{
$correct = true;

			if($post_captcha->validate_captcha() == true)
{
$correct = true;





				// Generate a hidden list of items for our captcha
$captcha = $post_captcha->build_hidden_captcha();
}

				// Generate a hidden list of items for our captcha
$captcha = $post_captcha->build_hidden_captcha();
}

Zeile 1044Zeile 1071
 			if($post_captcha->type == 1)
{
$post_captcha->build_captcha();

 			if($post_captcha->type == 1)
{
$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)
{