Vergleich newreply.php - 1.8.5 - 1.8.7

  Keine Änderungen   Hinzugefügt   Modifiziert   Entfernt
Zeile 15Zeile 15
$templatelist .= ",smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,codebuttons,post_attachments_new,post_attachments,post_savedraftbutton,newreply_modoptions,newreply_threadreview_more,newreply_disablesmilies,postbit_online";
$templatelist .= ",postbit_www,postbit_email,postbit_reputation,postbit_warninglevel,postbit_author_user,postbit_edit,postbit_quickdelete,postbit_inlinecheck,postbit_posturl,postbit_quote,postbit_multiquote,postbit_report,postbit_ignored,postbit,postbit_userstar";
$templatelist .= ",post_attachments_attachment_postinsert,post_attachments_attachment_remove,post_attachments_attachment_unapproved,post_attachments_attachment,postbit_attachments_attachment,postbit_attachments,newreply_options_signature,postbit_find";

$templatelist .= ",smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,codebuttons,post_attachments_new,post_attachments,post_savedraftbutton,newreply_modoptions,newreply_threadreview_more,newreply_disablesmilies,postbit_online";
$templatelist .= ",postbit_www,postbit_email,postbit_reputation,postbit_warninglevel,postbit_author_user,postbit_edit,postbit_quickdelete,postbit_inlinecheck,postbit_posturl,postbit_quote,postbit_multiquote,postbit_report,postbit_ignored,postbit,postbit_userstar";
$templatelist .= ",post_attachments_attachment_postinsert,post_attachments_attachment_remove,post_attachments_attachment_unapproved,post_attachments_attachment,postbit_attachments_attachment,postbit_attachments,newreply_options_signature,postbit_find";

$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_away,postbit_offline,postbit_avatar,postbit_icon";

$templatelist .= ",member_register_regimage,member_register_regimage_recaptcha,post_captcha_hidden,post_captcha,post_captcha_recaptcha,post_captcha_nocaptcha,postbit_groupimage,postbit_away,postbit_offline,postbit_avatar,postbit_icon";

$templatelist .= ",postbit_rep_button,postbit_warn,postbit_author_guest,postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnailpostbit_attachments_images_image,postbit_attachments_attachment_unapproved,postbit_pm,post_attachments_update";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_gotopost,forumdisplay_password_wrongpass,forumdisplay_password,posticons_icon,attachment_icon,postbit_reputation_formatted_link,newreply_disablesmilies_hidden,forumdisplay_rules,global_moderation_notice";


$templatelist .= ",postbit_rep_button,postbit_warn,postbit_author_guest,postbit_signature,postbit_classic,postbit_attachments_thumbnails_thumbnailpostbit_attachments_images_image,postbit_attachments_attachment_unapproved,postbit_pm,post_attachments_update";
$templatelist .= ",postbit_attachments_thumbnails,postbit_attachments_images,postbit_gotopost,forumdisplay_password_wrongpass,forumdisplay_password,posticons_icon,attachment_icon,postbit_reputation_formatted_link,newreply_disablesmilies_hidden,forumdisplay_rules,global_moderation_notice";


Zeile 76Zeile 76

// Make navigation
build_forum_breadcrumb($fid);


// Make navigation
build_forum_breadcrumb($fid);

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


$thread_subject = $thread['subject'];
$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject']));

add_breadcrumb($thread['subject'], get_thread_link($thread['tid']));
add_breadcrumb($lang->nav_newreply);


add_breadcrumb($thread['subject'], get_thread_link($thread['tid']));
add_breadcrumb($lang->nav_newreply);


Zeile 177Zeile 178
	{
error($lang->redirect_threadclosed);
}

	{
error($lang->redirect_threadclosed);
}

}

// Is the currently logged in user a moderator of this forum?
if(is_moderator($fid))
{
$ismod = true;
}
else
{
$ismod = false;

 
}

// No weird actions allowed, show new reply form if no regular action.
if($mybb->input['action'] != "do_newreply" && $mybb->input['action'] != "editdraft")

}

// No weird actions allowed, show new reply form if no regular action.
if($mybb->input['action'] != "do_newreply" && $mybb->input['action'] != "editdraft")

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

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


// Even if we are previewing, still show the new reply form.
if(!empty($mybb->input['previewpost']))


// Even if we are previewing, still show the new reply form.
if(!empty($mybb->input['previewpost']))

