Vergleich moderation.php - 1.8.10 - 1.8.15

Keine Änderungen Hinzugefügt Modifiziert Entfernt
Zeile 11	Zeile 11
define("IN_MYBB", 1); define('THIS_SCRIPT', 'moderation.php');	define("IN_MYBB", 1); define('THIS_SCRIPT', 'moderation.php');
$templatelist = "changeuserbox,loginbox,moderation_delayedmoderation_custommodtool,moderation_delayedmodaction_notes,moderation_delayedmoderation_merge,moderation_delayedmoderation_move"; $templatelist .= ",moderation_delayedmoderation,moderation_deletethread,moderation_deletepoll,moderation_mergeposts_post,moderation_viewthreadnotes,moderation_confirmation,moderation_purgespammer"; $templatelist .= ",moderation_move,moderation_threadnotes_modaction,moderation_threadnotes_delayedmodaction,moderation_threadnotes,moderation_getip_modoptions,moderation_getip,moderation_getpmip";	$templatelist = "changeuserbox,loginbox,moderation_delayedmoderation_custommodtool,moderation_delayedmodaction_notes,moderation_delayedmoderation_merge,moderation_delayedmoderation_move,moderation_threadnotes"; $templatelist .= ",moderation_delayedmoderation,moderation_deletethread,moderation_deletepoll,moderation_mergeposts_post,moderation_viewthreadnotes,moderation_confirmation,moderation_purgespammer,forumjump_bit"; $templatelist .= ",moderation_move,moderation_threadnotes_modaction,moderation_threadnotes_delayedmodaction,moderation_getip_modoptions,moderation_getip,moderation_getpmip,moderation_getpmip_modal";
$templatelist .= ",moderation_split_post,moderation_inline_deletethreads,moderation_inline_movethreads,moderation_inline_deleteposts,moderation_inline_mergeposts,moderation_threadnotes_modaction_error"; $templatelist .= ",moderation_inline_splitposts,forumjump_special,forumjump_advanced,forumdisplay_password_wrongpass,forumdisplay_password,moderation_inline_moveposts,moderation_delayedmodaction_error"; $templatelist .= ",moderation_delayedmodaction_notes_thread_single,moderation_delayedmodaction_notes_thread_multiple,moderation_delayedmodaction_notes_forum,moderation_delayedmodaction_notes_new_forum";	$templatelist .= ",moderation_split_post,moderation_inline_deletethreads,moderation_inline_movethreads,moderation_inline_deleteposts,moderation_inline_mergeposts,moderation_threadnotes_modaction_error"; $templatelist .= ",moderation_inline_splitposts,forumjump_special,forumjump_advanced,forumdisplay_password_wrongpass,forumdisplay_password,moderation_inline_moveposts,moderation_delayedmodaction_error"; $templatelist .= ",moderation_delayedmodaction_notes_thread_single,moderation_delayedmodaction_notes_thread_multiple,moderation_delayedmodaction_notes_forum,moderation_delayedmodaction_notes_new_forum";
$templatelist .= ",moderation_delayedmodaction_notes_redirect,moderation_delayedmodaction_notes_merge,moderation_delayedmoderation_thread,moderation_threadnotes_modaction_thread,forumjump_bit";	$templatelist .= ",moderation_delayedmodaction_notes_redirect,moderation_delayedmodaction_notes_merge,moderation_delayedmoderation_thread,moderation_threadnotes_modaction_thread,moderation_getip_modal";
$templatelist .= ",moderation_delayedmoderation_date_day,moderation_delayedmoderation_date_month,moderation_threadnotes_modaction_post,moderation_merge,moderation_split,moderation_threadnotes_modaction_forum";	$templatelist .= ",moderation_delayedmoderation_date_day,moderation_delayedmoderation_date_month,moderation_threadnotes_modaction_post,moderation_merge,moderation_split,moderation_threadnotes_modaction_forum";
	$templatelist .= ",moderation_delayedmoderation_openclose,moderation_delayedmoderation_softdeleterestore,moderation_delayedmoderation_delete,moderation_delayedmoderation_stick,moderation_delayedmoderation_approve";
require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";	require_once "./global.php"; require_once MYBB_ROOT."inc/functions_post.php";
Zeile 37	Zeile 38
$pid = $mybb->get_input('pid', MyBB::INPUT_INT); $fid = $mybb->get_input('fid', MyBB::INPUT_INT); $pmid = $mybb->get_input('pmid', MyBB::INPUT_INT);	$pid = $mybb->get_input('pid', MyBB::INPUT_INT); $fid = $mybb->get_input('fid', MyBB::INPUT_INT); $pmid = $mybb->get_input('pmid', MyBB::INPUT_INT);
	$modal = $mybb->get_input('modal', MyBB::INPUT_INT);
