Vergleich editpost.php - 1.8.15 - 1.8.20

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 13	Zeile 13
$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 = "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,error_attacherror,posticons";	$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_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";
Zeile 49	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 71	Zeile 71
if($thread['visible'] == 0 && !is_moderator($fid, "canviewunapprove") \|\| $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted") \|\| ($thread['visible'] < -1 && $thread['uid'] != $mybb->user['uid'])) {	if($thread['visible'] == 0 && !is_moderator($fid, "canviewunapprove") \|\| $thread['visible'] == -1 && !is_moderator($fid, "canviewdeleted") \|\| ($thread['visible'] < -1 && $thread['uid'] != $mybb->user['uid'])) {
error($lang->error_invalidthread);	if($thread['visible'] == 0 && !($mybb->settings['showownunapproved'] && $thread['uid'] == $mybb->user['uid'])) { error($lang->error_invalidthread); }
} if(!$forum \|\| $forum['type'] != "f") {	} if(!$forum \|\| $forum['type'] != "f") {
Zeile 118	Zeile 121
if($mybb->input['action'] == "deletepost" && $mybb->request_method == "post") { if(!is_moderator($fid, "candeleteposts") && !is_moderator($fid, "cansoftdeleteposts") && $pid != $thread['firstpost'] \|\| !is_moderator($fid, "candeletethreads") && !is_moderator($fid, "cansoftdeletethreads") && $pid == $thread['firstpost'])	if($mybb->input['action'] == "deletepost" && $mybb->request_method == "post") { if(!is_moderator($fid, "candeleteposts") && !is_moderator($fid, "cansoftdeleteposts") && $pid != $thread['firstpost'] \|\| !is_moderator($fid, "candeletethreads") && !is_moderator($fid, "cansoftdeletethreads") && $pid == $thread['firstpost'])
{ if($thread['closed'] == 1) { error($lang->redirect_threadclosed); } if($forumpermissions['candeleteposts'] == 0 && $pid != $thread['firstpost'] \|\| $forumpermissions['candeletethreads'] == 0 && $pid == $thread['firstpost']) { error_no_permission(); } if($mybb->user['uid'] != $post['uid']) { error_no_permission(); } // User can't delete unapproved post if($post['visible'] == 0)	{ if($thread['closed'] == 1)
{	{
error_no_permission();	error($lang->redirect_threadclosed);
}	}
}	if($forumpermissions['candeleteposts'] == 0 && $pid != $thread['firstpost'] \|\| $forumpermissions['candeletethreads'] == 0 && $pid == $thread['firstpost']) { error_no_permission(); } if($mybb->user['uid'] != $post['uid']) { error_no_permission(); } // User can't delete unapproved post unless allowed for own if($post['visible'] == 0 && !($mybb->settings['showownunapproved'] && $post['uid'] == $mybb->user['uid'])) { error_no_permission(); } }
if($post['visible'] == -1 && $mybb->settings['soft_delete'] == 1) { error($lang->error_already_deleted);	if($post['visible'] == -1 && $mybb->settings['soft_delete'] == 1) { error($lang->error_already_deleted);
Zeile 162	Zeile 165
error_no_permission(); } if($mybb->user['uid'] != $post['uid'])	error_no_permission(); } if($mybb->user['uid'] != $post['uid'])
{ error_no_permission(); }	{ error_no_permission(); }
// Edit time limit $time = TIME_NOW; if($mybb->usergroup['edittimelimit'] != 0 && $post['dateline'] < ($time-($mybb->usergroup['edittimelimit']*60)))	// Edit time limit $time = TIME_NOW; if($mybb->usergroup['edittimelimit'] != 0 && $post['dateline'] < ($time-($mybb->usergroup['edittimelimit']*60)))
{	{
$lang->edit_time_limit = $lang->sprintf($lang->edit_time_limit, $mybb->usergroup['edittimelimit']); error($lang->edit_time_limit);	$lang->edit_time_limit = $lang->sprintf($lang->edit_time_limit, $mybb->usergroup['edittimelimit']); error($lang->edit_time_limit);
}	}
// User can't edit unapproved post	// User can't edit unapproved post
if($post['visible'] == 0 \|\| $post['visible'] == -1)	if(($post['visible'] == 0 && !($mybb->settings['showownunapproved'] && $post['uid'] == $mybb->user['uid'])) \|\| $post['visible'] == -1)
{ error_no_permission();	{ error_no_permission();
}	}
} }	} }
Zeile 185	Zeile 188
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 = ''; if($mybb->settings['enableattachments'] == 1 && !$mybb->get_input('attachmentaid', MyBB::INPUT_INT) && ($mybb->get_input('newattachment') \|\| $mybb->get_input('updateattachment') \|\| ($mybb->input['action'] == "do_editpost" && isset($mybb->input['submit']) && $_FILES['attachment'])))	} $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_editpost" && isset($mybb->input['submit']) && $_FILES['attachment'])))
{ // 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) { $query = $db->simple_select("attachments", "aid", "filename='".$db->escape_string($_FILES['attachment']['name'])."' AND pid='{$pid}'"); $updateattach = $db->fetch_field($query, "aid"); $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";	{ // Verify incoming POST request verify_post_check($mybb->get_input('my_post_key')); if($pid) { $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);
}	}
	// 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 219	Zeile 227
} 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")
{	{
remove_attachment($pid, "", $mybb->input['attachmentaid']); } elseif($mybb->get_input('attachmentact') == "approve" && is_moderator($fid, 'canapproveunapproveattachs'))	remove_attachment($pid, "", $mybb->input['attachmentaid']); } elseif($mybb->get_input('attachmentact') == "approve" && is_moderator($fid, 'canapproveunapproveattachs'))
Zeile 233	Zeile 241
$update_sql = array("visible" => 1); $db->update_query("attachments", $update_sql, "aid='{$mybb->input['attachmentaid']}'"); update_thread_counters($post['tid'], array('attachmentcount' => "+1"));	$update_sql = array("visible" => 1); $db->update_query("attachments", $update_sql, "aid='{$mybb->input['attachmentaid']}'"); update_thread_counters($post['tid'], array('attachmentcount' => "+1"));
}	}
elseif($mybb->get_input('attachmentact') == "unapprove" && is_moderator($fid, 'canapproveunapproveattachs'))	elseif($mybb->get_input('attachmentact') == "unapprove" && is_moderator($fid, 'canapproveunapproveattachs'))
{	{
$update_sql = array("visible" => 0); $db->update_query("attachments", $update_sql, "aid='{$mybb->input['attachmentaid']}'"); update_thread_counters($post['tid'], array('attachmentcount' => "-1"));	$update_sql = array("visible" => 0); $db->update_query("attachments", $update_sql, "aid='{$mybb->input['attachmentaid']}'"); update_thread_counters($post['tid'], array('attachmentcount' => "-1"));
}	} 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(); }
if(!isset($mybb->input['submit'])) { $mybb->input['action'] = "editpost"; } }	if(!isset($mybb->input['submit'])) { $mybb->input['action'] = "editpost"; } }

