mirror of
https://github.com/phpbb/phpbb.git
synced 2025-01-18 14:48:28 +01:00
[ticket/11481] Move overall feed to own file
PHPBB3-11481
This commit is contained in:
parent
f592072b4b
commit
a995deb189
@ -335,89 +335,6 @@ function feed_generate_content($content, $uid, $bitfield, $options)
|
|||||||
return $content;
|
return $content;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Board wide feed (aka overall feed)
|
|
||||||
*
|
|
||||||
* This will give you the newest {$this->num_items} posts
|
|
||||||
* from the whole board.
|
|
||||||
*
|
|
||||||
* @package phpBB3
|
|
||||||
*/
|
|
||||||
class phpbb_feed_overall extends phpbb_feed_post_base
|
|
||||||
{
|
|
||||||
function get_sql()
|
|
||||||
{
|
|
||||||
global $auth, $db;
|
|
||||||
|
|
||||||
$forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums());
|
|
||||||
if (empty($forum_ids))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// m_approve forums
|
|
||||||
$fid_m_approve = $this->get_moderator_approve_forums();
|
|
||||||
$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', $fid_m_approve) : '';
|
|
||||||
|
|
||||||
// Determine topics with recent activity
|
|
||||||
$sql = 'SELECT topic_id, topic_last_post_time
|
|
||||||
FROM ' . TOPICS_TABLE . '
|
|
||||||
WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
|
|
||||||
AND topic_moved_id = 0
|
|
||||||
AND (topic_approved = 1
|
|
||||||
' . $sql_m_approve . ')
|
|
||||||
ORDER BY topic_last_post_time DESC';
|
|
||||||
$result = $db->sql_query_limit($sql, $this->num_items);
|
|
||||||
|
|
||||||
$topic_ids = array();
|
|
||||||
$min_post_time = 0;
|
|
||||||
while ($row = $db->sql_fetchrow())
|
|
||||||
{
|
|
||||||
$topic_ids[] = (int) $row['topic_id'];
|
|
||||||
|
|
||||||
$min_post_time = (int) $row['topic_last_post_time'];
|
|
||||||
}
|
|
||||||
$db->sql_freeresult($result);
|
|
||||||
|
|
||||||
if (empty($topic_ids))
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get the actual data
|
|
||||||
$this->sql = array(
|
|
||||||
'SELECT' => 'f.forum_id, f.forum_name, ' .
|
|
||||||
'p.post_id, p.topic_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(
|
|
||||||
USERS_TABLE => 'u',
|
|
||||||
POSTS_TABLE => 'p',
|
|
||||||
),
|
|
||||||
'LEFT_JOIN' => array(
|
|
||||||
array(
|
|
||||||
'FROM' => array(FORUMS_TABLE => 'f'),
|
|
||||||
'ON' => 'f.forum_id = p.forum_id',
|
|
||||||
),
|
|
||||||
),
|
|
||||||
'WHERE' => $db->sql_in_set('p.topic_id', $topic_ids) . '
|
|
||||||
AND (p.post_approved = 1
|
|
||||||
' . str_replace('forum_id', 'p.forum_id', $sql_m_approve) . ')
|
|
||||||
AND p.post_time >= ' . $min_post_time . '
|
|
||||||
AND u.user_id = p.poster_id',
|
|
||||||
'ORDER_BY' => 'p.post_time DESC',
|
|
||||||
);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function adjust_item(&$item_row, &$row)
|
|
||||||
{
|
|
||||||
parent::adjust_item($item_row, $row);
|
|
||||||
|
|
||||||
$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Forum feed
|
* Forum feed
|
||||||
*
|
*
|
||||||
|
99
phpBB/includes/feed/overall.php
Normal file
99
phpBB/includes/feed/overall.php
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
<?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;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Board wide feed (aka overall feed)
|
||||||
|
*
|
||||||
|
* This will give you the newest {$this->num_items} posts
|
||||||
|
* from the whole board.
|
||||||
|
*
|
||||||
|
* @package phpBB3
|
||||||
|
*/
|
||||||
|
class phpbb_feed_overall extends phpbb_feed_post_base
|
||||||
|
{
|
||||||
|
function get_sql()
|
||||||
|
{
|
||||||
|
global $auth, $db;
|
||||||
|
|
||||||
|
$forum_ids = array_diff($this->get_readable_forums(), $this->get_excluded_forums(), $this->get_passworded_forums());
|
||||||
|
if (empty($forum_ids))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// m_approve forums
|
||||||
|
$fid_m_approve = $this->get_moderator_approve_forums();
|
||||||
|
$sql_m_approve = (!empty($fid_m_approve)) ? 'OR ' . $db->sql_in_set('forum_id', $fid_m_approve) : '';
|
||||||
|
|
||||||
|
// Determine topics with recent activity
|
||||||
|
$sql = 'SELECT topic_id, topic_last_post_time
|
||||||
|
FROM ' . TOPICS_TABLE . '
|
||||||
|
WHERE ' . $db->sql_in_set('forum_id', $forum_ids) . '
|
||||||
|
AND topic_moved_id = 0
|
||||||
|
AND (topic_approved = 1
|
||||||
|
' . $sql_m_approve . ')
|
||||||
|
ORDER BY topic_last_post_time DESC';
|
||||||
|
$result = $db->sql_query_limit($sql, $this->num_items);
|
||||||
|
|
||||||
|
$topic_ids = array();
|
||||||
|
$min_post_time = 0;
|
||||||
|
while ($row = $db->sql_fetchrow())
|
||||||
|
{
|
||||||
|
$topic_ids[] = (int) $row['topic_id'];
|
||||||
|
|
||||||
|
$min_post_time = (int) $row['topic_last_post_time'];
|
||||||
|
}
|
||||||
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
|
if (empty($topic_ids))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the actual data
|
||||||
|
$this->sql = array(
|
||||||
|
'SELECT' => 'f.forum_id, f.forum_name, ' .
|
||||||
|
'p.post_id, p.topic_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(
|
||||||
|
USERS_TABLE => 'u',
|
||||||
|
POSTS_TABLE => 'p',
|
||||||
|
),
|
||||||
|
'LEFT_JOIN' => array(
|
||||||
|
array(
|
||||||
|
'FROM' => array(FORUMS_TABLE => 'f'),
|
||||||
|
'ON' => 'f.forum_id = p.forum_id',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
'WHERE' => $db->sql_in_set('p.topic_id', $topic_ids) . '
|
||||||
|
AND (p.post_approved = 1
|
||||||
|
' . str_replace('forum_id', 'p.forum_id', $sql_m_approve) . ')
|
||||||
|
AND p.post_time >= ' . $min_post_time . '
|
||||||
|
AND u.user_id = p.poster_id',
|
||||||
|
'ORDER_BY' => 'p.post_time DESC',
|
||||||
|
);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function adjust_item(&$item_row, &$row)
|
||||||
|
{
|
||||||
|
parent::adjust_item($item_row, $row);
|
||||||
|
|
||||||
|
$item_row['title'] = (isset($row['forum_name']) && $row['forum_name'] !== '') ? $row['forum_name'] . ' ' . $this->separator . ' ' . $item_row['title'] : $item_row['title'];
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user