mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-25 19:38:53 +00:00
[ticket/11481] Move topic feed to own file
PHPBB3-11481
This commit is contained in:
Joas Schilling
parent
d94ec8faab
commit
ffdb5c9388
2 changed files with 114 additions and 98 deletions
|
|
@ -335,104 +335,6 @@ function feed_generate_content($content, $uid, $bitfield, $options)
|
|||
return $content;
|
||||
}
|
||||
|
||||
/**
|
||||
* Topic feed for a specific topic
|
||||
*
|
||||
* This will give you the last {$this->num_items} posts made within this topic.
|
||||
*
|
||||
* @package phpBB3
|
||||
*/
|
||||
class phpbb_feed_topic extends phpbb_feed_post_base
|
||||
{
|
||||
var $topic_id = 0;
|
||||
var $forum_id = 0;
|
||||
var $topic_data = array();
|
||||
|
||||
function phpbb_feed_topic($topic_id)
|
||||
{
|
||||
parent::phpbb_feed_base();
|
||||
|
||||
$this->topic_id = (int) $topic_id;
|
||||
}
|
||||
|
||||
function open()
|
||||
{
|
||||
global $auth, $db, $user;
|
||||
|
||||
$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_approved, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
|
||||
FROM ' . TOPICS_TABLE . ' t
|
||||
LEFT JOIN ' . FORUMS_TABLE . ' f
|
||||
ON (f.forum_id = t.forum_id)
|
||||
WHERE t.topic_id = ' . $this->topic_id;
|
||||
$result = $db->sql_query($sql);
|
||||
$this->topic_data = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
if (empty($this->topic_data))
|
||||
{
|
||||
trigger_error('NO_TOPIC');
|
||||
}
|
||||
|
||||
$this->forum_id = (int) $this->topic_data['forum_id'];
|
||||
|
||||
// Make sure topic is either approved or user authed
|
||||
if (!$this->topic_data['topic_approved'] && !$auth->acl_get('m_approve', $this->forum_id))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
// Make sure forum is not excluded from feed
|
||||
if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->topic_data['forum_options']))
|
||||
{
|
||||
trigger_error('NO_FEED');
|
||||
}
|
||||
|
||||
// Make sure we can read this forum
|
||||
if (!$auth->acl_get('f_read', $this->forum_id))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
// Make sure forum is not passworded or user is authed
|
||||
if ($this->topic_data['forum_password'])
|
||||
{
|
||||
$forum_ids_passworded = $this->get_passworded_forums();
|
||||
|
||||
if (isset($forum_ids_passworded[$this->forum_id]))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
unset($forum_ids_passworded);
|
||||
}
|
||||
}
|
||||
|
||||
function get_sql()
|
||||
{
|
||||
global $auth, $db;
|
||||
|
||||
$this->sql = array(
|
||||
'SELECT' => 'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
|
||||
'u.username, u.user_id',
|
||||
'FROM' => array(
|
||||
POSTS_TABLE => 'p',
|
||||
USERS_TABLE => 'u',
|
||||
),
|
||||
'WHERE' => 'p.topic_id = ' . $this->topic_id . '
|
||||
' . ($this->forum_id && !$auth->acl_get('m_approve', $this->forum_id) ? 'AND p.post_approved = 1' : '') . '
|
||||
AND p.poster_id = u.user_id',
|
||||
'ORDER_BY' => 'p.post_time DESC',
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function get_item()
|
||||
{
|
||||
return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 'All Forums' feed
|
||||
*
|
||||
|
|
|
|||
114
phpBB/includes/feed/topic.php
Normal file
114
phpBB/includes/feed/topic.php
Normal file
|
|
@ -0,0 +1,114 @@
|
|||
<?php
|
||||
/**
|
||||
*
|
||||
* @package phpBB3
|
||||
* @copyright (c) 2013 phpBB Group
|
||||
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @ignore
|
||||
*/
|
||||
if (!defined('IN_PHPBB'))
|
||||
{
|
||||
exit;
|
||||
}
|
||||
|
||||
/**
|
||||
* Topic feed for a specific topic
|
||||
*
|
||||
* This will give you the last {$this->num_items} posts made within this topic.
|
||||
*
|
||||
* @package phpBB3
|
||||
*/
|
||||
class phpbb_feed_topic extends phpbb_feed_post_base
|
||||
{
|
||||
var $topic_id = 0;
|
||||
var $forum_id = 0;
|
||||
var $topic_data = array();
|
||||
|
||||
function __construct($topic_id)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
$this->topic_id = (int) $topic_id;
|
||||
}
|
||||
|
||||
function open()
|
||||
{
|
||||
global $auth, $db, $user;
|
||||
|
||||
$sql = 'SELECT f.forum_options, f.forum_password, t.topic_id, t.forum_id, t.topic_approved, t.topic_title, t.topic_time, t.topic_views, t.topic_replies, t.topic_type
|
||||
FROM ' . TOPICS_TABLE . ' t
|
||||
LEFT JOIN ' . FORUMS_TABLE . ' f
|
||||
ON (f.forum_id = t.forum_id)
|
||||
WHERE t.topic_id = ' . $this->topic_id;
|
||||
$result = $db->sql_query($sql);
|
||||
$this->topic_data = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
if (empty($this->topic_data))
|
||||
{
|
||||
trigger_error('NO_TOPIC');
|
||||
}
|
||||
|
||||
$this->forum_id = (int) $this->topic_data['forum_id'];
|
||||
|
||||
// Make sure topic is either approved or user authed
|
||||
if (!$this->topic_data['topic_approved'] && !$auth->acl_get('m_approve', $this->forum_id))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
// Make sure forum is not excluded from feed
|
||||
if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $this->topic_data['forum_options']))
|
||||
{
|
||||
trigger_error('NO_FEED');
|
||||
}
|
||||
|
||||
// Make sure we can read this forum
|
||||
if (!$auth->acl_get('f_read', $this->forum_id))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
// Make sure forum is not passworded or user is authed
|
||||
if ($this->topic_data['forum_password'])
|
||||
{
|
||||
$forum_ids_passworded = $this->get_passworded_forums();
|
||||
|
||||
if (isset($forum_ids_passworded[$this->forum_id]))
|
||||
{
|
||||
trigger_error('SORRY_AUTH_READ');
|
||||
}
|
||||
|
||||
unset($forum_ids_passworded);
|
||||
}
|
||||
}
|
||||
|
||||
function get_sql()
|
||||
{
|
||||
global $auth, $db;
|
||||
|
||||
$this->sql = array(
|
||||
'SELECT' => 'p.post_id, p.post_time, p.post_edit_time, p.post_approved, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' .
|
||||
'u.username, u.user_id',
|
||||
'FROM' => array(
|
||||
POSTS_TABLE => 'p',
|
||||
USERS_TABLE => 'u',
|
||||
),
|
||||
'WHERE' => 'p.topic_id = ' . $this->topic_id . '
|
||||
' . ($this->forum_id && !$auth->acl_get('m_approve', $this->forum_id) ? 'AND p.post_approved = 1' : '') . '
|
||||
AND p.poster_id = u.user_id',
|
||||
'ORDER_BY' => 'p.post_time DESC',
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function get_item()
|
||||
{
|
||||
return ($row = parent::get_item()) ? array_merge($this->topic_data, $row) : $row;
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue