Vergleich editpost.php - 1.8.4 - 1.8.18

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 11	Zeile 11
define("IN_MYBB", 1); define('THIS_SCRIPT', 'editpost.php');	define("IN_MYBB", 1); define('THIS_SCRIPT', 'editpost.php');
$templatelist = "editpost,previewpost,changeuserbox,codebuttons,smilieinsert,smilieinsert_getmore,smilieinsert_smilie,smilieinsert_smilie_empty,post_attachments_attachment_postinsert,post_attachments_attachment_mod_unapprove,postbit_attachments_thumbnails"; $templatelist .= ",editpost_delete,error_attacherror,forumdisplay_password_wrongpass,forumdisplay_password,editpost_reason,post_attachments_attachment_remove,post_attachments_update,post_subscription_method,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_icon,postbit_userstar,postbit_offline,postbit_attachments_images"; $templatelist .= ",postbit_signature,postbit_classic,postbit,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved,post_attachments_update,postbit_attachments"; $templatelist .= ",posticons_icon,post_prefixselect_prefix,post_prefixselect_single,newthread_postpoll,editpost_disablesmilies,post_attachments_attachment_mod_approve,post_attachments_attachment_unapproved,post_attachments_new,postbit_gotopost"; $templatelist .= ",postbit_warninglevel_formatted,postbit_reputation_formatted_link,editpost_disablesmilies_hidden,attachment_icon,post_attachments_attachment,post_attachments_add,post_attachments,posticons,global_moderation_notice";	$templatelist = "editpost,previewpost,changeuserbox,codebuttons,post_attachments_attachment_postinsert,post_attachments_attachment_mod_unapprove,postbit_attachments_thumbnails,postbit_profilefield_multiselect_value"; $templatelist .= ",editpost_delete,forumdisplay_password_wrongpass,forumdisplay_password,editpost_reason,post_attachments_attachment_remove,post_attachments_update,post_subscription_method,postbit_profilefield_multiselect"; $templatelist .= ",postbit_avatar,postbit_find,postbit_pm,postbit_rep_button,postbit_www,postbit_email,postbit_reputation,postbit_warn,postbit_warninglevel,postbit_author_user,posticons"; $templatelist .= ",postbit_signature,postbit_classic,postbit,postbit_attachments_thumbnails_thumbnail,postbit_attachments_images_image,postbit_attachments_attachment,postbit_attachments_attachment_unapproved"; $templatelist .= ",posticons_icon,post_prefixselect_prefix,post_prefixselect_single,newthread_postpoll,editpost_disablesmilies,post_attachments_attachment_mod_approve,post_attachments_attachment_unapproved"; $templatelist .= ",postbit_warninglevel_formatted,postbit_reputation_formatted_link,editpost_signature,attachment_icon,post_attachments_attachment,post_attachments_add,post_attachments,editpost_postoptions"; $templatelist .= ",postbit_attachments_images,global_moderation_notice,post_attachments_new,postbit_attachments,postbit_online,postbit_away,postbit_offline,postbit_gotopost,postbit_userstar,postbit_icon";
require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php"; require_once MYBB_ROOT."inc/functions_upload.php";	require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php"; require_once MYBB_ROOT."inc/functions_upload.php";
	require_once MYBB_ROOT."inc/class_parser.php"; $parser = new postParser;
