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

Fix a couple of issues, hopefully haven't broken anything Ashe was planning ...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@3012 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2002-11-07 21:45:34 +00:00
parent cfd055f979
commit 7366bd9e41
2 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/functions_display.php
View file

@ -52,7 +52,7 @@ function display_forums($root_data, $display_moderators=TRUE)
continue; continue;
} }
if (!$auth->acl_get('f_list', $row['forum_id'])) if (!$auth->acl_gets('f_list', 'm_', 'a_', $row['forum_id']))
{ {
// if the user does not have permissions to list this forum, skip everything until next branch // if the user does not have permissions to list this forum, skip everything until next branch
@ -105,7 +105,7 @@ function display_forums($root_data, $display_moderators=TRUE)
if ($display_moderators) if ($display_moderators)
{ {
$forum_moderators = get_moderators($forum_moderators, $forum_ids); get_moderators($forum_moderators, $forum_ids);
} }
$root_id = $root_data['forum_id']; $root_id = $root_data['forum_id'];
@ -151,7 +151,7 @@ function display_forums($root_data, $display_moderators=TRUE)
$folder_image = 'forum_locked'; $folder_image = 'forum_locked';
$folder_alt = 'Forum_locked'; $folder_alt = 'Forum_locked';
} }
else else
{ {
$folder_image = ($unread_topics) ? 'forum_new' : 'forum'; $folder_image = ($unread_topics) ? 'forum_new' : 'forum';
$folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts'; $folder_alt = ($unread_topics) ? 'New_posts' : 'No_new_posts';
@ -170,17 +170,6 @@ function display_forums($root_data, $display_moderators=TRUE)
$last_post = $user->lang['No_Posts']; $last_post = $user->lang['No_Posts'];
} }
if (!empty($forum_moderators[$forum_id]))
{
$l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] . ': ' : $user->lang['Moderators'] . ': ' ;
$moderators_list = implode(', ', $forum_moderators[$forum_id]);
}
else
{
$l_moderator = ' ';
$moderators_list = ' ';
}
if (isset($subforums[$forum_id])) if (isset($subforums[$forum_id]))
{ {
foreach ($subforums[$forum_id] as $subrow) foreach ($subforums[$forum_id] as $subrow)
@ -192,7 +181,7 @@ function display_forums($root_data, $display_moderators=TRUE)
$links = array(); $links = array();
foreach ($alist as $subforum_id => $subforum_name) foreach ($alist as $subforum_id => $subforum_name)
{ {
$links[] = '<a href="viewforum.' . $phpEx . $SID . '&f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>'; $links[] = '<a href="viewforum.' . $phpEx . $SID . '&amp;f=' . $subforum_id . '">' . htmlspecialchars($subforum_name) . '</a>';
} }
$subforums_list = implode(', ', $links); $subforums_list = implode(', ', $links);
@ -210,7 +199,7 @@ function display_forums($root_data, $display_moderators=TRUE)
if (!empty($forum_moderators[$forum_id])) if (!empty($forum_moderators[$forum_id]))
{ {
$l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] : $user->lang['Moderators']; $l_moderator = (count($forum_moderators[$forum_id]) == 1) ? $user->lang['Moderator'] : $user->lang['Moderators'];
$moderators_list = implode(', ', $forum_moderators); $moderators_list = implode(', ', $forum_moderators[$forum_id]);
} }
} }
else else

4
phpBB/index.php
View file

@ -83,8 +83,8 @@ else
// Forum moderators ... a static template var could allow us // Forum moderators ... a static template var could allow us
// to drop these queries ... // to drop these queries ...
$forum_moderators = array(); //$forum_moderators = array();
get_moderators($forum_moderators); //get_moderators($forum_moderators);
// Set some vars // Set some vars
$root_id = $branch_root_id = $cat_id; $root_id = $branch_root_id = $cat_id;