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

[ticket/12738] Inject config object into content_visibility class

Browse source 
PHPBB3-12738
This commit is contained in:
Dhruv 2014-06-20 13:25:45 +05:30
parent 517273fa0b
commit 1a79de4214
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/services.yml
View file

@ -79,6 +79,7 @@ services:
class: phpbb\content_visibility class: phpbb\content_visibility
arguments: arguments:
- @auth - @auth
- @config
- @dbal.conn - @dbal.conn
- @user - @user
- %core.root_path% - %core.root_path%

17
phpBB/phpbb/content_visibility.php
View file

@ -37,6 +37,12 @@ class content_visibility
*/ */
protected $auth; protected $auth;
/**
* config object
* @var \phpbb\config\config
*/
protected $config;
/** /**
* phpBB root path * phpBB root path
* @var string * @var string
@ -62,9 +68,10 @@ class content_visibility
* @param string $topics_table Topics table name * @param string $topics_table Topics table name
* @param string $users_table Users table name * @param string $users_table Users table name
*/ */
public function __construct(\phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table) public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $php_ext, $forums_table, $posts_table, $topics_table, $users_table)
{ {
$this->auth = $auth; $this->auth = $auth;
$this->config = $config;
$this->db = $db; $this->db = $db;
$this->user = $user; $this->user = $user;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
@ -576,7 +583,7 @@ class content_visibility
$sql_data[$this->users_table] = (($sql_data[$this->users_table]) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts + 1'; $sql_data[$this->users_table] = (($sql_data[$this->users_table]) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts + 1';
} }
set_config_count('num_posts', 1, true); $this->config->increment('num_posts', 1, false);
} }
/** /**
@ -598,7 +605,7 @@ class content_visibility
$sql_data[$this->users_table] = ((!empty($sql_data[$this->users_table])) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts - 1'; $sql_data[$this->users_table] = ((!empty($sql_data[$this->users_table])) ? $sql_data[$this->users_table] . ', ' : '') . 'user_posts = user_posts - 1';
} }
set_config_count('num_posts', -1, true); $this->config->increment('num_posts', -1, false);
} }
else if ($data['post_visibility'] == ITEM_UNAPPROVED || $data['post_visibility'] == ITEM_REAPPROVE) else if ($data['post_visibility'] == ITEM_UNAPPROVED || $data['post_visibility'] == ITEM_REAPPROVE)
{ {
@ -640,8 +647,8 @@ class content_visibility
$sql_data[$this->forums_table] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved']; $sql_data[$this->forums_table] .= ', forum_posts_unapproved = forum_posts_unapproved - ' . $topic_row['topic_posts_unapproved'];
$sql_data[$this->forums_table] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted']; $sql_data[$this->forums_table] .= ', forum_posts_softdeleted = forum_posts_softdeleted - ' . $topic_row['topic_posts_softdeleted'];
set_config_count('num_topics', -1, true); $this->config->increment('num_topics', -1, false);
set_config_count('num_posts', $topic_row['topic_posts_approved'] * (-1), true); $this->config->increment('num_posts', $topic_row['topic_posts_approved'] * (-1), false);
// Get user post count information // Get user post count information
$sql = 'SELECT poster_id, COUNT(post_id) AS num_posts $sql = 'SELECT poster_id, COUNT(post_id) AS num_posts