// Load global language phrases $lang->load("editpost");	// Load global language phrases $lang->load("editpost");
Zeile 46	Zeile 49
$post = get_post($pid); }	$post = get_post($pid); }
if(!$post)	if(!$post \|\| ($post['visible'] == -1 && $mybb->input['action'] != "restorepost"))
{ error($lang->error_invalidpost); }	{ error($lang->error_invalidpost); }
Zeile 60	Zeile 63
error($lang->error_invalidthread); }	error($lang->error_invalidthread); }
$thread['subject'] = htmlspecialchars_uni($thread['subject']);	$thread['subject'] = htmlspecialchars_uni($parser->parse_badwords($thread['subject']));
// Get forum info $fid = $post['fid'];	// Get forum info $fid = $post['fid'];
Zeile 182	Zeile 185
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);
} $attacherror = '';	} $attacherror = '';
Zeile 191	Zeile 194
// Verify incoming POST request verify_post_check($mybb->get_input('my_post_key'));	// Verify incoming POST request verify_post_check($mybb->get_input('my_post_key'));
// If there's an attachment, check it and upload it if($_FILES['attachment']['size'] > 0 && $forumpermissions['canpostattachments'] != 0)	if($pid)
{	{
$query = $db->simple_select("attachments", "aid", "filename='".$db->escape_string($_FILES['attachment']['name'])."' AND pid='{$pid}'"); $updateattach = $db->fetch_field($query, "aid");	$attachwhere = "pid='{$pid}'"; } else { $attachwhere = "posthash='".$db->escape_string($mybb->get_input('posthash'))."'"; } $ret = add_attachments($pid, $forumpermissions, $attachwhere, "editpost"); if(!empty($ret['errors'])) { $errors = $ret['errors']; } // Do we have attachment errors? if(!empty($errors)) { $attacherror = inline_error($errors); }

$update_attachment = false; if($updateattach > 0 && $mybb->get_input('updateattachment') && ($mybb->usergroup['caneditattachments'] \|\| $forumpermissions['caneditattachments'])) { $update_attachment = true; } $attachedfile = upload_attachment($_FILES['attachment'], $update_attachment); } if(!empty($attachedfile['error'])) { eval("\$attacherror = \"".$templates->get("error_attacherror")."\";"); $mybb->input['action'] = "editpost"; }	// If we were dealing with an attachment but didn't click 'Update Post', force the post edit page again.
if(!isset($mybb->input['submit'])) { $mybb->input['action'] = "editpost";	if(!isset($mybb->input['submit'])) { $mybb->input['action'] = "editpost";
Zeile 216	Zeile 224
} if($mybb->settings['enableattachments'] == 1 && $mybb->get_input('attachmentaid', MyBB::INPUT_INT) && isset($mybb->input['attachmentact']) && $mybb->input['action'] == "do_editpost" && $mybb->request_method == "post") // Lets remove/approve/unapprove the attachment	} if($mybb->settings['enableattachments'] == 1 && $mybb->get_input('attachmentaid', MyBB::INPUT_INT) && isset($mybb->input['attachmentact']) && $mybb->input['action'] == "do_editpost" && $mybb->request_method == "post") // Lets remove/approve/unapprove the attachment
{ // Verify incoming POST request verify_post_check($mybb->get_input('my_post_key'));	{ // Verify incoming POST request verify_post_check($mybb->get_input('my_post_key'));
$mybb->input['attachmentaid'] = $mybb->get_input('attachmentaid', MyBB::INPUT_INT); if($mybb->input['attachmentact'] == "remove")	$mybb->input['attachmentaid'] = $mybb->get_input('attachmentaid', MyBB::INPUT_INT); if($mybb->input['attachmentact'] == "remove")
Zeile 262	Zeile 270
{ $firstpost = 0; }	{ $firstpost = 0; }

$modlogdata['fid'] = $fid; $modlogdata['tid'] = $tid; if($firstpost)	$modlogdata['fid'] = $fid; $modlogdata['tid'] = $tid; if($firstpost)
Zeile 273	Zeile 281
$moderation = new Moderation; if($mybb->settings['soft_delete'] == 1 \|\| is_moderator($fid, "cansoftdeletethreads"))	$moderation = new Moderation; if($mybb->settings['soft_delete'] == 1 \|\| is_moderator($fid, "cansoftdeletethreads"))
{	{
$modlogdata['pid'] = $pid;	$modlogdata['pid'] = $pid;

$moderation->soft_delete_threads(array($tid)); log_moderator_action($modlogdata, $lang->thread_soft_deleted);	$moderation->soft_delete_threads(array($tid)); log_moderator_action($modlogdata, $lang->thread_soft_deleted);
}	}
else	else
{	{
$moderation->delete_thread($tid); mark_reports($tid, "thread"); log_moderator_action($modlogdata, $lang->thread_deleted);	$moderation->delete_thread($tid); mark_reports($tid, "thread"); log_moderator_action($modlogdata, $lang->thread_deleted);
} if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}"); if(is_moderator($fid, "canviewdeleted"))	} if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}"); if(is_moderator($fid, "canviewdeleted"))
{	{
echo json_encode(array("data" => '1'));	echo json_encode(array("data" => '1', "first" => '1'));
} else {	} else {
Zeile 346	Zeile 354
header("Content-type: application/json; charset={$lang->settings['charset']}"); if(is_moderator($fid, "canviewdeleted")) {	header("Content-type: application/json; charset={$lang->settings['charset']}"); if(is_moderator($fid, "canviewdeleted")) {
echo json_encode(array("data" => '1'));	echo json_encode(array("data" => '1', "first" => '0'));
} else {	} else {
Zeile 404	Zeile 412
if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}");	if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}");
echo json_encode(array("data" => '1'));	echo json_encode(array("data" => '1', "first" => '1'));
} else {	} else {
Zeile 430	Zeile 438
if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}");	if($mybb->input['ajax'] == 1) { header("Content-type: application/json; charset={$lang->settings['charset']}");
echo json_encode(array("data" => '1'));	echo json_encode(array("data" => '1', "first" => '0'));
} else {	} else {
Zeile 555	Zeile 563
if($forum['allowpicons'] != 0) { $posticons = get_post_icons();	if($forum['allowpicons'] != 0) { $posticons = get_post_icons();
}	} $mybb->user['username'] = htmlspecialchars_uni($mybb->user['username']);
eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); $deletebox = '';	eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); $deletebox = '';
Zeile 589	Zeile 598
if($attachment['visible'] == 1) { eval("\$attach_mod_options = \"".$templates->get("post_attachments_attachment_mod_unapprove")."\";");	if($attachment['visible'] == 1) { eval("\$attach_mod_options = \"".$templates->get("post_attachments_attachment_mod_unapprove")."\";");
}	}
else { eval("\$attach_mod_options = \"".$templates->get("post_attachments_attachment_mod_approve")."\";"); } }	else { eval("\$attach_mod_options = \"".$templates->get("post_attachments_attachment_mod_approve")."\";"); } }

