makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Show stopping error fixed

Browse source 
git-svn-id: file:///svn/phpbb/trunk@540 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-03 00:32:46 +00:00
parent f80594bb7f
commit da5f117fcb
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/auth.php
View file

@ -174,7 +174,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
$au_result = $db->sql_query($sql); $au_result = $db->sql_query($sql);
if(!$au_result) 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); $num_u_access = $db->sql_numrows($au_result);
@ -187,9 +187,19 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
else else
{ {
while($u_row = $db->sql_fetchrow($au_result)) while($u_row = $db->sql_fetchrow($au_result))
{
if($u_row['forum_id'])
{ {
$u_access[$u_row['forum_id']] = $u_row; $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; break;
case AUTH_ACL: 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']; $auth_user[$key . '_type'] = $lang['Users_granted_access'];
break; break;
case AUTH_MOD: 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']; $auth_user[$key . '_type'] = $lang['Moderators'];
break; break;
@ -288,12 +298,12 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
break; break;
case AUTH_ACL: 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']; $auth_user[$f_forum_id][$key . '_type'] = $lang['Users_granted_access'];
break; break;
case AUTH_MOD: 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']; $auth_user[$f_forum_id][$key . '_type'] = $lang['Moderators'];
break; break;