Vergleich newreply.php - 1.8.6 - 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 311Zeile 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 549Zeile 550

// Mark any quoted posts so they're no longer selected - attempts to maintain those which weren't selected
if(isset($mybb->input['quoted_ids']) && isset($mybb->cookies['multiquote']) && $mybb->settings['multiquote'] != 0)


// Mark any quoted posts so they're no longer selected - attempts to maintain those which weren't selected
if(isset($mybb->input['quoted_ids']) && isset($mybb->cookies['multiquote']) && $mybb->settings['multiquote'] != 0)

		{

		{

			// We quoted all posts - remove the entire cookie
if($mybb->get_input('quoted_ids') == "all")
{

			// We quoted all posts - remove the entire cookie
if($mybb->get_input('quoted_ids') == "all")
{

Zeile 615Zeile 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 680Zeile 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 762Zeile 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 777Zeile 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 910Zeile 936
			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
$mybb->input['icon'] = $post['icon'];

			$postoptions_subscriptionmethod_dont = "checked=\"checked\"";
}
$mybb->input['icon'] = $post['icon'];

	}

	}

	else
{
if($mybb->user['signature'] != '')

	else
{
if($mybb->user['signature'] != '')

Zeile 949Zeile 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;

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

		}

		}

	}

// Preview a post that was written.

	}

// Preview a post that was written.

Zeile 1014Zeile 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();
}
else

			$valid_username = $posthandler->verify_author();
}
else

		{

		{

			$valid_username = true;

			$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 = $posthandler->get_friendly_errors();


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

		}


		}


		// One or more errors returned, fetch error list and throw to newreply page
if(count($post_errors) > 0)
{

		// One or more errors returned, fetch error list and throw to newreply page
if(count($post_errors) > 0)
{

Zeile 1217Zeile 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 1273Zeile 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;