aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-09-15 23:05:03 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-09-15 23:05:03 +0000
commitf1233468cf38d95abf4f913ce9893f25bb36c120 (patch)
tree2685ec45dda4e9f152a559ae36a48f64f3b36803 /phpBB/includes
parent887bcf7494b554cc7e1acdee3d8f9e99fdcda53e (diff)
downloadforums-f1233468cf38d95abf4f913ce9893f25bb36c120.tar
forums-f1233468cf38d95abf4f913ce9893f25bb36c120.tar.gz
forums-f1233468cf38d95abf4f913ce9893f25bb36c120.tar.bz2
forums-f1233468cf38d95abf4f913ce9893f25bb36c120.tar.xz
forums-f1233468cf38d95abf4f913ce9893f25bb36c120.zip
Done away with group vs. user switching, no point
git-svn-id: file:///svn/phpbb/trunk@1045 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/auth.php28
1 files changed, 11 insertions, 17 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php
index 5fcbe0eb4f..acf0456119 100644
--- a/phpBB/includes/auth.php
+++ b/phpBB/includes/auth.php
@@ -339,27 +339,21 @@ function auth_check_user($type, $key, $u_access, $is_admin)
{
for($j = 0; $j < count($u_access); $j++)
{
- if(!$single_user)
+ $result = 0;
+ switch($type)
{
- $single_user = $u_access[$j]['group_single_user'];
-
- $result = 0;
- switch($type)
- {
- case AUTH_ACL:
- $result = $u_access[$j][$key];
-
- case AUTH_MOD:
- $result = $result || $u_access[$j]['auth_mod'];
-
- case AUTH_ADMIN:
- $result = $result || $is_admin;
- break;
- }
+ case AUTH_ACL:
+ $result = $u_access[$j][$key];
- $auth_user = (!$single_user) ? ( $auth_user || $result ) : $result;
+ case AUTH_MOD:
+ $result = $result || $u_access[$j]['auth_mod'];
+ case AUTH_ADMIN:
+ $result = $result || $is_admin;
+ break;
}
+
+ $auth_user = $auth_user || $result;
}
}
else