Vergleich newthread.php - 1.8.12 - 1.8.20

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 13Zeile 13

$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 = "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 .= ",forumdisplay_rules,forumdisplay_rules_link,post_attachments_attachment_postinsert,post_attachments_attachment,newthread_signature,post_prefixselect_prefix,post_prefixselect_single,posticons_icon";
$templatelist .= ",post_captcha_hidden,post_captcha_recaptcha_invisible,post_captcha_nocaptcha,post_javascript,postbit_gotopost,newthread_postoptions,post_attachments_add,post_attachments_viewlink";
$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,post_captcha";

$templatelist .= ",postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved";

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

$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_attachments,postbit_reputation_formatted_link,post_attachments_update,postbit_offline,newreply_modoptions,newthread_multiquote_external";
$templatelist .= ",postbit_profilefield_multiselect_value,postbit_profilefield_multiselect,newthread_draftinput,global_moderation_notice,postbit_online,postbit_away,attachment_icon,postbit_userstar,postbit_groupimage";


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 150Zeile 150

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


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

	error($lang->error_cannot_upload_php_post);

	error($lang->error_empty_post_input);

}

$errors = array();

}

$errors = array();

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


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


	// If there's an attachment, check it and upload it
if($forumpermissions['canpostattachments'] != 0)
{
if(!empty($_FILES['attachment']['name']) && !empty($_FILES['attachment']['type']))
{
if($_FILES['attachment']['size'] > 0)
{
$query = $db->simple_select("attachments", "aid", "filename='".$db->escape_string($_FILES['attachment']['name'])."' AND {$attachwhere}");
$updateattach = $db->fetch_field($query, "aid");

require_once MYBB_ROOT."inc/functions_upload.php";

	require_once MYBB_ROOT."inc/functions_upload.php";

$ret = add_attachments($pid, $forumpermissions, $attachwhere, "newthread");













				$update_attachment = false;
if($updateattach > 0 && $mybb->get_input('updateattachment'))
{
$update_attachment = true;
}
$attachedfile = upload_attachment($_FILES['attachment'], $update_attachment);
}
else
{
$errors[] = $lang->error_uploadempty;
$mybb->input['action'] = "newthread";
}
}
}

// Error with attachments - should use new inline errors?
if(!empty($attachedfile['error']))

	if(!empty($ret['errors']))

















	{

	{

		$errors[] = $attachedfile['error'];
$mybb->input['action'] = "newthread";

		$errors = $ret['errors'];


	}

// If we were dealing with an attachment but didn't click 'Post Thread', force the new thread page again.
if(!$mybb->get_input('submit'))
{

	}

// If we were dealing with an attachment but didn't click 'Post Thread', force the new thread page again.
if(!$mybb->get_input('submit'))
{

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

 
		$mybb->input['action'] = "newthread";
}
}

		$mybb->input['action'] = "newthread";
}
}

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

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

	}
}








	}

if($mybb->get_input('ajax', MyBB::INPUT_INT) == 1)
{
header("Content-type: application/json; charset={$lang->settings['charset']}");
echo json_encode(array("success" => true));
exit();
}
}


$thread_errors = "";
$hide_captcha = false;


$thread_errors = "";
$hide_captcha = false;

Zeile 240Zeile 221
	{
$lang->error_maxposts = $lang->sprintf($lang->error_maxposts, $mybb->usergroup['maxposts']);
error($lang->error_maxposts);

	{
$lang->error_maxposts = $lang->sprintf($lang->error_maxposts, $mybb->usergroup['maxposts']);
error($lang->error_maxposts);

	}

	}

}

// Performing the posting of a new thread.

}

// Performing the posting of a new thread.

Zeile 254Zeile 235
	// 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)
{

		// If they didn't specify a username then give them "Guest"

		// If they didn't specify a username leave blank so $lang->guest can be used on output

		if(!$mybb->get_input('username'))
{

		if(!$mybb->get_input('username'))
{

			$username = $lang->guest;

			$username = '';

		}
// Otherwise use the name they specified.
else

		}
// Otherwise use the name they specified.
else

Zeile 299Zeile 280
		}
}
// This user is logged in.

		}
}
// This user is logged in.

	else
{

	else
{

		$username = $mybb->user['username'];
$uid = $mybb->user['uid'];
}

// Attempt to see if this post is a duplicate or not
if($uid > 0)

		$username = $mybb->user['username'];
$uid = $mybb->user['uid'];
}

