makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-25 11:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Fix delete_post() function

Browse source 
PHPBB3-9567
This commit is contained in:
Joas Schilling 2012-10-06 16:36:38 +02:00
parent 7c09b5b89c
commit 44005f338e
2 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/includes/content_visibility.php
View file

@ -316,14 +316,15 @@ class phpbb_content_visibility
} }
/** /**
* Do the required math to hide a complete topic (going from approved to deleted) * Remove topic from forum statistics
* @param $topic_id - int - the topic to act on *
* @param $forum_id - int - the forum where the topic resides * @param $topic_id int The topic to act on
* @param $topic_row - array - data about the topic, may be empty at call time * @param $forum_id int Forum where the topic is found
* @param $sql_data - array - populated with the SQL changes, may be empty at call time * @param $topic_row array Contains information from the topic, may be empty at call time
* @param $sql_data array Populated with the SQL changes, may be empty at call time
* @return void * @return void
*/ */
static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data) static public function remove_topic_from_statistic($topic_id, $forum_id, &$topic_row, &$sql_data)
{ {
global $db; global $db;
@ -339,7 +340,7 @@ class phpbb_content_visibility
} }
// If this is an edited topic or the first post the topic gets completely disapproved later on... // If this is an edited topic or the first post the topic gets completely disapproved later on...
$sql_data[FORUMS_TABLE] = 'forum_topics = forum_topics - 1'; $sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_topics = forum_topics - 1';
$sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1); $sql_data[FORUMS_TABLE] .= ', forum_posts = forum_posts - ' . ($topic_row['topic_replies'] + 1);
set_config_count('num_topics', -1, true); set_config_count('num_topics', -1, true);
@ -366,15 +367,15 @@ class phpbb_content_visibility
* @param $sql_data array Populated with the SQL changes, may be empty at call time * @param $sql_data array Populated with the SQL changes, may be empty at call time
* @return void * @return void
*/ */
static public function remove_post_from_postcount($forum_id, $data, &$sql_data) static public function remove_post_from_statistic($forum_id, $data, &$sql_data)
{ {
$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1'; $sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_replies = topic_replies - 1';
$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1'; $sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . 'forum_posts = forum_posts - 1';
if ($data['post_postcount']) if ($data['post_postcount'])
{ {
$sql_data[USERS_TABLE] = ($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1'; $sql_data[USERS_TABLE] = (($sql_data[USERS_TABLE]) ? $sql_data[USERS_TABLE] . ', ' : '') . 'user_posts = user_posts - 1';
} }
set_config_count('num_posts', -1, true); set_config_count('num_posts', -1, true);

48
phpBB/includes/functions_posting.php
View file

@ -1490,7 +1490,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
{ {
// counting is fun! we only have to do sizeof($forum_ids) number of queries, // counting is fun! we only have to do sizeof($forum_ids) number of queries,
// even if the topic is moved back to where its shadow lives (we count how many times it is in a forum) // even if the topic is moved back to where its shadow lives (we count how many times it is in a forum)
$db->sql_query('UPDATE ' . FORUMS_TABLE . ' SET forum_topics_real = forum_topics_real - ' . $topic_count . ', forum_topics = forum_topics - ' . $topic_count . ' WHERE forum_id = ' . $updated_forum); $sql = 'UPDATE ' . FORUMS_TABLE . '
SET forum_topics_real = forum_topics_real - ' . $topic_count . ',
forum_topics = forum_topics - ' . $topic_count . '
WHERE forum_id = ' . $updated_forum;
$db->sql_query($sql);
update_post_information('forum', $updated_forum); update_post_information('forum', $updated_forum);
} }
@ -1498,18 +1502,15 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
{ {
$topic_row = array(); $topic_row = array();
phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason); phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id, $user->data['user_id'], time(), $softdelete_reason);
phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data); phpbb_content_visibility::remove_topic_from_statistic($topic_id, $forum_id, $topic_row, $sql_data);
} }
else else
{ {
delete_topics('topic_id', array($topic_id), false); delete_topics('topic_id', array($topic_id), false);
if ($data['topic_type'] != POST_GLOBAL) $sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
{ $sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
$sql_data[FORUMS_TABLE] .= 'forum_topics_real = forum_topics_real - 1';
$sql_data[FORUMS_TABLE] .= ($data['topic_visibility'] == ITEM_APPROVED) ? ', forum_posts = forum_posts - 1, forum_topics = forum_topics - 1' : '';
}
$update_sql = update_post_information('forum', $forum_id, true); $update_sql = update_post_information('forum', $forum_id, true);
if (sizeof($update_sql)) if (sizeof($update_sql))
@ -1526,16 +1527,30 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
WHERE p.topic_id = $topic_id WHERE p.topic_id = $topic_id
AND p.poster_id = u.user_id AND p.poster_id = u.user_id
ORDER BY p.post_time ASC"; AND p.post_visibility = " . ITEM_APPROVED . '
ORDER BY p.post_time ASC';
$result = $db->sql_query_limit($sql, 1); $result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
$db->sql_freeresult($result); $db->sql_freeresult($result);
if (!$row)
{
// No approved post, so the first is a not-approved post (unapproved or soft deleted)
$sql = 'SELECT p.post_id, p.poster_id, p.post_time, p.post_username, u.username, u.user_colour
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . " u
WHERE p.topic_id = $topic_id
AND p.poster_id = u.user_id
ORDER BY p.post_time ASC";
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
}
$next_post_id = (int) $row['post_id']; $next_post_id = (int) $row['post_id'];
$sql_data[TOPICS_TABLE] = $db->sql_build_array('UPDATE', array( $sql_data[TOPICS_TABLE] = $db->sql_build_array('UPDATE', array(
'topic_poster' => (int) $row['poster_id'], 'topic_poster' => (int) $row['poster_id'],
'topic_first_post_id' => (int) $row['post_id'] 'topic_first_post_id' => (int) $row['post_id'],
'topic_first_poster_colour' => $row['user_colour'], 'topic_first_poster_colour' => $row['user_colour'],
'topic_first_poster_name' => ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'], 'topic_first_poster_name' => ($row['poster_id'] == ANONYMOUS) ? $row['post_username'] : $row['username'],
'topic_time' => (int) $row['post_time'], 'topic_time' => (int) $row['post_time'],
@ -1545,13 +1560,14 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
case 'delete_last_post': case 'delete_last_post':
if (!$is_soft) if (!$is_soft)
{ {
// Update last post information when hard deleting. Soft delete already did that by itself.
$update_sql = update_post_information('forum', $forum_id, true); $update_sql = update_post_information('forum', $forum_id, true);
if (sizeof($update_sql)) if (sizeof($update_sql))
{ {
$sql_data[FORUMS_TABLE] = ($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . implode(', ', $update_sql[$forum_id]); $sql_data[FORUMS_TABLE] = (($sql_data[FORUMS_TABLE]) ? $sql_data[FORUMS_TABLE] . ', ' : '') . implode(', ', $update_sql[$forum_id]);
} }
$sql_data[TOPICS_TABLE] = ($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_bumped = 0, topic_bumper = 0'; $sql_data[TOPICS_TABLE] = (($sql_data[TOPICS_TABLE]) ? $sql_data[TOPICS_TABLE] . ', ' : '') . 'topic_bumped = 0, topic_bumper = 0';
$update_sql = update_post_information('topic', $topic_id, true); $update_sql = update_post_information('topic', $topic_id, true);
if (!empty($update_sql)) if (!empty($update_sql))
@ -1586,11 +1602,11 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false, $
break; break;
} }
if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post')) if (($post_mode == 'delete') || ($post_mode == 'delete_last_post') || ($post_mode == 'delete_first_post' && !$is_soft))
{ {
if ($data['post_visibility'] == ITEM_APPROVED) if ($data['post_visibility'] == ITEM_APPROVED)
{ {
phpbb_content_visibility::remove_post_from_postcount($forum_id, $data, $sql_data); phpbb_content_visibility::remove_post_from_statistic($forum_id, $data, $sql_data);
} }
if (!$is_soft) if (!$is_soft)
@ -1945,7 +1961,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
// Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved // Correctly set back the topic replies and forum posts... only if the topic was approved before and now gets disapproved
if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED) if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
{ {
phpbb_content_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data); phpbb_content_visibility::remove_topic_from_statistic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
} }
break; break;
@ -1956,8 +1972,8 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
// Correctly set back the topic replies and forum posts... but only if the post was approved before. // Correctly set back the topic replies and forum posts... but only if the post was approved before.
if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED) if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
{ {
//phpbb_content_visibility::remove_post_from_postcount($forum_id, $current_time, $sql_data); //phpbb_content_visibility::remove_post_from_statistic($forum_id, $current_time, $sql_data);
// ^^ hide_post SQL is identical, except that it does not include the ['stat'] sub-array // ^^ remove_post_from_statistic SQL is identical, except that it does not include the ['stat'] sub-array
$sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time; $sql_data[TOPICS_TABLE]['stat'][] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
$sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1'; $sql_data[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';