if($mybb->input['action'] == "deletepost" && $mybb->request_method == "post") { // Verify incoming POST request	if($mybb->input['action'] == "deletepost" && $mybb->request_method == "post") { // Verify incoming POST request
Zeile 281	Zeile 297
$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 { $moderation->delete_thread($tid);	else { $moderation->delete_thread($tid);
Zeile 294	Zeile 310
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" => '1'));
} else {	} else {
Zeile 349	Zeile 365
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 407	Zeile 423
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 433	Zeile 449
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 667	Zeile 683
$post_errors = ''; }	$post_errors = ''; }
$postoptions_subscriptionmethod_dont = $postoptions_subscriptionmethod_none = $postoptions_subscriptionmethod_email = $postoptions_subscriptionmethod_pm = '';	$subscribe = $nonesubscribe = $emailsubscribe = $pmsubscribe = '';
$postoptionschecked = array('signature' => '', 'disablesmilies' => ''); if(!empty($mybb->input['previewpost']) \|\| $post_errors)	$postoptionschecked = array('signature' => '', 'disablesmilies' => ''); if(!empty($mybb->input['previewpost']) \|\| $post_errors)
Zeile 697	Zeile 713
if(!isset($postoptions['emailnotify'])) { $postoptions['emailnotify'] = 0;	if(!isset($postoptions['emailnotify'])) { $postoptions['emailnotify'] = 0;
} if(!isset($postoptions['disablesmilies'])) {	} if(!isset($postoptions['disablesmilies'])) {
$postoptions['disablesmilies'] = 0; }	$postoptions['disablesmilies'] = 0; }
Zeile 732	Zeile 748
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) { $postoptionschecked['disablesmilies'] = " checked=\"checked\"";	} if(isset($postoptions['disablesmilies']) && $postoptions['disablesmilies'] == 1) { $postoptionschecked['disablesmilies'] = " checked=\"checked\"";
} }	} $subscription_method = get_subscription_method($tid, $postoptions); ${$subscription_method.'subscribe'} = "checked=\"checked\" "; }
} if(!empty($mybb->input['previewpost'])) { if(!$post['uid'])	} if(!empty($mybb->input['previewpost'])) { if(!$post['uid'])
{	{
$query = $db->simple_select('posts', 'username, dateline', "pid='{$pid}'"); $postinfo = $db->fetch_array($query); } else	$query = $db->simple_select('posts', 'username, dateline', "pid='{$pid}'"); $postinfo = $db->fetch_array($query); } else
{	{
// Figure out the poster's other information. $query = $db->query(" SELECT u., f., p.dateline	// Figure out the poster's other information. $query = $db->query(" SELECT u., f., p.dateline
Zeile 778	Zeile 780
"); $postinfo = $db->fetch_array($query); $postinfo['userusername'] = $postinfo['username'];	"); $postinfo = $db->fetch_array($query); $postinfo['userusername'] = $postinfo['username'];
}	}
$query = $db->simple_select("attachments", "*", "pid='{$pid}'"); while($attachment = $db->fetch_array($query)) {	$query = $db->simple_select("attachments", "*", "pid='{$pid}'"); while($attachment = $db->fetch_array($query)) {
Zeile 804	Zeile 806
{ $message = htmlspecialchars_uni($message); $subject = htmlspecialchars_uni($subject);	{ $message = htmlspecialchars_uni($message); $subject = htmlspecialchars_uni($subject);

$preview = '';	$preview = '';

if($post['includesig'] != 0) { $postoptionschecked['signature'] = " checked=\"checked\"";	if($post['includesig'] != 0) { $postoptionschecked['signature'] = " checked=\"checked\"";
}	}
if($post['smilieoff'] == 1)	if($post['smilieoff'] == 1)
{	{
$postoptionschecked['disablesmilies'] = " checked=\"checked\"";	$postoptionschecked['disablesmilies'] = " checked=\"checked\"";
} $query = $db->simple_select("threadsubscriptions", "notification", "tid='{$tid}' AND uid='{$mybb->user['uid']}'"); if($db->num_rows($query) > 0) { $notification = $db->fetch_field($query, 'notification');	}

if($notification == 0) { $postoptions_subscriptionmethod_none = "checked=\"checked\""; } else if($notification == 1) { $postoptions_subscriptionmethod_email = "checked=\"checked\""; } else if($notification == 2) { $postoptions_subscriptionmethod_pm = "checked=\"checked\""; } else { $postoptions_subscriptionmethod_dont = "checked=\"checked\""; } }	$subscription_method = get_subscription_method($tid, $postoptions); ${$subscription_method.'subscribe'} = "checked=\"checked\" ";
} // Generate thread prefix selector if this is the first post of the thread	} // Generate thread prefix selector if this is the first post of the thread
Zeile 937	Zeile 919
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");