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

[ticket/9837] Display unapproved posts to their authors

Browse Source 
Basic functionality mock up.

PHPBB3-9837
This commit is contained in:
Máté Bartus
2018-05-11 17:29:49 +02:00
committed by Marc Alexander
parent ce35aa8b0b
commit eb94fe973b
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/phpbb/content_visibility.php
View File

@@ -144,7 +144,12 @@ class content_visibility
*/
public function is_visible($mode, $forum_id, $data)
{
$is_visible = $this->auth->acl_get('m_approve', $forum_id) || $data[$mode . '_visibility'] == ITEM_APPROVED;
$visibility = $data[$mode . '_visibility'];
$poster_key = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
$is_visible = $this->auth->acl_get('m_approve', $forum_id) || $visibility == ITEM_APPROVED || (
($visibility == ITEM_UNAPPROVED || $visibility == ITEM_REAPPROVE) &&
$this->user->data['user_id'] === $data[$poster_key]
);
/**
* Allow changing the result of calling is_visible
@@ -216,7 +221,13 @@ class content_visibility
}
else
{
$where_sql .= $table_alias . $mode . '_visibility = ' . ITEM_APPROVED;
$field_name = ($mode === 'topic') ? 'topic_poster' : 'poster_id';
$visibility_query = $table_alias . $mode . '_visibility = ';
$where_sql .= '(' . $visibility_query . ITEM_APPROVED . ')';
$where_sql .= ' OR (';
$where_sql .= '(' . $visibility_query . ITEM_UNAPPROVED . ' OR ' . $visibility_query . ITEM_REAPPROVE . ')';
$where_sql .= ' AND ' . $table_alias . $field_name . ' = ' . ((int) $this->user->data['user_id']) . ')';
}
return '(' . $where_sql . ')';