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 welcome module

Browse Source
This commit is contained in:
Marc Alexander
2013-11-26 14:20:15 +01:00
parent e0f676c2f4
commit 84fef324b1
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/modules.yml
View File

@@ -281,6 +281,7 @@ services:
class: \board3\portal\modules\welcome class: \board3\portal\modules\welcome
arguments: arguments:
- @config - @config
- @request
- @template - @template
- @user - @user
- %core.root_path% - %core.root_path%

17
modules/welcome.php
View File

@@ -50,6 +50,9 @@ class welcome extends module_base
/** @var \phpbb\config\config */ /** @var \phpbb\config\config */
protected $config; protected $config;
/** @var \phpbb\request\request */
protected $request;
/** @var \phpbb\template */ /** @var \phpbb\template */
protected $template; protected $template;
@@ -66,14 +69,16 @@ class welcome extends module_base
* Construct a welcome object * Construct a welcome object
* *
* @param \phpbb\config\config $config phpBB config * @param \phpbb\config\config $config phpBB config
* @param \phpbb\request\request $request phpBB request
* @param \phpbb\template $template phpBB template * @param \phpbb\template $template phpBB template
* @param \phpbb\user $user phpBB user * @param \phpbb\user $user phpBB user
* @param string $phpbb_root_path phpBB root path * @param string $phpbb_root_path phpBB root path
* @param string $phpEx php file extension * @param string $phpEx php file extension
*/ */
public function __construct($config, $template, $user, $phpbb_root_path, $phpEx) public function __construct($config, $request, $template, $user, $phpbb_root_path, $phpEx)
{ {
$this->config = $config; $this->config = $config;
$this->request = $request;
$this->template = $template; $this->template = $template;
$this->user = $user; $this->user = $user;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
@@ -160,9 +165,9 @@ class welcome extends module_base
*/ */
public function manage_welcome($value, $key, $module_id) public function manage_welcome($value, $key, $module_id)
{ {
$action = (isset($_POST['reset'])) ? 'reset' : ''; $action = ($this->request->is_set_post('reset')) ? 'reset' : '';
$action = (isset($_POST['submit'])) ? 'save' : $action; $action = ($this->request->is_set_post('submit')) ? 'save' : $action;
$action = (isset($_POST['preview'])) ? 'preview' : $action; $action = ($this->request->is_set_post('preview')) ? 'preview' : $action;
$portal_config = obtain_portal_config(); $portal_config = obtain_portal_config();
@@ -177,7 +182,7 @@ class welcome extends module_base
trigger_error($this->user->lang['FORM_INVALID']. adm_back_link($u_action), E_USER_WARNING); trigger_error($this->user->lang['FORM_INVALID']. adm_back_link($u_action), E_USER_WARNING);
} }
$welcome_message = utf8_normalize_nfc(request_var('welcome_message', '', true)); $welcome_message = $this->request->variable('welcome_message', '', true);
$uid = $bitfield = $flags = ''; $uid = $bitfield = $flags = '';
$options = 7; $options = 7;
generate_text_for_storage($welcome_message, $uid, $bitfield, $flags, true, true, true); generate_text_for_storage($welcome_message, $uid, $bitfield, $flags, true, true, true);
@@ -197,7 +202,7 @@ class welcome extends module_base
break; break;
case 'preview': case 'preview':
$welcome_message = $text = utf8_normalize_nfc(request_var('welcome_message', '', true)); $welcome_message = $text = $this->request->variable('welcome_message', '', true);
$bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS; $bbcode_options = OPTION_FLAG_BBCODE + OPTION_FLAG_SMILIES + OPTION_FLAG_LINKS;
$uid = (isset($this->config['board3_welcome_message_uid_' . $module_id])) ? $this->config['board3_welcome_message_uid_' . $module_id] : ''; $uid = (isset($this->config['board3_welcome_message_uid_' . $module_id])) ? $this->config['board3_welcome_message_uid_' . $module_id] : '';