// Attempt to see if this post is a duplicate or not
if($uid > 0)

	{

	{

		$user_check = "p.uid='{$uid}'";

		$user_check = "p.uid='{$uid}'";

	}

	}

	else
{
$user_check = "p.ipaddress=".$db->escape_binary($session->packedip);

	else
{
$user_check = "p.ipaddress=".$db->escape_binary($session->packedip);

	}

	}

	if(!$mybb->get_input('savedraft') && !$pid)
{
$query = $db->simple_select("posts p", "p.pid", "$user_check AND p.fid='{$forum['fid']}' AND p.subject='".$db->escape_string($mybb->get_input('subject'))."' AND p.message='".$db->escape_string($mybb->get_input('message'))."' AND p.dateline>".(TIME_NOW-600));

	if(!$mybb->get_input('savedraft') && !$pid)
{
$query = $db->simple_select("posts p", "p.pid", "$user_check AND p.fid='{$forum['fid']}' AND p.subject='".$db->escape_string($mybb->get_input('subject'))."' AND p.message='".$db->escape_string($mybb->get_input('message'))."' AND p.dateline>".(TIME_NOW-600));

Zeile 543Zeile 524
			$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})";
}
if($inactiveforums)

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

Zeile 552Zeile 533
			}

if(is_moderator($fid))

			}

if(is_moderator($fid))

			{

			{

				$visible_where = "AND p.visible != 2";

				$visible_where = "AND p.visible != 2";

			}

			}

			else
{
$visible_where = "AND p.visible > 0";

			else
{
$visible_where = "AND p.visible > 0";

			}

			}


// Check group permissions if we can't view threads not started by us
$group_permissions = forum_permissions();


// Check group permissions if we can't view threads not started by us
$group_permissions = forum_permissions();

Zeile 572Zeile 553
				}
}
if(!empty($onlyusfids))

				}
}
if(!empty($onlyusfids))

			{

			{

				$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
}


				$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
}


Zeile 587Zeile 568
					ORDER BY p.dateline
");
while($quoted_post = $db->fetch_array($query))

					ORDER BY p.dateline
");
while($quoted_post = $db->fetch_array($query))

				{

				{

					if($quoted_post['userusername'])
{
$quoted_post['username'] = $quoted_post['userusername'];

					if($quoted_post['userusername'])
{
$quoted_post['username'] = $quoted_post['userusername'];

Zeile 636Zeile 617
	}

$postoptionschecked = array('signature' => '', 'disablesmilies' => '');

	}

$postoptionschecked = array('signature' => '', 'disablesmilies' => '');

	$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = '';

	$subscribe = $nonesubscribe = $emailsubscribe = $pmsubscribe = '';

	$postpollchecked = '';

// Check the various post options if we're

	$postpollchecked = '';

// Check the various post options if we're

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

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

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

 
		}
if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)

		}
if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1)

		{

		{

			$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}
if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1)
{
$postpollchecked = "checked=\"checked\"";

			$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
}
if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1)
{
$postpollchecked = "checked=\"checked\"";

		}


		}
$subscription_method = get_subscription_method($tid, $postoptions);

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


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


Zeile 698Zeile 664
		{
$posticons = get_post_icons();
}

		{
$posticons = get_post_icons();
}

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

		$subscription_method = get_subscription_method($tid); // Subscription method doesn't get saved in drafts
















	}

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

	}

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

Zeile 723Zeile 674
		{
$postoptionschecked['signature'] = " 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'] == 3)
{
$postoptions_subscriptionmethod_pm = "checked=\"checked\"";
}
else
{
$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}

		$subscription_method = get_subscription_method($tid); // Fresh thread, let the function set the appropriate method
















		$numpolloptions = "2";
}


		$numpolloptions = "2";
}


 
	${$subscription_method.'subscribe'} = "checked=\"checked\" ";

	$preview = '';


	$preview = '';


	// If we're preving a post then generate the preview.

	// If we're previewing a post then generate the preview.

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

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

			// If they didn't specify a username then give them "Guest"

			// If they didn't specify a username leave blank so $lang->guest can be used on output

			if(!$mybb->get_input('username'))
{

			if(!$mybb->get_input('username'))
{

				$username = $lang->guest;

				$username = '';

			}
// Otherwise use the name they specified.
else

			}
// Otherwise use the name they specified.
else

Zeile 807Zeile 744
		{
$valid_username = true;
}

		{
$valid_username = true;
}

		



		$post_errors = array();
// Fetch friendly error messages if this is an invalid post
if(!$valid_thread || !$valid_subject || !$valid_username)

		$post_errors = array();
