aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart van Bragt <bartvb@users.sourceforge.net>2002-02-15 15:08:48 +0000
committerBart van Bragt <bartvb@users.sourceforge.net>2002-02-15 15:08:48 +0000
commit3a87c855dc56695c6b161a852d804d062845e9b8 (patch)
treee3058824682013623a0bb772b335640876e381f8
parent9fb58788bbc8439fcc955985ccd4ae1afee54e34 (diff)
downloadforums-3a87c855dc56695c6b161a852d804d062845e9b8.tar
forums-3a87c855dc56695c6b161a852d804d062845e9b8.tar.gz
forums-3a87c855dc56695c6b161a852d804d062845e9b8.tar.bz2
forums-3a87c855dc56695c6b161a852d804d062845e9b8.tar.xz
forums-3a87c855dc56695c6b161a852d804d062845e9b8.zip
Made hidden groups really hidden (index, viewforum)
git-svn-id: file:///svn/phpbb/trunk@2156 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/index.php4
-rw-r--r--phpBB/viewforum.php4
2 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/index.php b/phpBB/index.php
index 079dfc8509..46d2c0bd9d 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -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
WHERE aa.auth_mod = " . TRUE . "
AND g.group_single_user = 1
+ AND g.group_type <> " . GROUP_HIDDEN . "
AND ug.group_id = aa.group_id
AND g.group_id = aa.group_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
WHERE aa.auth_mod = " . TRUE . "
AND g.group_single_user = 0
+ AND g.group_type != " . GROUP_HIDDEN . "
AND ug.group_id = aa.group_id
AND g.group_id = aa.group_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);
-?> \ No newline at end of file
+?>
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 1e5d183966..4ab4b1b174 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -190,6 +190,7 @@ $sql = "SELECT u.user_id, u.username
WHERE aa.forum_id = $forum_id
AND aa.auth_mod = " . TRUE . "
AND g.group_single_user = 1
+ AND g.group_type <> ". GROUP_HIDDEN ."
AND ug.group_id = aa.group_id
AND g.group_id = aa.group_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
AND aa.auth_mod = " . TRUE . "
AND g.group_single_user = 0
+ AND g.group_type <> ". GROUP_HIDDEN ."
AND ug.group_id = aa.group_id
AND g.group_id = aa.group_id
GROUP BY g.group_id, g.group_name
@@ -669,4 +671,4 @@ $template->pparse("body");
//
include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
-?> \ No newline at end of file
+?>