mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
Made hidden groups really hidden (index, viewforum)
git-svn-id: file:///svn/phpbb/trunk@2156 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -209,6 +209,7 @@ if( ( $total_categories = count($category_rows) ) )
|
|||||||
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
|
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g, " . USERS_TABLE . " u
|
||||||
WHERE aa.auth_mod = " . TRUE . "
|
WHERE aa.auth_mod = " . TRUE . "
|
||||||
AND g.group_single_user = 1
|
AND g.group_single_user = 1
|
||||||
|
AND g.group_type <> " . GROUP_HIDDEN . "
|
||||||
AND ug.group_id = aa.group_id
|
AND ug.group_id = aa.group_id
|
||||||
AND g.group_id = aa.group_id
|
AND g.group_id = aa.group_id
|
||||||
AND u.user_id = ug.user_id
|
AND u.user_id = ug.user_id
|
||||||
@@ -229,6 +230,7 @@ if( ( $total_categories = count($category_rows) ) )
|
|||||||
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
|
FROM " . AUTH_ACCESS_TABLE . " aa, " . USER_GROUP_TABLE . " ug, " . GROUPS_TABLE . " g
|
||||||
WHERE aa.auth_mod = " . TRUE . "
|
WHERE aa.auth_mod = " . TRUE . "
|
||||||
AND g.group_single_user = 0
|
AND g.group_single_user = 0
|
||||||
|
AND g.group_type != " . GROUP_HIDDEN . "
|
||||||
AND ug.group_id = aa.group_id
|
AND ug.group_id = aa.group_id
|
||||||
AND g.group_id = aa.group_id
|
AND g.group_id = aa.group_id
|
||||||
GROUP BY g.group_id, g.group_name, aa.forum_id
|
GROUP BY g.group_id, g.group_name, aa.forum_id
|
||||||
@@ -436,4 +438,4 @@ $template->pparse("body");
|
|||||||
|
|
||||||
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
@@ -190,6 +190,7 @@ $sql = "SELECT u.user_id, u.username
|
|||||||
WHERE aa.forum_id = $forum_id
|
WHERE aa.forum_id = $forum_id
|
||||||
AND aa.auth_mod = " . TRUE . "
|
AND aa.auth_mod = " . TRUE . "
|
||||||
AND g.group_single_user = 1
|
AND g.group_single_user = 1
|
||||||
|
AND g.group_type <> ". GROUP_HIDDEN ."
|
||||||
AND ug.group_id = aa.group_id
|
AND ug.group_id = aa.group_id
|
||||||
AND g.group_id = aa.group_id
|
AND g.group_id = aa.group_id
|
||||||
AND u.user_id = ug.user_id
|
AND u.user_id = ug.user_id
|
||||||
@@ -211,6 +212,7 @@ $sql = "SELECT g.group_id, g.group_name
|
|||||||
WHERE aa.forum_id = $forum_id
|
WHERE aa.forum_id = $forum_id
|
||||||
AND aa.auth_mod = " . TRUE . "
|
AND aa.auth_mod = " . TRUE . "
|
||||||
AND g.group_single_user = 0
|
AND g.group_single_user = 0
|
||||||
|
AND g.group_type <> ". GROUP_HIDDEN ."
|
||||||
AND ug.group_id = aa.group_id
|
AND ug.group_id = aa.group_id
|
||||||
AND g.group_id = aa.group_id
|
AND g.group_id = aa.group_id
|
||||||
GROUP BY g.group_id, g.group_name
|
GROUP BY g.group_id, g.group_name
|
||||||
@@ -669,4 +671,4 @@ $template->pparse("body");
|
|||||||
//
|
//
|
||||||
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
Reference in New Issue
Block a user