Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[use/request_class] Use request class in stylechanger

Browse Source
This commit is contained in:
Marc Alexander
2013-11-26 14:05:14 +01:00
parent af84d05fd3
commit c601476ead
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/modules.yml
View File

@@ -243,6 +243,7 @@ services:
- @config - @config
- @template - @template
- @dbal.conn - @dbal.conn
- @request
- %core.php_ext% - %core.php_ext%
- %core.root_path% - %core.root_path%
- @user - @user

9
modules/stylechanger.php
View File

@@ -50,6 +50,9 @@ class stylechanger extends module_base
/** @var \phpbb\db\driver */ /** @var \phpbb\db\driver */
protected $db; protected $db;
/** @var \phpbb\request\request */
protected $request;
/** @var php file extension */ /** @var php file extension */
protected $php_ext; protected $php_ext;
@@ -65,15 +68,17 @@ class stylechanger extends module_base
* @param \phpbb\config\config $config phpBB config * @param \phpbb\config\config $config phpBB config
* @param \phpbb\template $template phpBB template * @param \phpbb\template $template phpBB template
* @param \phpbb\db\driver $db Database driver * @param \phpbb\db\driver $db Database driver
* @param \phpbb\request\request $request phpBB request
* @param string $phpEx php file extension * @param string $phpEx php file extension
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param \phpbb\user $user phpBB user object * @param \phpbb\user $user phpBB user object
*/ */
public function __construct($config, $template, $db, $phpEx, $phpbb_root_path, $user) public function __construct($config, $template, $db, $request, $phpEx, $phpbb_root_path, $user)
{ {
$this->config = $config; $this->config = $config;
$this->template = $template; $this->template = $template;
$this->db = $db; $this->db = $db;
$this->request = $request;
$this->php_ext = $phpEx; $this->php_ext = $phpEx;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->user = $user; $this->user = $user;
@@ -93,7 +98,7 @@ class stylechanger extends module_base
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
$style = request_var('style', 0); $style = $this->request->variable('style', 0);
if (!empty($style)) if (!empty($style))
{ {
$url = str_replace('style=' . $style, 'style=' . $row['style_id'], append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal")); $url = str_replace('style=' . $style, 'style=' . $row['style_id'], append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal"));