{

{

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


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


Zeile 205Zeile 196
if(!$mybb->get_input('posthash') && !$pid)
{
$mybb->input['posthash'] = md5($thread['tid'].$mybb->user['uid'].random_str());

if(!$mybb->get_input('posthash') && !$pid)
{
$mybb->input['posthash'] = md5($thread['tid'].$mybb->user['uid'].random_str());

}

}


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


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





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

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

Zeile 222Zeile 213
	if($pid)
{
$attachwhere = "pid='{$pid}'";

	if($pid)
{
$attachwhere = "pid='{$pid}'";

	}

	}

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

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





	// If there's an attachment, check it and upload it
if($forumpermissions['canpostattachments'] != 0)
{

	// If there's an attachment, check it and upload it
if($forumpermissions['canpostattachments'] != 0)
{

Zeile 238Zeile 229
			{
$query = $db->simple_select("attachments", "aid", "filename='".$db->escape_string($_FILES['attachment']['name'])."' AND {$attachwhere}");
$updateattach = $db->fetch_field($query, "aid");

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

$update_attachment = false;

				require_once MYBB_ROOT."inc/functions_upload.php";

$update_attachment = false;

Zeile 247Zeile 238
					$update_attachment = true;
}
$attachedfile = upload_attachment($_FILES['attachment'], $update_attachment);

					$update_attachment = true;
}
$attachedfile = upload_attachment($_FILES['attachment'], $update_attachment);

			}

			}

			else
{
$errors[] = $lang->error_uploadempty;
$mybb->input['action'] = "newreply";
}

			else
{
$errors[] = $lang->error_uploadempty;
$mybb->input['action'] = "newreply";
}

		}
}


		}
}


	if(!empty($attachedfile['error']))
{
$errors[] = $attachedfile['error'];

	if(!empty($attachedfile['error']))
{
$errors[] = $attachedfile['error'];

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

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


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


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

Zeile 271Zeile 262

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


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

{
// Verify incoming POST request

{
// Verify incoming POST request

	verify_post_check($mybb->get_input('my_post_key'));

require_once MYBB_ROOT."inc/functions_upload.php";

	verify_post_check($mybb->get_input('my_post_key'));

require_once MYBB_ROOT."inc/functions_upload.php";

Zeile 321Zeile 312
			$username = $mybb->get_input('username');
}
$uid = 0;

			$username = $mybb->get_input('username');
}
$uid = 0;

	




if($mybb->settings['stopforumspam_on_newreply'])
{


if($mybb->settings['stopforumspam_on_newreply'])
{

Zeile 455Zeile 446
	mark_thread_read($tid, $fid);

// Check captcha image

	mark_thread_read($tid, $fid);

// Check captcha image

	if($mybb->settings['captchaimage'] && !$mybb->user['uid'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';

	if($mybb->settings['captchaimage'] && !$mybb->user['uid'])
{
require_once MYBB_ROOT.'inc/class_captcha.php';

		$post_captcha = new captcha(false, "post_captcha");

if($post_captcha->validate_captcha() == false)

		$post_captcha = new captcha(false, "post_captcha");

if($post_captcha->validate_captcha() == false)

		{

		{

			// CAPTCHA validation failed
foreach($post_captcha->get_errors() as $error)
{
$post_errors[] = $error;
}

			// CAPTCHA validation failed
foreach($post_captcha->get_errors() as $error)
{
$post_errors[] = $error;
}

		}

		}

		else
{
$hide_captcha = true;

		else
{
$hide_captcha = true;

		}


		}


		if($mybb->get_input('ajax', MyBB::INPUT_INT))
{
if($post_captcha->type == 1)

		if($mybb->get_input('ajax', MyBB::INPUT_INT))
{
if($post_captcha->type == 1)

Zeile 487Zeile 478
				);

$db->insert_query("captcha", $imagearray);

				);

$db->insert_query("captcha", $imagearray);


//header("Content-type: text/html; charset={$lang->settings['charset']}");


//header("Content-type: text/html; charset={$lang->settings['charset']}");

				$data = '';
$data .= "<captcha>$imagehash";


				$data = '';
$data .= "<captcha>$imagehash";


Zeile 573Zeile 564
				if(is_array($multiquote) && is_array($quoted_ids))
{
foreach($multiquote as $key => $quoteid)

				if(is_array($multiquote) && is_array($quoted_ids))
{
foreach($multiquote as $key => $quoteid)

					{

					{

						// If this ID was quoted, remove it from the multiquote list
if(in_array($quoteid, $quoted_ids))
{
unset($multiquote[$key]);
}

						// If this ID was quoted, remove it from the multiquote list
if(in_array($quoteid, $quoted_ids))
{
unset($multiquote[$key]);
}

					}

					}

					// Still have an array - set the new cookie
if(is_array($multiquote))
{
$new_multiquote = implode(",", $multiquote);
my_setcookie("multiquote", $new_multiquote);

					// Still have an array - set the new cookie
if(is_array($multiquote))
{
$new_multiquote = implode(",", $multiquote);
my_setcookie("multiquote", $new_multiquote);

					}

					}

					// Otherwise, unset it
else
{
my_unsetcookie("multiquote");

					// Otherwise, unset it
else
{
my_unsetcookie("multiquote");

					}
}
}

					}
}
}

		}

$plugins->run_hooks("newreply_do_newreply_end");

		}

$plugins->run_hooks("newreply_do_newreply_end");





		// This was a post made via the ajax quick reply - we need to do some special things here
if($mybb->get_input('ajax', MyBB::INPUT_INT))
{

		// This was a post made via the ajax quick reply - we need to do some special things here
if($mybb->get_input('ajax', MyBB::INPUT_INT))
{

Zeile 604Zeile 595
			if($visible == 1)
{
// Set post counter

			if($visible == 1)
{
// Set post counter

				if($ismod == true)







				$postcounter = $thread['replies'] + 1;

if(is_moderator($fid, "canviewunapprove"))
{
$postcounter += $thread['unapprovedposts'];
}
if(is_moderator($fid, "canviewdeleted"))

				{

				{

					$postcounter = $thread['replies'] + $thread['unapprovedposts'] + 1;
}
else
{
$postcounter = $thread['replies'] + 1;

					$postcounter += $thread['deletedposts'];





				}

// Was there a new post since we hit the quick reply button?

				}

// Was there a new post since we hit the quick reply button?

Zeile 623Zeile 616
						redirect(get_thread_link($tid, 0, "lastpost"));
}
}

						redirect(get_thread_link($tid, 0, "lastpost"));
}
}

				



				if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
{
$mybb->settings['postsperpage'] = 20;

				if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
{
$mybb->settings['postsperpage'] = 20;

Zeile 688Zeile 681
				$data .= $post;

// Build a new posthash incase the user wishes to quick reply again

				$data .= $post;

// Build a new posthash incase the user wishes to quick reply again

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

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

				$data .= "<script type=\"text/javascript\">\n";
$data .= "var hash = document.getElementById('posthash'); if(hash) { hash.value = '{$new_posthash}'; }\n";
$data .= "if(typeof(inlineModeration) != 'undefined') {

				$data .= "<script type=\"text/javascript\">\n";
$data .= "var hash = document.getElementById('posthash'); if(hash) { hash.value = '{$new_posthash}'; }\n";
$data .= "if(typeof(inlineModeration) != 'undefined') {

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

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

			if(is_moderator($fid))



























// Check group permissions if we can't view threads not started by us
$group_permissions = forum_permissions();
$onlyusfids = array();
$onlyusforums = '';
foreach($group_permissions as $fid => $forum_permissions)
{
if(isset($forum_permissions['canonlyviewownthreads']) && $forum_permissions['canonlyviewownthreads'] == 1)
{
$onlyusfids[] = $fid;
}
}
if(!empty($onlyusfids))
{
$onlyusforums = "AND ((t.fid IN(".implode(',', $onlyusfids).") AND t.uid='{$mybb->user['uid']}') OR t.fid NOT IN(".implode(',', $onlyusfids)."))";
}

if(is_moderator($fid, 'canviewunapprove') && is_moderator($fid, 'canviewdeleted'))
{
$visible_where = "AND p.visible IN (-1,0,1)";
}
elseif(is_moderator($fid, 'canviewunapprove') && !is_moderator($fid, 'canviewdeleted'))
{
$visible_where = "AND p.visible IN (0,1)";
}
elseif(!is_moderator($fid, 'canviewunapprove') && is_moderator($fid, 'canviewdeleted'))

			{

			{

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

				$visible_where = "AND p.visible IN (-1,1)";

			}
else
{

			}
else
{

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

				$visible_where = "AND p.visible=1";

			}

require_once MYBB_ROOT."inc/functions_posting.php";

			}

require_once MYBB_ROOT."inc/functions_posting.php";

Zeile 785Zeile 803
				FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

				FROM ".TABLE_PREFIX."posts p
LEFT JOIN ".TABLE_PREFIX."threads t ON (t.tid=p.tid)
LEFT JOIN ".TABLE_PREFIX."users u ON (u.uid=p.uid)

				WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$visible_where}

				WHERE p.pid IN ({$quoted_posts}) {$unviewable_forums} {$inactiveforums} {$onlyusforums} {$visible_where}

			");
$load_all = $mybb->get_input('load_all_quotes', MyBB::INPUT_INT);
while($quoted_post = $db->fetch_array($query))

			");
$load_all = $mybb->get_input('load_all_quotes', MyBB::INPUT_INT);
while($quoted_post = $db->fetch_array($query))

Zeile 794Zeile 812
				if($quoted_post['tid'] == $tid || $load_all == 1)
{
// If this post was the post for which a quote button was clicked, set the subject

				if($quoted_post['tid'] == $tid || $load_all == 1)
{
// If this post was the post for which a quote button was clicked, set the subject

					if($pid == $quoted_post['pid'])

					if($replyto == $quoted_post['pid'])

					{

					{

						$subject = preg_replace('#RE:\s?#i', '', $quoted_post['subject']);

						$subject = preg_replace('#^RE:\s?#i', '', $quoted_post['subject']);

						// Subject too long? Shorten it to avoid error message
if(my_strlen($subject) > 85)
{

						// Subject too long? Shorten it to avoid error message
if(my_strlen($subject) > 85)
{

Zeile 957Zeile 975
		}
else
{

		}
else
{

			$subject = $thread['subject'];







			$subject = $thread_subject;
// Subject too long? Shorten it to avoid error message
if(my_strlen($subject) > 85)
{
$subject = my_substr($subject, 0, 82).'...';
}
$subject = "RE: ".$subject;

		}
}


		}
}


Zeile 990Zeile 1014
		// Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";
$posthandler = new PostDataHandler("insert");

		// Set up posthandler.
require_once MYBB_ROOT."inc/datahandlers/post.php";
$posthandler = new PostDataHandler("insert");

 
		$posthandler->action = "post";


// Set the post data that came from the input to the $post array.
$post = array(


// Set the post data that came from the input to the $post array.
$post = array(

Zeile 1015Zeile 1040
		// Now let the post handler do all the hard work.
$valid_post = $posthandler->verify_message();
$valid_subject = $posthandler->verify_subject();

		// Now let the post handler do all the hard work.
$valid_post = $posthandler->verify_message();
$valid_subject = $posthandler->verify_subject();

		



		// guest post --> verify author
if($post['uid'] == 0)

		// guest post --> verify author
if($post['uid'] == 0)

		{

		{

			$valid_username = $posthandler->verify_author();

			$valid_username = $posthandler->verify_author();

		}

		}

		else
{
$valid_username = true;

		else
{
$valid_username = true;

		}


		}


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

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

Zeile 1056Zeile 1081
			if(!$mybb->user['uid'] || !$post['username'])
{
$post['username'] = $mybb->get_input('username');

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

			}
else
{

			}
else
{

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

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

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

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

			}

			}

			$post['dateline'] = TIME_NOW;
if(isset($mybb->input['postoptions']['signature']))
{

			$post['dateline'] = TIME_NOW;
if(isset($mybb->input['postoptions']['signature']))
{

Zeile 1102Zeile 1127
	}

$subject = htmlspecialchars_uni($parser->parse_badwords($subject));

	}

$subject = htmlspecialchars_uni($parser->parse_badwords($subject));


if(!$pid && !isset($mybb->input['previewpost']))
{
$subject = $thread['subject'];
// Subject too long? Shorten it to avoid error message
if(my_strlen($subject) > 85)
{
$subject = my_substr($subject, 0, 82).'...';
}
$subject = "RE: ".$subject;
}

 

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



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


Zeile 1229Zeile 1243

if(!$correct)
{


if(!$correct)
{

 			if($post_captcha->type == 1)
{

			if($post_captcha->type == 1)
{

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

				$post_captcha->build_captcha();
}
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)
{

			}

if($post_captcha->html)
{





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

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


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

 

if($post_captcha->html)
{


if($post_captcha->html)
{

Zeile 1285Zeile 1286
		}
$query = $db->simple_select("posts", "COUNT(pid) AS post_count", "tid='{$tid}' AND {$visibility}");
$numposts = $db->fetch_field($query, "post_count");

		}
$query = $db->simple_select("posts", "COUNT(pid) AS post_count", "tid='{$tid}' AND {$visibility}");
$numposts = $db->fetch_field($query, "post_count");

		



		if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
{
$mybb->settings['postsperpage'] = 20;

		if(!$mybb->settings['postsperpage'] || (int)$mybb->settings['postsperpage'] < 1)
{
$mybb->settings['postsperpage'] = 20;