makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Topic/Forum Feed: Also throw NO_FEED if forum has been excluded from feeds.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10328 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-12-13 13:02:37 +00:00
parent 07c990302c
commit b6f9a1a6e8
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
phpBB/feed.php
View file

@ -693,41 +693,50 @@ class phpbb_feed extends phpbb_feed_base
{
global $auth, $db, $user;
if ($this->topic_id)
{
// Topic feed
$sql = 'SELECT forum_id
FROM ' . TOPICS_TABLE . '
WHERE topic_id = ' . $this->topic_id;
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$this->forum_id = (int) $row['forum_id'];
$db->sql_freeresult($result);
if (empty($row))
{
trigger_error('NO_TOPIC');
}
}
else if ($this->forum_id)
{
// Forum feed
$sql = 'SELECT forum_id
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $this->forum_id;
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (empty($row))
{
trigger_error('NO_FORUM');
}
}
// Topic/Forum feed
if ($this->topic_id || $this->forum_id)
{
if ($this->topic_id)
{
// Topic feed
$sql = 'SELECT t.forum_id, f.forum_options
FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TABLE . ' f
WHERE t.topic_id = ' . $this->topic_id . '
AND t.forum_id = f.forum_id';
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (empty($row))
{
trigger_error('NO_TOPIC');
}
$this->forum_id = (int) $row['forum_id'];
}
else
{
// Forum feed
$sql = 'SELECT forum_options
FROM ' . FORUMS_TABLE . '
WHERE forum_id = ' . $this->forum_id;
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (empty($row))
{
trigger_error('NO_FORUM');
}
}
// Make sure forum is not excluded from feed
if (phpbb_optionget(FORUM_OPTION_FEED_EXCLUDE, $row['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');