mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-13 20:28:44 +01:00
[ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
PHPBB3-10320
This commit is contained in:
parent
540ca1a8d8
commit
4491746c73
@ -604,30 +604,9 @@ class phpbb_feed_base
|
||||
|
||||
function get_passworded_forums()
|
||||
{
|
||||
global $db, $user;
|
||||
global $user;
|
||||
|
||||
// Exclude passworded forums
|
||||
$sql = 'SELECT f.forum_id, fa.user_id
|
||||
FROM ' . FORUMS_TABLE . ' f
|
||||
LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa
|
||||
ON (fa.forum_id = f.forum_id
|
||||
AND fa.session_id = '" . $db->sql_escape($user->session_id) . "')
|
||||
WHERE f.forum_password <> ''";
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
$forum_ids = array();
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$forum_id = (int) $row['forum_id'];
|
||||
|
||||
if ($row['user_id'] != $user->data['user_id'])
|
||||
{
|
||||
$forum_ids[$forum_id] = $forum_id;
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
return $forum_ids;
|
||||
return $user->get_passworded_forums();
|
||||
}
|
||||
|
||||
function get_item()
|
||||
|
@ -2410,6 +2410,39 @@ class user extends session
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns all password protected forum ids the user is currently NOT authenticated for.
|
||||
*
|
||||
* @return array Array of forum ids
|
||||
* @access public
|
||||
*/
|
||||
function get_passworded_forums()
|
||||
{
|
||||
global $db;
|
||||
|
||||
$sql = 'SELECT f.forum_id, fa.user_id
|
||||
FROM ' . FORUMS_TABLE . ' f
|
||||
LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa
|
||||
ON (fa.forum_id = f.forum_id
|
||||
AND fa.session_id = '" . $db->sql_escape($this->session_id) . "')
|
||||
WHERE f.forum_password <> ''";
|
||||
$result = $db->sql_query($sql);
|
||||
|
||||
$forum_ids = array();
|
||||
while ($row = $db->sql_fetchrow($result))
|
||||
{
|
||||
$forum_id = (int) $row['forum_id'];
|
||||
|
||||
if ($row['user_id'] != $this->data['user_id'])
|
||||
{
|
||||
$forum_ids[$forum_id] = $forum_id;
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
return $forum_ids;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
Loading…
x
Reference in New Issue
Block a user