Vergleich editpost.php - 1.8.21 - 1.8.29

Zeile 16	Zeile 16
$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_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_warninglevel_formatted,postbit_reputation_formatted_link,editpost_signature,attachment_icon,post_attachments_attachment,post_attachments_add,post_attachments,editpost_postoptions,post_attachments_viewlink";
$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";	$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";
Zeile 192	Zeile 192
} $attacherror = '';	} $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'])))	if($mybb->settings['enableattachments'] == 1 && ($mybb->get_input('newattachment') \|\| $mybb->get_input('updateattachment') \|\| ((($mybb->input['action'] == "do_editpost" && isset($mybb->input['submitbutton'])) \|\| ($mybb->input['action'] == "editpost" && isset($mybb->input['previewpost']))) && $_FILES['attachments'])))
{ // 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'));
Zeile 208	Zeile 208
$ret = add_attachments($pid, $forumpermissions, $attachwhere, "editpost");	$ret = add_attachments($pid, $forumpermissions, $attachwhere, "editpost");
if(!empty($ret['errors']))	if($mybb->get_input('ajax', MyBB::INPUT_INT) == 1) { if(isset($ret['success'])) { $attachment = array('aid'=>'{1}', 'icon'=>'{2}', 'filename'=>'{3}', 'size'=>'{4}'); if($mybb->settings['bbcodeinserter'] != 0 && $forum['allowmycode'] != 0 && $mybb->user['showcodebuttons'] != 0) { eval("\$postinsert = \"".$templates->get("post_attachments_attachment_postinsert")."\";"); } // Moderating options $attach_mod_options = ''; if(is_moderator($fid)) { eval("\$attach_mod_options = \"".$templates->get("post_attachments_attachment_mod_unapprove")."\";"); } eval("\$attach_rem_options = \"".$templates->get("post_attachments_attachment_remove")."\";"); eval("\$attemplate = \"".$templates->get("post_attachments_attachment")."\";"); $ret['template'] = $attemplate; $query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'"); $usage = $db->fetch_array($query); $ret['usage'] = get_friendly_size($usage['ausage']); } header("Content-type: application/json; charset={$lang->settings['charset']}"); echo json_encode($ret); exit(); } if(!empty($ret['errors']))
{ $errors = $ret['errors']; }	{ $errors = $ret['errors']; }
Zeile 217	Zeile 246
if(!empty($errors)) { $attacherror = inline_error($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 we were dealing with an attachment but didn't click 'Update Post', force the post edit page again.
if(!isset($mybb->input['submit']))	if(!isset($mybb->input['submitbutton']))
{ $mybb->input['action'] = "editpost"; } }	{ $mybb->input['action'] = "editpost"; } }
	detect_attachmentact();
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 241	Zeile 272
$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) {	if($mybb->get_input('ajax', MyBB::INPUT_INT) == 1) {
	$query = $db->simple_select("attachments", "SUM(filesize) AS ausage", "uid='".$mybb->user['uid']."'"); $usage = $db->fetch_array($query);
header("Content-type: application/json; charset={$lang->settings['charset']}");	header("Content-type: application/json; charset={$lang->settings['charset']}");
echo json_encode(array("success" => true));	echo json_encode(array("success" => true, "usage" => get_friendly_size($usage['ausage'])));
exit(); }	exit(); }
if(!isset($mybb->input['submit']))	if(!isset($mybb->input['submitbutton']))
{ $mybb->input['action'] = "editpost"; }	{ $mybb->input['action'] = "editpost"; }
Zeile 271	Zeile 305
if($mybb->get_input('delete', MyBB::INPUT_INT) == 1) {	if($mybb->get_input('delete', MyBB::INPUT_INT) == 1) {
$query = $db->simple_select("posts", "pid", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline", "order_dir" => "asc"));	$query = $db->simple_select("posts", "pid", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline, pid"));
$firstcheck = $db->fetch_array($query); if($firstcheck['pid'] == $pid) {	$firstcheck = $db->fetch_array($query); if($firstcheck['pid'] == $pid) {
Zeile 297	Zeile 331
$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);
Zeile 320	Zeile 354
else { redirect(get_forum_link($fid), $lang->redirect_threaddeleted);	else { redirect(get_forum_link($fid), $lang->redirect_threaddeleted);
} }	} }
else { error_no_permission();	else { error_no_permission();
Zeile 341	Zeile 375
$moderation->soft_delete_posts(array($pid)); log_moderator_action($modlogdata, $lang->post_soft_deleted);	$moderation->soft_delete_posts(array($pid)); log_moderator_action($modlogdata, $lang->post_soft_deleted);
} else {	} else {
$moderation->delete_post($pid); mark_reports($pid, "post"); log_moderator_action($modlogdata, $lang->post_deleted); }	$moderation->delete_post($pid); mark_reports($pid, "post"); log_moderator_action($modlogdata, $lang->post_deleted); }
$query = $db->simple_select("posts", "pid", "tid='{$tid}' AND dateline <= '{$post['dateline']}'", array("limit" => 1, "order_by" => "dateline", "order_dir" => "desc"));	$query = $db->simple_select("posts", "pid", "tid='{$tid}' AND dateline <= '{$post['dateline']}'", array("limit" => 1, "order_by" => "dateline DESC, pid DESC"));
$next_post = $db->fetch_array($query); if($next_post['pid']) { $redirect = get_post_link($next_post['pid'], $tid)."#pid{$next_post['pid']}";	$next_post = $db->fetch_array($query); if($next_post['pid']) { $redirect = get_post_link($next_post['pid'], $tid)."#pid{$next_post['pid']}";
} else	} else
{ $redirect = get_thread_link($tid); }	{ $redirect = get_thread_link($tid); }
Zeile 366	Zeile 400
if(is_moderator($fid, "canviewdeleted")) { echo json_encode(array("data" => '1', "first" => '0'));	if(is_moderator($fid, "canviewdeleted")) { echo json_encode(array("data" => '1', "first" => '0'));
}	}
else { echo json_encode(array("data" => '2'));	else { echo json_encode(array("data" => '2'));
Zeile 386	Zeile 420
else { error($lang->redirect_nodelete);	else { error($lang->redirect_nodelete);
} }	} }
if($mybb->input['action'] == "restorepost" && $mybb->request_method == "post") { // Verify incoming POST request	if($mybb->input['action'] == "restorepost" && $mybb->request_method == "post") { // Verify incoming POST request
Zeile 398	Zeile 432
if($mybb->get_input('restore', MyBB::INPUT_INT) == 1) {	if($mybb->get_input('restore', MyBB::INPUT_INT) == 1) {
$query = $db->simple_select("posts", "pid", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline", "order_dir" => "asc"));	$query = $db->simple_select("posts", "pid", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline, pid"));
$firstcheck = $db->fetch_array($query); if($firstcheck['pid'] == $pid) {	$firstcheck = $db->fetch_array($query); if($firstcheck['pid'] == $pid) {
Zeile 428	Zeile 462
else { redirect(get_forum_link($fid), $lang->redirect_threadrestored);	else { redirect(get_forum_link($fid), $lang->redirect_threadrestored);
}	}
} else {	} else {
Zeile 447	Zeile 481
$redirect = get_post_link($pid, $tid)."#pid{$pid}"; if($mybb->input['ajax'] == 1)	$redirect = get_post_link($pid, $tid)."#pid{$pid}"; if($mybb->input['ajax'] == 1)
{	{
header("Content-type: application/json; charset={$lang->settings['charset']}"); echo json_encode(array("data" => '1', "first" => '0')); }	header("Content-type: application/json; charset={$lang->settings['charset']}"); echo json_encode(array("data" => '1', "first" => '0')); }
Zeile 467	Zeile 501
error($lang->redirect_norestore); } }	error($lang->redirect_norestore); } }
	$postoptions = array();
if($mybb->input['action'] == "do_editpost" && $mybb->request_method == "post") {	if($mybb->input['action'] == "do_editpost" && $mybb->request_method == "post") {
Zeile 565	Zeile 601
if(!$mybb->input['action'] \|\| $mybb->input['action'] == "editpost") { $plugins->run_hooks("editpost_action_start");	if(!$mybb->input['action'] \|\| $mybb->input['action'] == "editpost") { $plugins->run_hooks("editpost_action_start");

if(!isset($mybb->input['previewpost'])) { $icon = $post['icon'];	if(!isset($mybb->input['previewpost'])) { $icon = $post['icon'];
Zeile 580	Zeile 616
eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); $deletebox = '';	eval("\$loginbox = \"".$templates->get("changeuserbox")."\";"); $deletebox = '';
// Can we delete posts? if($post['visible'] != -1 && (is_moderator($fid, "candeleteposts") \|\| $forumpermissions['candeleteposts'] == 1 && $mybb->user['uid'] == $post['uid']))	if($post['visible'] != -1 && (($thread['firstpost'] == $pid && (is_moderator($fid, "candeletethreads") \|\| $forumpermissions['candeletethreads'] == 1 && $mybb->user['uid'] == $post['uid'])) \|\| ($thread['firstpost'] != $pid && (is_moderator($fid, "candeleteposts") \|\| $forumpermissions['candeleteposts'] == 1 && $mybb->user['uid'] == $post['uid']))))
{ eval("\$deletebox = \"".$templates->get("editpost_delete")."\";"); }	{ eval("\$deletebox = \"".$templates->get("editpost_delete")."\";"); }
Zeile 622	Zeile 657
if($attachment['visible'] != 1) { eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");	if($attachment['visible'] != 1) { eval("\$attachments .= \"".$templates->get("post_attachments_attachment_unapproved")."\";");
}	}
else { eval("\$attachments .= \"".$templates->get("post_attachments_attachment")."\";");	else { eval("\$attachments .= \"".$templates->get("post_attachments_attachment")."\";");
Zeile 643	Zeile 678
{ $friendlyquota = $lang->unlimited; }	{ $friendlyquota = $lang->unlimited; }
else { $friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024); } $friendlyusage = get_friendly_size($usage['ausage']); $lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyusage, $friendlyquota);	else { $friendlyquota = get_friendly_size($mybb->usergroup['attachquota']*1024); } $lang->attach_quota = $lang->sprintf($lang->attach_quota, $friendlyquota); $link_viewattachments = ''; 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 = ""; } $attach_update_options = '';
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->settings['maxattachments'] == 0 \|\| ($mybb->settings['maxattachments'] != 0 && $attachcount < $mybb->settings['maxattachments']) && !$noshowattach) { eval("\$attach_add_options = \"".$templates->get("post_attachments_add")."\";");
Zeile 657	Zeile 708
if(($mybb->usergroup['caneditattachments'] \|\| $forumpermissions['caneditattachments']) && $attachcount > 0) { eval("\$attach_update_options = \"".$templates->get("post_attachments_update")."\";");	if(($mybb->usergroup['caneditattachments'] \|\| $forumpermissions['caneditattachments']) && $attachcount > 0) { eval("\$attach_update_options = \"".$templates->get("post_attachments_update")."\";");
}	}
if($attach_add_options \|\| $attach_update_options) { eval("\$newattach = \"".$templates->get("post_attachments_new")."\";"); } eval("\$attachbox = \"".$templates->get("post_attachments")."\";");	if($attach_add_options \|\| $attach_update_options) { eval("\$newattach = \"".$templates->get("post_attachments_new")."\";"); } eval("\$attachbox = \"".$templates->get("post_attachments")."\";");
}	} else { $attachbox = ''; }
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 718	Zeile 773
if(!isset($postoptions['emailnotify'])) { $postoptions['emailnotify'] = 0;	if(!isset($postoptions['emailnotify'])) { $postoptions['emailnotify'] = 0;
}	}
if(!isset($postoptions['disablesmilies'])) { $postoptions['disablesmilies'] = 0;	if(!isset($postoptions['disablesmilies'])) { $postoptions['disablesmilies'] = 0;
Zeile 740	Zeile 795
$post_errors = inline_error($post_errors); $mybb->input['action'] = "editpost"; $mybb->input['previewpost'] = 0;	$post_errors = inline_error($post_errors); $mybb->input['action'] = "editpost"; $mybb->input['previewpost'] = 0;
} else { $postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);	} else { $postoptions = $mybb->get_input('postoptions', MyBB::INPUT_ARRAY);
if(isset($postoptions['signature']) && $postoptions['signature'] == 1) { $postoptionschecked['signature'] = " checked=\"checked\"";	if(isset($postoptions['signature']) && $postoptions['signature'] == 1) { $postoptionschecked['signature'] = " checked=\"checked\"";
Zeile 852	Zeile 907
// Fetch subscription select box eval("\$subscriptionmethod = \"".$templates->get("post_subscription_method")."\";");	// Fetch subscription select box eval("\$subscriptionmethod = \"".$templates->get("post_subscription_method")."\";");
$query = $db->simple_select("posts", "*", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline", "order_dir" => "asc"));	$query = $db->simple_select("posts", "*", "tid='{$tid}'", array("limit" => 1, "order_by" => "dateline, pid"));
$firstcheck = $db->fetch_array($query); $time = TIME_NOW;	$firstcheck = $db->fetch_array($query); $time = TIME_NOW;
Zeile 918	Zeile 973
} }	} }
$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_upload_size = get_php_upload_limit();
$php_max_file_uploads = (int)ini_get('max_file_uploads'); eval("\$post_javascript = \"".$templates->get("post_javascript")."\";");	$php_max_file_uploads = (int)ini_get('max_file_uploads'); eval("\$post_javascript = \"".$templates->get("post_javascript")."\";");