mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 18:11:47 +02:00
Code Issues Releases Wiki Activity

Something else broke, now fixed, probably ... sleep uuugghhh

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@401 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2001-06-01 01:45:50 +00:00
parent cb1e99cb91
commit f3d9aa24f0
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/auth.php
View File

@@ -147,17 +147,18 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
else else
{ {
$forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND aa.forum_id = $forum_id" : ""; $forum_match_sql = ($forum_id != AUTH_LIST_ALL) ? "AND aa.forum_id = $forum_id" : "";
$sql = "SELECT aa.forum_id, $a_sql, aa.auth_mod, g.single_user, u.user_level $sql = "SELECT aa.forum_id, $a_sql, aa.auth_mod, g.single_user
FROM ".AUTH_ACCESS_TABLE." aa, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g, " . USERS_TABLE . " u FROM ".AUTH_ACCESS_TABLE." aa, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g
WHERE ug.user_id = ".$userdata['user_id']. " WHERE ug.user_id = ".$userdata['user_id']. "
AND g.group_id = ug.group_id AND g.group_id = ug.group_id
AND aa.group_id = ug.group_id AND aa.group_id = ug.group_id
AND u.user_id = ug.user_id
$forum_match_sql"; $forum_match_sql";
$au_result = $db->sql_query($sql); $au_result = $db->sql_query($sql);
$u_access = $db->sql_fetchrowset($au_result); $u_access = $db->sql_fetchrowset($au_result);
$is_admin = ($userdata['user_level'] == ADMIN) ? 1 : 0;
$auth_user = array(); $auth_user = array();
for($i = 0; $i < count($auth_fields); $i++) for($i = 0; $i < count($auth_fields); $i++)
{ {
@@ -222,7 +223,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
{ {
$single_user = $u_access[$j]['single_user']; $single_user = $u_access[$j]['single_user'];
$auth_user[$key] = (!$single_user) ? ($auth_user[$key] || $u_access[$j][$key] || $u_access[$i]['auth_mod'] || ($userdata['user_level'] == ADMIN)) : ($u_access[$j][$key] || $u_access[$i]['auth_mod'] || ($userdata['user_level'] == ADMIN)); $auth_user[$key] = (!$single_user) ? ($auth_user[$key] || $u_access[$j][$key] || $u_access[$i]['auth_mod'] || $is_admin) : ($u_access[$j][$key] || $u_access[$i]['auth_mod'] || $is_admin);
} }
} }
break; break;
@@ -234,7 +235,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
{ {
$single_user = $u_access[$j]['single_user']; $single_user = $u_access[$j]['single_user'];
$auth_user[$key] = (!$single_user) ? ($auth_user[$key] || $u_access[$i]['auth_mod'] || ($userdata['user_level'] == ADMIN)) : ($u_access[$i]['auth_mod'] || ($userdata['user_level'] == ADMIN)); $auth_user[$key] = (!$single_user) ? ($auth_user[$key] || $u_access[$j]['auth_mod'] || $is_admin) : ($u_access[$j]['auth_mod'] || $is_admin);
} }
} }
break; break;
@@ -261,8 +262,9 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
{ {
if(!$single_user) if(!$single_user)
{ {
$auth_user['auth_mod'] = $auth_user['auth_mod'] || $u_access[$j]['auth_mod'];
$single_user = $u_access[$j]['single_user']; $single_user = $u_access[$j]['single_user'];
$auth_user['auth_mod'] = (!$single_user) ? ($auth_user['auth_mod'] || $u_access[$j]['auth_mod'] || $is_admin) : ($u_access[$j]['auth_mod'] || $is_admin);
} }
} }
@@ -270,7 +272,7 @@ function auth($type, $forum_id, $userdata, $f_access = -1)
// Is user an admin (this is // Is user an admin (this is
// really redundant at this time) // really redundant at this time)
// //
$auth_user[$key] = ($userdata['user_level'] == ADMIN) ? 1 : 0; $auth_user['auth_admin'] = $is_admin;
} }

3
phpBB/posting.php
View File

@@ -99,7 +99,7 @@ switch($mode)
break; break;
case 'reply': case 'reply':
$auth_type = AUTH_REPLY; $auth_type = AUTH_REPLY;
$is_auth_type = "auth_replt"; $is_auth_type = "auth_reply";
break; break;
case 'editpost': case 'editpost':
$auth_type = AUTH_EDIT; $auth_type = AUTH_EDIT;
@@ -116,6 +116,7 @@ switch($mode)
} }
$is_auth = auth($auth_type, $forum_id, $userdata); $is_auth = auth($auth_type, $forum_id, $userdata);
if(!$is_auth[$is_auth_type]) if(!$is_auth[$is_auth_type])
{ {
// //