aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-06-30 13:38:49 -0500
committerJoas Schilling <nickvergessen@gmx.de>2012-08-29 17:50:11 +0200
commita80cfafdd91a384ba810a8ee0d43406bba955faa (patch)
tree0c00c9e50e65e8e6af11494c63645d916bd38216 /phpBB/includes
parent67393751356e9f02f7c1ab0a2f7a3a508403edc3 (diff)
downloadforums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.gz
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.bz2
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.xz
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.zip
[feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibility
Rename the class to more accurately reflect what it does. PHPBB3-9657
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/class_content_visibility.php (renamed from phpBB/includes/class_visibility.php)2
-rw-r--r--phpBB/includes/functions_posting.php22
-rw-r--r--phpBB/includes/mcp/mcp_forum.php2
-rw-r--r--phpBB/includes/mcp/mcp_queue.php2
-rw-r--r--phpBB/includes/mcp/mcp_topic.php2
5 files changed, 15 insertions, 15 deletions
diff --git a/phpBB/includes/class_visibility.php b/phpBB/includes/class_content_visibility.php
index 869f1078c1..c7c9586e50 100644
--- a/phpBB/includes/class_visibility.php
+++ b/phpBB/includes/class_content_visibility.php
@@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
* Handle fetching and setting the visibility for topics and posts
* @package phpbb
*/
-class phpbb_visibility
+class phpbb_content_visibility
{
/**
* Create topic/post visibility SQL for a given forum ID
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index b264e35a93..364a3e7fe2 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -993,7 +993,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
$sql = 'SELECT p.post_id
FROM ' . POSTS_TABLE . ' p' . "
WHERE p.topic_id = $topic_id
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id, 'p.') . '
' . (($mode == 'post_review') ? " AND p.post_id > $cur_post_id" : '') . '
' . (($mode == 'post_review_edit') ? " AND p.post_id = $cur_post_id" : '') . '
ORDER BY p.post_time ';
@@ -1466,8 +1466,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
- phpbb_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_visibility::hide_post($forum_id, time(), $sql_data);
+ 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);
}
else
{
@@ -1501,8 +1501,8 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
if ($is_soft)
{
$topic_row = array();
- phpbb_visibility::set_topic_visibility(POST_DELETED, $topic_id, $forum_id);
- phpbb_visibility::hide_topic($topic_id, $forum_id, $topic_row, $sql_data);
+ phpbb_content_visibility::set_topic_visibility(POST_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_visibility::hide_post($forum_id, time(), $sql_data);
- phpbb_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
+ phpbb_content_visibility::hide_post($forum_id, time(), $sql_data);
+ phpbb_content_visibility::set_post_visibility($post_id, $topic_id, $forum_id, false, true);
}
else
{
@@ -1576,7 +1576,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
$sql = 'SELECT MAX(post_id) as last_post_id
FROM ' . POSTS_TABLE . "
WHERE topic_id = $topic_id
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id);
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id);
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
@@ -1589,7 +1589,7 @@ function delete_post($forum_id, $topic_id, $post_id, &$data, $is_soft = false)
$sql = 'SELECT post_id
FROM ' . POSTS_TABLE . "
WHERE topic_id = $topic_id
- AND " . phpbb_visibility::get_visibility_sql('post', $forum_id) . '
+ AND " . phpbb_content_visibility::get_visibility_sql('post', $forum_id) . '
AND post_time > ' . $data['post_time'] . '
ORDER BY post_time ASC';
$result = $db->sql_query_limit($sql, 1);
@@ -1949,7 +1949,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
if (!$post_approval && $data['topic_visibility'] == ITEM_APPROVED)
{
- phpbb_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
+ phpbb_content_visibility::hide_topic($data['topic_id'], $data['forum_id'], $topic_row, $sql_data);
}
break;
@@ -1960,7 +1960,7 @@ 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.
if (!$post_approval && $data['post_visibility'] == ITEM_APPROVED)
{
- //phpbb_visibility::hide_post($forum_id, $current_time, $sql_data);
+ //phpbb_content_visibility::hide_post($forum_id, $current_time, $sql_data);
// ^^ hide_post 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[FORUMS_TABLE]['stat'][] = 'forum_posts = forum_posts - 1';
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 90c0224b40..ff079baeb8 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -154,7 +154,7 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
$sql = 'SELECT t.topic_id
FROM ' . TOPICS_TABLE . ' t
WHERE t.forum_id = ' . $forum_id . '
- ' . phpbb_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
+ ' . phpbb_content_visibility::get_visibility_sql('topic', $forum_id, 't.') . "
$limit_time_sql
ORDER BY t.topic_type DESC, $sort_order_sql";
$result = $db->sql_query_limit($sql, $topics_per_page, $start);
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index c19fb9b2b6..221dfffebc 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -493,7 +493,7 @@ function approve_post($post_id_list, $id, $mode)
{
$notify_poster = (isset($_REQUEST['notify_poster'])) ? true : false;
- phpbb_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
+ phpbb_content_visibility::unhide_posts_topics('approve', $post_info, $post_id_list);
$messenger = new messenger();
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 5c25da7a9d..8320699a8c 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -146,7 +146,7 @@ function mcp_topic_view($id, $mode, $action)
FROM ' . POSTS_TABLE . ' p, ' . USERS_TABLE . ' u
WHERE ' . (($action == 'reports') ? 'p.post_reported = 1 AND ' : '') . '
p.topic_id = ' . $topic_id . '
- AND ' . phpbb_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
+ AND ' . phpbb_content_visibility::get_visibility_sql('post', $topic_info['forum_id'], 'p.') . '
AND p.poster_id = u.user_id ' .
$limit_time_sql . '
ORDER BY ' . $sort_order_sql;
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-22 11:35:10 +0000