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

Browse Source
This commit is contained in:
Marc Alexander
2013-11-26 14:17:11 +01:00
parent 837e36eba6
commit e0f676c2f4
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

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

17
modules/news.php
View File

@@ -53,6 +53,9 @@ class news extends module_base
/** @var \phpbb\db\driver */ /** @var \phpbb\db\driver */
protected $db; protected $db;
/** @var \phpbb\request\request */
protected $request;
/** @var \phpbb\template */ /** @var \phpbb\template */
protected $template; protected $template;
@@ -72,17 +75,19 @@ class news extends module_base
* @param \phpbb\cache $cache phpBB cache system * @param \phpbb\cache $cache phpBB cache system
* @param \phpbb\config\config $config phpBB config * @param \phpbb\config\config $config phpBB config
* @param \phpbb\db\driver $db phpBB db driver * @param \phpbb\db\driver $db phpBB db driver
* @param \phpbb\request\request $request phpBB request
* @param \phpbb\template $template phpBB template * @param \phpbb\template $template phpBB template
* @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
* @param \phpbb\user $user phpBB user object * @param \phpbb\user $user phpBB user object
*/ */
public function __construct($auth, $cache, $config, $db, $template, $phpbb_root_path, $phpEx, $user) public function __construct($auth, $cache, $config, $db, $request, $template, $phpbb_root_path, $phpEx, $user)
{ {
$this->auth = $auth; $this->auth = $auth;
$this->cache = $cache; $this->cache = $cache;
$this->config = $config; $this->config = $config;
$this->db = $db; $this->db = $db;
$this->request = $request;
$this->template = $template; $this->template = $template;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $phpEx; $this->php_ext = $phpEx;
@@ -94,10 +99,10 @@ class news extends module_base
*/ */
public function get_template_center($module_id) public function get_template_center($module_id)
{ {
$news = request_var('news', -1); $news = $this->request->variable('news', -1);
$news = ($news > $this->config['board3_number_of_news_' . $module_id] -1) ? -1 : $news; $news = ($news > $this->config['board3_number_of_news_' . $module_id] -1) ? -1 : $news;
$this->user->add_lang('viewforum'); $this->user->add_lang('viewforum');
$start = request_var('np', 0); $start = $this->request->variable('np', 0);
$start = ($start < 0) ? 0 : $start; $start = ($start < 0) ? 0 : $start;
// Fetch news from portal/includes/functions.php with check if "read full" is requested. // Fetch news from portal/includes/functions.php with check if "read full" is requested.
@@ -203,7 +208,7 @@ class news extends module_base
$topic_id = $fetch_news[$i]['topic_id']; $topic_id = $fetch_news[$i]['topic_id'];
$unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false; $unread_topic = (isset($topic_tracking_info[$topic_id]) && $fetch_news[$i]['topic_last_post_time'] > $topic_tracking_info[$topic_id]) ? true : false;
$read_full_url = (isset($_GET['np'])) ? 'np='. $start . '&amp;news=' . $i . '#n' . $i : 'news=' . $i . '#n' . $i; $read_full_url = ($this->request->is_set('np')) ? 'np='. $start . '&amp;news=' . $i . '#n' . $i : 'news=' . $i . '#n' . $i;
$view_topic_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id); $view_topic_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
if ($this->config['board3_news_archive_' . $module_id]) if ($this->config['board3_news_archive_' . $module_id])
{ {
@@ -320,7 +325,7 @@ class news extends module_base
$close_bracket = ' ]'; $close_bracket = ' ]';
$read_full = $this->user->lang['BACK']; $read_full = $this->user->lang['BACK'];
$read_full_url = (isset($_GET['np'])) ? append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal", "np=$start#n$i") : append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal#n$i"); $read_full_url = ($this->request->is_set('np')) ? append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal", "np=$start#n$i") : append_sid("{$this->phpbb_root_path}app.{$this->php_ext}/portal#n$i");
$view_topic_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id); $view_topic_url = append_sid("{$this->phpbb_root_path}viewtopic.{$this->php_ext}", 'f=' . (($fetch_news[$i]['forum_id']) ? $fetch_news[$i]['forum_id'] : $forum_id) . '&amp;t=' . $topic_id);
if ($this->config['board3_news_archive_' . $module_id]) if ($this->config['board3_news_archive_' . $module_id])
{ {
@@ -504,7 +509,7 @@ class news extends module_base
public function store_selected_forums($key, $module_id) public function store_selected_forums($key, $module_id)
{ {
// Get selected extensions // Get selected extensions
$values = request_var($key, array(0 => '')); $values = $this->request->variable($key, array(0 => ''));
$news = implode(',', $values); $news = implode(',', $values);