// Fetch friendly error messages if this is an invalid post
if(!$valid_thread || !$valid_subject || !$valid_username)

Zeile 822Zeile 759
		}
else
{

		}
else
{

			if(empty($mybb->input['username']))
{
$mybb->input['username'] = $lang->guest;
}

 
			$query = $db->query("
SELECT u.*, f.*
FROM ".TABLE_PREFIX."users u

			$query = $db->query("
SELECT u.*, f.*
FROM ".TABLE_PREFIX."users u

Zeile 833Zeile 766
				WHERE u.uid='".$mybb->user['uid']."'
");
$post = $db->fetch_array($query);

				WHERE u.uid='".$mybb->user['uid']."'
");
$post = $db->fetch_array($query);

			if(!$mybb->user['uid'] || !$post['username'])
{
$post['username'] = htmlspecialchars_uni($mybb->get_input('username'));
}
else

			$post['username'] = $username;
if($mybb->user['uid'])




			{
$post['userusername'] = $mybb->user['username'];

			{
$post['userusername'] = $mybb->user['username'];

				$post['username'] = $mybb->user['username'];

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

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

Zeile 1034Zeile 963
		{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
}

		{
$friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024);
}

		$friendlyusage = get_friendly_size($usage['ausage']);
$lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyusage, $friendlyquota);












		$lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyquota);

if($usage['ausage'] !== NULL)
{
$friendlyusage = get_friendly_size($usage['ausage']);
$lang->attach_usage = $lang->sprintf($lang->attach_usage, $friendlyusage);
eval("\$link_viewattachments = \"".$templates->get("post_attachments_viewlink")."\";");
}
else
{
$lang->attach_usage = "";
}


		if($mybb->settings['maxattachments'] == 0 || ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !isset($noshowattach))
{
eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");

		if($mybb->settings['maxattachments'] == 0 || ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !isset($noshowattach))
{
eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");

Zeile 1088Zeile 1028
			{
$post_captcha->build_captcha();
}

			{
$post_captcha->build_captcha();
}

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

			elseif(in_array($post_captcha->type, array(4, 5)))

			{
$post_captcha->build_recaptcha();
}

			{
$post_captcha->build_recaptcha();
}


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

		}
else if($correct && (in_array($post_captcha->type, array(4, 5))))






		{
$post_captcha->build_recaptcha();

		{
$post_captcha->build_recaptcha();


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

		}

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

	}

if($forumpermissions['canpostpolls'] != 0)

	}

if($forumpermissions['canpostpolls'] != 0)

Zeile 1136Zeile 1071
			"allow_smilies" => 1,
"allow_imgcode" => 1
);

			"allow_smilies" => 1,
"allow_imgcode" => 1
);





		$forum['rules'] = $parser->parse_message($forum['rules'], $rules_parser);
$foruminfo = $forum;


		$forum['rules'] = $parser->parse_message($forum['rules'], $rules_parser);
$foruminfo = $forum;


Zeile 1156Zeile 1091
		if($forumpermissions['modattachments'] == 1  && $forumpermissions['canpostattachments'] != 0)
{
$moderation_text = $lang->moderation_forum_attachments;

		if($forumpermissions['modattachments'] == 1  && $forumpermissions['canpostattachments'] != 0)
{
$moderation_text = $lang->moderation_forum_attachments;

			eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}

			eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}

	}

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

	}

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

Zeile 1165Zeile 1100
		if($forumpermissions['modthreads'] == 1)
{
$moderation_text = $lang->moderation_forum_thread;

		if($forumpermissions['modthreads'] == 1)
{
$moderation_text = $lang->moderation_forum_thread;

			eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}


			eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}


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

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

	{

	{

		if($mybb->user['moderateposts'] == 1)
{
$moderation_text = $lang->moderation_user_posts;
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}

		if($mybb->user['moderateposts'] == 1)
{
$moderation_text = $lang->moderation_user_posts;
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";');
}
}

 

$php_max_upload_filesize = return_bytes(ini_get('max_upload_filesize'));
$php_post_max_size = return_bytes(ini_get('post_max_size'));

if ($php_max_upload_filesize != 0 && $php_post_max_size != 0)
{
$php_max_upload_size = min($php_max_upload_filesize, $php_post_max_size);
}
else
{
$php_max_upload_size = max($php_max_upload_filesize, $php_post_max_size);
}

$php_max_file_uploads = (int)ini_get('max_file_uploads');
eval("\$post_javascript = \"".$templates->get("post_javascript")."\";");


$plugins->run_hooks("newthread_end");



$plugins->run_hooks("newthread_end");