// Remove Attachment eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";"); if($attachment['visible'] != 1)	// Remove Attachment eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";"); if($attachment['visible'] != 1)
{	{
eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";"); } else	eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";"); } else
Zeile 622	Zeile 631
if($mybb->usergroup['attachquota'] == 0) { $friendlyquota = $lang->unlimited;	if($mybb->usergroup['attachquota'] == 0) { $friendlyquota = $lang->unlimited;
}	}
else	else
{	{
$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); if($mybb->settings['maxattachments'] == 0 \|\| ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !$noshowattach) { eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");	$friendlyusage = get_friendly_size($usage['ausage']); $lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyusage, $friendlyquota); if($mybb->settings['maxattachments'] == 0 \|\| ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !$noshowattach) { eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");
}	}
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")."\";"); }
Zeile 644	Zeile 653
eval("\$newattach = \"".$templates->get("post_attachments_new")."\";"); } eval("\$attachbox = \"".$templates->get("post_attachments")."\";");	eval("\$newattach = \"".$templates->get("post_attachments_new")."\";"); } eval("\$attachbox = \"".$templates->get("post_attachments")."\";");
}	}
if(!$mybb->get_input('attachmentaid', MyBB::INPUT_INT) && !$mybb->get_input('newattachment') && !$mybb->get_input('updateattachment') && !isset($mybb->input['previewpost'])) { $message = $post['message'];	if(!$mybb->get_input('attachmentaid', MyBB::INPUT_INT) && !$mybb->get_input('newattachment') && !$mybb->get_input('updateattachment') && !isset($mybb->input['previewpost'])) { $message = $post['message'];
Zeile 665	Zeile 674
$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = ''; $postoptionschecked = array('signature' => '', 'disablesmilies' => '');	$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = ''; $postoptionschecked = array('signature' => '', 'disablesmilies' => '');
if(isset($mybb->input['previewpost']) \|\| $post_errors)	if(!empty($mybb->input['previewpost']) \|\| $post_errors)
{ // Set up posthandler. require_once MYBB_ROOT."inc/datahandlers/post.php";	{ // Set up posthandler. require_once MYBB_ROOT."inc/datahandlers/post.php";
Zeile 680	Zeile 689
"subject" => $mybb->get_input('subject'), "icon" => $mybb->get_input('icon', MyBB::INPUT_INT), "uid" => $post['uid'],	"subject" => $mybb->get_input('subject'), "icon" => $mybb->get_input('icon', MyBB::INPUT_INT), "uid" => $post['uid'],
	"username" => $post['username'],
"edit_uid" => $mybb->user['uid'], "message" => $mybb->get_input('message'), );	"edit_uid" => $mybb->user['uid'], "message" => $mybb->get_input('message'), );
Zeile 730	Zeile 740
} if(isset($postoptions['subscriptionmethod']) && $postoptions['subscriptionmethod'] == "none")	} if(isset($postoptions['subscriptionmethod']) && $postoptions['subscriptionmethod'] == "none")
{ $postoptions_subscriptionmethod_none = "checked=\"checked\""; }	{ $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'] == "email") { $postoptions_subscriptionmethod_email = "checked=\"checked\"";
Zeile 753	Zeile 763
} }	} }
if(isset($mybb->input['previewpost']))	if(!empty($mybb->input['previewpost']))
{ if(!$post['uid']) {	{ if(!$post['uid']) {
Zeile 844	Zeile 854
$mybb->input['threadprefix'] = $thread['prefix']; }	$mybb->input['threadprefix'] = $thread['prefix']; }
$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', MyBB::INPUT_INT));	$prefixselect = build_prefix_select($forum['fid'], $mybb->get_input('threadprefix', MyBB::INPUT_INT), 0, $thread['prefix']);
} else {	} else {
Zeile 874	Zeile 884
if($firstcheck['pid'] == $pid && $forumpermissions['canpostpolls'] != 0 && $thread['poll'] < 1 && (is_moderator($fid, "canmanagepolls") \|\| $thread['dateline'] > ($time-($mybb->settings['polltimelimit']6060)) \|\| $mybb->settings['polltimelimit'] == 0)) { $lang->max_options = $lang->sprintf($lang->max_options, $mybb->settings['maxpolloptions']);	if($firstcheck['pid'] == $pid && $forumpermissions['canpostpolls'] != 0 && $thread['poll'] < 1 && (is_moderator($fid, "canmanagepolls") \|\| $thread['dateline'] > ($time-($mybb->settings['polltimelimit']6060)) \|\| $mybb->settings['polltimelimit'] == 0)) { $lang->max_options = $lang->sprintf($lang->max_options, $mybb->settings['maxpolloptions']);
$numpolloptions = "2";	$numpolloptions = $mybb->get_input('numpolloptions', MyBB::INPUT_INT);
$postpollchecked = '';	$postpollchecked = '';
	if($numpolloptions < 1) { $numpolloptions = 2; } if($mybb->get_input('postpoll', MyBB::INPUT_INT) == 1) { $postpollchecked = 'checked="checked"'; }
eval("\$pollbox = \"".$templates->get("newthread_postpoll")."\";"); } else { $pollbox = '';	eval("\$pollbox = \"".$templates->get("newthread_postpoll")."\";"); } else { $pollbox = '';
	} // Hide signature option if no permission $signature = ''; if($mybb->usergroup['canusesig'] == 1 && !$mybb->user['suspendsignature']) { eval("\$signature = \"".$templates->get('editpost_signature')."\";");
} // Can we disable smilies or are they disabled already?	} // Can we disable smilies or are they disabled already?
Zeile 888	Zeile 916
if($forum['allowsmilies'] != 0) { eval("\$disablesmilies = \"".$templates->get("editpost_disablesmilies")."\";");	if($forum['allowsmilies'] != 0) { eval("\$disablesmilies = \"".$templates->get("editpost_disablesmilies")."\";");
} else	} $postoptions = ''; if(!empty($signature) \|\| !empty($disablesmilies))
{	{
eval("\$disablesmilies = \"".$templates->get("editpost_disablesmilies_hidden")."\";");	eval("\$postoptions = \"".$templates->get("editpost_postoptions")."\";");
} $moderation_notice = ''; if(!is_moderator($forum['fid'], "canapproveunapproveattachs")) { if($forumpermissions['modattachments'] == 1 && $forumpermissions['canpostattachments'] != 0)	} $moderation_notice = ''; if(!is_moderator($forum['fid'], "canapproveunapproveattachs")) { if($forumpermissions['modattachments'] == 1 && $forumpermissions['canpostattachments'] != 0)
{	{
$moderation_text = $lang->moderation_forum_attachments;	$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'], "canapproveunapproveposts")) { if($forumpermissions['mod_edit_posts'] == 1)	if(!is_moderator($forum['fid'], "canapproveunapproveposts")) { if($forumpermissions['mod_edit_posts'] == 1)
Zeile 912	Zeile 942
eval('$moderation_notice = "'.$templates->get('global_moderation_notice').'";'); } }	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("editpost_end");	$plugins->run_hooks("editpost_end");