diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:32:46 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-07-03 00:32:46 +0000 |
| commit | da5f117fcbe82cf92317421aa9c8f15aed96f79c (patch) | |
| tree | 429d0f121c6c32f9d725d61bc733b738f4aa3809 /phpBB/includes | |
| parent | f80594bb7f7dab7b55a73d93edc28341eec84b0b (diff) | |
| download | forums-da5f117fcbe82cf92317421aa9c8f15aed96f79c.tar forums-da5f117fcbe82cf92317421aa9c8f15aed96f79c.tar.gz forums-da5f117fcbe82cf92317421aa9c8f15aed96f79c.tar.bz2 forums-da5f117fcbe82cf92317421aa9c8f15aed96f79c.tar.xz forums-da5f117fcbe82cf92317421aa9c8f15aed96f79c.zip | |
Show stopping error fixed
git-svn-id: file:///svn/phpbb/trunk@540 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/auth.php | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 067ab93235..f07f2926ff 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -174,7 +174,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1) $au_result = $db->sql_query($sql); if(!$au_result) { - error_die(QUERY_ERROR, "Failed obtaining forum access control lists"); + message_die(QUERY_ERROR, "Failed obtaining forum access control lists"); } $num_u_access = $db->sql_numrows($au_result); @@ -188,7 +188,17 @@ function auth($type, $forum_id, $userdata, $f_access = -1) { while($u_row = $db->sql_fetchrow($au_result)) { - $u_access[$u_row['forum_id']] = $u_row; + if($u_row['forum_id']) + { + $u_access[$u_row['forum_id']] = $u_row; + } + else + { + for($i = 0; $i < count($f_access); $i++) + { + $u_access[$f_access[$i]['forum_id']] = $u_row; + } + } } } } @@ -249,12 +259,12 @@ function auth($type, $forum_id, $userdata, $f_access = -1) break; case AUTH_ACL: - $auth_user[$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : 0; + $auth_user[$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_ACL, $key, $u_access, $is_admin) : $is_admin; $auth_user[$key . '_type'] = $lang['Users_granted_access']; break; case AUTH_MOD: - $auth_user[$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, $key, $u_access, $is_admin) : 0; + $auth_user[$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, $key, $u_access, $is_admin) : $is_admin; $auth_user[$key . '_type'] = $lang['Moderators']; break; @@ -288,12 +298,12 @@ function auth($type, $forum_id, $userdata, $f_access = -1) break; case AUTH_ACL: - $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_ACL, $key, $u_access[$f_forum_id], $is_admin) : $is_admin; $auth_user[$f_forum_id][$key . '_type'] = $lang['Users_granted_access']; break; case AUTH_MOD: - $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, $key, $u_access[$f_forum_id], $is_admin) : 0; + $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, $key, $u_access[$f_forum_id], $is_admin) : $is_admin; $auth_user[$f_forum_id][$key . '_type'] = $lang['Moderators']; break; |