mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 17:56:52 +02:00
Code Issues Releases Wiki Activity

[feature/soft-delete] Fix some small bugs

Browse Source 
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
This commit is contained in:
Josh Woody
2010-07-17 14:34:36 -05:00
committed by Joas Schilling
parent f570558a8d
commit 1ab41f8dc6
8 changed files with 98 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
phpBB/includes/class_content_visibility.php
View File

@@ -30,7 +30,7 @@ class phpbb_content_visibility
* @param $table_alias string - Table alias to prefix in SQL queries
* @return string with the appropriate combination SQL logic for topic/post_visibility
*/
public function get_visibility_sql($mode, $forum_id, $table_alias = '')
static public function get_visibility_sql($mode, $forum_id, $table_alias = '')
{
global $auth, $db, $user;
@@ -67,7 +67,7 @@ class phpbb_content_visibility
* @param $table_alias string - Table alias to prefix in SQL queries
* @return string with the appropriate combination SQL logic for topic/post_visibility
*/
public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
{
global $auth, $db, $user;
@@ -116,7 +116,7 @@ class phpbb_content_visibility
* @param $forum_id - int - forum ID where $topic_id resides
* @return bool true = success, false = fail
*/
public function set_topic_visibility($visibility, $topic_id, $forum_id)
static public function set_topic_visibility($visibility, $topic_id, $forum_id)
{
global $db;
@@ -139,7 +139,7 @@ class phpbb_content_visibility
* @param $is_starter - bool - is this the first post of the topic
* @param $is_latest - bool - is this the last post of the topic
*/
public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
static public function set_post_visibility($visibility, $post_id, $topic_id, $forum_id, $is_starter, $is_latest)
{
global $db;
@@ -182,7 +182,7 @@ class phpbb_content_visibility
* @param $post_locked - bool - is the post locked?
* @return bool
*/
public function can_soft_delete($forum_id, $poster_id, $post_locked)
static function can_soft_delete($forum_id, $poster_id, $post_locked)
{
global $auth, $user;
@@ -228,7 +228,7 @@ class phpbb_content_visibility
* @param $sql_data - array - populated with the SQL changes, may be empty at call time
* @return void
*/
public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
static public function hide_topic($topic_id, $forum_id, &$topic_row, &$sql_data)
{
global $auth, $config, $db;
@@ -266,14 +266,27 @@ class phpbb_content_visibility
* Notably, we do _not_ need the post ID to do this operation. We're only changing statistic caches
* @param $forum_id - int - the forum where the topic resides
* @param $current_time - int - passed for consistency instead of calling time() internally
* @param $topic_row - array - contains information from the topics table about given topic
* @param $sql_data - array - populated with the SQL changes, may be empty at call time
* @return void
*/
public function hide_post($forum_id, $current_time, &$sql_data)
static public function hide_post($forum_id, $current_time, $topic_row, &$sql_data)
{
global $auth, $config, $db;
$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1, topic_last_view_time = ' . $current_time;
// initialize the array if needed (php throws E_NOTICE when .= is used
// on a non-existing array element)
if (empty($sql_data[TOPICS_TABLE]))
{
$sql_data[TOPICS_TABLE] = '';
}
if ($topic_row['topic_replies'] > 0)
{
$sql_data[TOPICS_TABLE] = 'topic_replies = topic_replies - 1,';
}
$sql_data[TOPICS_TABLE] .= ' topic_last_view_time = ' . $current_time;
$sql_data[FORUMS_TABLE] = 'forum_posts = forum_posts - 1';
set_config_count('num_posts', -1, true);
@@ -293,7 +306,7 @@ class phpbb_content_visibility
* the posts/topics in question
* @param $post_id_list - array of ints - the set of posts being worked on
*/
public function unhide_posts_topics($mode, $post_info, $post_id_list)
static public function unhide_posts_topics($mode, $post_info, $post_id_list)
{
global $db, $config;
@@ -435,6 +448,15 @@ class phpbb_content_visibility
sync('forum', 'forum_id', array_keys($forum_id_list), true, true);
unset($topic_id_list, $forum_id_list);
return true;
if ($total_topics)
{
$success_msg = ($total_topics == 1) ? 'TOPIC_APPROVED_SUCCESS' : 'TOPICS_APPROVED_SUCCESS';
}
else
{
$success_msg = (sizeof($post_id_list) + sizeof($post_approved_list) == 1) ? 'POST_APPROVED_SUCCESS' : 'POSTS_APPROVED_SUCCESS';
}
return $success_msg;
}
}

8
phpBB/includes/functions_posting.php
View File

@@ -1467,7 +1467,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, ($data['topic_first_post_id'] == $post_id), ($data['topic_last_post_id'] == $post_id));
phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
}
else
{
@@ -1501,7 +1501,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
$topic_row = array();
phpbb_content_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
phpbb_content_visibility::set_topic_visibility(ITEM_DELETED, $topic_id, $forum_id);
phpbb_content_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
}
else
@@ -1548,8 +1548,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
case 'delete_last_post':
if ($is_soft)
{
phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
phpbb_content_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
phpbb_content_visibility::hide_post($forum_id, time(), $data, $sql_data);
phpbb_content_visibility::set_post_visibility(ITEM_DELETED, $post_id, $topic_id, $forum_id, false, true);
}
else
{

3
phpBB/includes/mcp/mcp_queue.php
View File

@@ -322,6 +322,7 @@ class mcp_queue
if ($mode == 'unapproved_posts' || $mode == 'deleted_posts')
{
$visibility_const = ($mode == 'unapproved_posts') ? ITEM_UNAPPROVED : ITEM_DELETED;
$starter_sql = ($mode == 'unapproved_posts') ? 'AND t.topic_first_post_id <> p.post_id' : '';
$sql = 'SELECT p.post_id
FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t' . (($sort_order_sql[0] == 'u') ? ', ' . USERS_TABLE . ' u' : '') . '
@@ -330,7 +331,7 @@ class mcp_queue
' . (($sort_order_sql[0] == 'u') ? 'AND u.user_id = p.poster_id' : '') . '
' . (($topic_id) ? 'AND p.topic_id = ' . $topic_id : '') . "
AND t.topic_id = p.topic_id
AND t.topic_first_post_id <> p.post_id
$starter_sql
$limit_time_sql
ORDER BY $sort_order_sql";
$result = $db->sql_query_limit($sql, $config['topics_per_page'], $start);