if($pid) {	if($pid) {
Zeile 106	Zeile 108
{ // Check if this forum is password protected and we have a valid password check_forum_password($forum['fid']);	{ // Check if this forum is password protected and we have a valid password check_forum_password($forum['fid']);
	} $log_multithreads_actions = array("do_multideletethreads", "multiclosethreads", "multiopenthreads", "multiapprovethreads", "multiunapprovethreads", "multirestorethreads", "multisoftdeletethreads","multistickthreads", "multiunstickthreads", "do_multimovethreads"); if(in_array($mybb->input['action'], $log_multithreads_actions)) { if(!empty($mybb->input['searchid'])) { $tids = getids($mybb->get_input('searchid'), 'search'); } else { $tids = getids($fid, 'forum'); } $modlogdata['tids'] = (array)$tids; unset($tids);
} $mybb->user['username'] = htmlspecialchars_uni($mybb->user['username']); eval("\$loginbox = \"".$templates->get("changeuserbox")."\";");	} $mybb->user['username'] = htmlspecialchars_uni($mybb->user['username']); eval("\$loginbox = \"".$templates->get("changeuserbox")."\";");
$allowable_moderation_actions = array("getip", "getpmip", "cancel_delayedmoderation", "delayedmoderation", "threadnotes", "purgespammer", "viewthreadnotes");	$allowable_moderation_actions = array("getip", "getpmip", "cancel_delayedmoderation", "delayedmoderation", "threadnotes", "purgespammer", "viewthreadnotes");
if($mybb->request_method != "post" && !in_array($mybb->input['action'], $allowable_moderation_actions))	if($mybb->request_method != "post" && !in_array($mybb->input['action'], $allowable_moderation_actions))
{	{
error_no_permission(); }	error_no_permission(); }
Zeile 123	Zeile 142
{ // Delayed Moderation case "cancel_delayedmoderation":	{ // Delayed Moderation case "cancel_delayedmoderation":
// 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'));
add_breadcrumb($lang->delayed_moderation); if(!is_moderator($fid, "canmanagethreads"))	add_breadcrumb($lang->delayed_moderation); if(!is_moderator($fid, "canmanagethreads"))
{	{
error_no_permission();	error_no_permission();
} $plugins->run_hooks('moderation_cancel_delayedmoderation');	} $plugins->run_hooks('moderation_cancel_delayedmoderation');
$db->delete_query("delayedmoderation", "did='".$mybb->get_input('did', MyBB::INPUT_INT)."'"); if($tid == 0) {	$db->delete_query("delayedmoderation", "did='".$mybb->get_input('did', MyBB::INPUT_INT)."'"); if($tid == 0) {
moderation_redirect(get_forum_link($fid), $lang->redirect_delayed_moderation_cancelled); } else {	moderation_redirect(get_forum_link($fid), $lang->redirect_delayed_moderation_cancelled); } else {
moderation_redirect("moderation.php?action=delayedmoderation&tid={$tid}&my_post_key={$mybb->post_code}", $lang->redirect_delayed_moderation_cancelled); } break;	moderation_redirect("moderation.php?action=delayedmoderation&tid={$tid}&my_post_key={$mybb->post_code}", $lang->redirect_delayed_moderation_cancelled); } break;
Zeile 195	Zeile 214
$errors = array(); $customthreadtools = "";	$errors = array(); $customthreadtools = "";
$allowed_types = array('openclosethread', 'softdeleterestorethread', 'deletethread', 'move', 'stick', 'merge', 'removeredirects', 'removesubscriptions', 'approveunapprovethread');	$allowed_types = array('move', 'merge', 'removeredirects', 'removesubscriptions');

$mybb->input['type'] = $mybb->get_input('type'); switch($db->type)	if(is_moderator($fid, "canopenclosethreads"))
{	{
case "pgsql": case "sqlite": $query = $db->simple_select("modtools", 'tid, name', "(','\|\|forums\|\|',' LIKE '%,$fid,%' OR ','\|\|forums\|\|',' LIKE '%,-1,%' OR forums='') AND type = 't'"); break; default: $query = $db->simple_select("modtools", 'tid, name', "(CONCAT(',',forums,',') LIKE '%,$fid,%' OR CONCAT(',',forums,',') LIKE '%,-1,%' OR forums='') AND type = 't'"); } while($tool = $db->fetch_array($query))	$allowed_types[] = "openclosethread"; } if(is_moderator($fid, "cansoftdeletethreads") \|\| is_moderator($fid, "canrestorethreads")) { $allowed_types[] = "softdeleterestorethread"; } if(is_moderator($fid, "candeletethreads")) { $allowed_types[] = "deletethread"; } if(is_moderator($fid, "canstickunstickthreads")) { $allowed_types[] = "stick"; } if(is_moderator($fid, "canapproveunapprovethreads")) { $allowed_types[] = "approveunapprovethread"; } $mybb->input['type'] = $mybb->get_input('type'); if(is_moderator($fid, "canusecustomtools"))
{	{
$allowed_types[] = "modtool_".$tool['tid']; $tool['name'] = htmlspecialchars_uni($tool['name']); $checked = ""; if($mybb->input['type'] == "modtool_".$tool['tid'])	switch($db->type) { case "pgsql": case "sqlite": $query = $db->simple_select("modtools", 'tid, name, groups', "(','\|\|forums\|\|',' LIKE '%,$fid,%' OR ','\|\|forums\|\|',' LIKE '%,-1,%' OR forums='') AND type = 't'"); break; default: $query = $db->simple_select("modtools", 'tid, name, groups', "(CONCAT(',',forums,',') LIKE '%,$fid,%' OR CONCAT(',',forums,',') LIKE '%,-1,%' OR forums='') AND type = 't'"); } while($tool = $db->fetch_array($query))
{	{
$checked = "checked=\"checked\""; }	if(is_member($tool['groups'])) { $allowed_types[] = "modtool_".$tool['tid']; $tool['name'] = htmlspecialchars_uni($tool['name']); $checked = ""; if($mybb->input['type'] == "modtool_".$tool['tid']) { $checked = "checked=\"checked\""; }