makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Another show stopping error

Browse source 
git-svn-id: file:///svn/phpbb/trunk@597 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-07-07 11:10:05 +00:00
parent ae32ef9822
commit 617135a75e
1 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
phpBB/includes/auth.php
View file

@ -165,6 +165,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
if($userdata['session_logged_in']) if($userdata['session_logged_in'])
{ {
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND au.forum_id = $forum_id" : ""; $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND au.forum_id = $forum_id" : "";
$sql = "SELECT au.forum_id, $a_sql, au.auth_mod, g.group_single_user $sql = "SELECT au.forum_id, $a_sql, au.auth_mod, g.group_single_user
FROM ".AUTH_ACCESS_TABLE." au, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g FROM ".AUTH_ACCESS_TABLE." au, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g
WHERE ug.user_id = ".$userdata['user_id']. " WHERE ug.user_id = ".$userdata['user_id']. "
@ -259,12 +260,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) : $is_admin; $auth_user[$key] = ($userdata['session_logged_in']) ? 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) : $is_admin; $auth_user[$key] = ($userdata['session_logged_in']) ? 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;
@ -298,12 +299,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) : $is_admin; $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in']) ? 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) : $is_admin; $auth_user[$f_forum_id][$key] = ($userdata['session_logged_in']) ? 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;
@ -325,14 +326,14 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
// //
if($forum_id != AUTH_LIST_ALL) if($forum_id != AUTH_LIST_ALL)
{ {
$auth_user['auth_mod'] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0; $auth_user['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access, $is_admin) : 0;
} }
else else
{ {
for($k = 0; $k < count($f_access); $k++) for($k = 0; $k < count($f_access); $k++)
{ {
$f_forum_id = $f_access[$k]['forum_id']; $f_forum_id = $f_access[$k]['forum_id'];
$auth_user[$f_forum_id]['auth_mod'] = ($userdata['session_logged_in'] && $num_u_access) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0; $auth_user[$f_forum_id]['auth_mod'] = ($userdata['session_logged_in']) ? auth_check_user(AUTH_MOD, 'auth_mod', $u_access[$f_forum_id], $is_admin) : 0;
} }
} }
@ -363,30 +364,37 @@ function auth_check_user($type, $key, $u_access, $is_admin)
$single_user = 0; $single_user = 0;
$auth_user = 0; $auth_user = 0;
for($j = 0; $j < count($u_access); $j++) if(count($u_access))
{ {
if(!$single_user) for($j = 0; $j < count($u_access); $j++)
{ {
$single_user = $u_access[$j]['group_single_user']; if(!$single_user)
$result = 0;
switch($type)
{ {
case AUTH_ACL: $single_user = $u_access[$j]['group_single_user'];
$result = $u_access[$j][$key];
case AUTH_MOD: $result = 0;
$result = $result || $u_access[$j]['auth_mod']; 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;
}
$auth_user = (!$single_user) ? ( $auth_user || $result ) : $result;
case AUTH_ADMIN:
$result = $result || $is_admin;
break;
} }
$auth_user = (!$single_user) ? ( $auth_user || $result ) : $result;
} }
} }
else
{
$auth_user = $is_admin;
}
return $auth_user; return $auth_user;
} }