makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Fix restoring posts via MCP

Browse source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-13 19:00:08 +02:00
parent 18f77020e5
commit 4bf922fa03
2 changed files with 48 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
phpBB/includes/mcp/mcp_queue.php
View file

@ -230,14 +230,7 @@ class mcp_queue
case 'unapproved_topics': case 'unapproved_topics':
case 'unapproved_posts': case 'unapproved_posts':
case 'deleted_posts': case 'deleted_posts':
if ($mode == 'deleted_posts')
{
$m_perm = 'm_restore';
}
else
{
$m_perm = 'm_approve'; $m_perm = 'm_approve';
}
$user->add_lang(array('viewtopic', 'viewforum')); $user->add_lang(array('viewtopic', 'viewforum'));
@ -472,7 +465,7 @@ function restore_post($post_id_list, $id, $mode)
global $db, $template, $user, $config; global $db, $template, $user, $config;
global $phpEx, $phpbb_root_path, $request; global $phpEx, $phpbb_root_path, $request;
if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_restore'))) if (!check_ids($post_id_list, POSTS_TABLE, 'post_id', array('m_approve')))
{ {
trigger_error('NOT_AUTHORISED'); trigger_error('NOT_AUTHORISED');
} }
@ -481,9 +474,51 @@ function restore_post($post_id_list, $id, $mode)
$redirect = reapply_sid($redirect); $redirect = reapply_sid($redirect);
$success_msg = ''; $success_msg = '';
$post_info = get_post_data($post_id_list, 'm_restore'); $post_info = get_post_data($post_id_list, 'm_approve');
$success_msg = phpbb_content_visibility::unhide_posts_topics('restore', $post_info, $post_id_list); $topic_info = array();
// Group the posts by topic_id
foreach ($post_info as $post_id => $post_data)
{
if ($post_data['post_visibility'] == ITEM_APPROVED)
{
continue;
}
$topic_id = (int) $post_data['topic_id'];
$topic_info[$topic_id]['posts'][] = (int) $post_id;
$topic_info[$topic_id]['forum_id'] = (int) $post_data['forum_id'];
if ($post_id == $post_data['topic_first_post_id'])
{
$topic_info[$topic_id]['first_post'] = true;
}
if ($post_id == $post_data['topic_last_post_id'])
{
$topic_info[$topic_id]['last_post'] = true;
}
}
foreach ($topic_info as $topic_id => $topic_data)
{
phpbb_content_visibility::set_post_visibility(ITEM_APPROVED, $topic_data['posts'], $topic_id, $topic_data['forum_id'], $user->data['user_id'], time(), '', isset($topic_data['first_post']), isset($topic_data['last_post']));
}
$success_msg = '';
/**
* Currently only works for approving posts
if (sizeof($topic_info) > 1)
{
$success_msg = ((sizeof($post_info) == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
}
else
*/
if (sizeof($post_info) >= 1)
{
$success_msg = (sizeof($post_info) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
}
if (!$success_msg) if (!$success_msg)
{ {
@ -491,8 +526,6 @@ function restore_post($post_id_list, $id, $mode)
} }
else else
{ {
meta_refresh(3, $redirect);
// If approving one post, also give links back to post... // If approving one post, also give links back to post...
$add_message = ''; $add_message = '';
if (sizeof($post_id_list) == 1 && !empty($post_url)) if (sizeof($post_id_list) == 1 && !empty($post_url))
@ -513,6 +546,7 @@ function restore_post($post_id_list, $id, $mode)
)); ));
} }
meta_refresh(3, $redirect);
trigger_error($message); trigger_error($message);
} }
} }

2
phpBB/mcp.php
View file

@ -483,7 +483,7 @@ function get_post_data($post_ids, $acl_list = false, $read_tracking = false)
continue; continue;
} }
if ($row['post_visibility'] == ITEM_UNAPPROVED && !$auth->acl_get('m_approve', $row['forum_id'])) if ($row['post_visibility'] != ITEM_APPROVED && !$auth->acl_get('m_approve', $row['forum_id']))
{ {
// Moderators without the permission to approve post should at least not see them. ;) // Moderators without the permission to approve post should at least not see them. ;)
continue; continue;