diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-31 15:39:59 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2001-05-31 15:39:59 +0000 |
| commit | 3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5 (patch) | |
| tree | 1c46f1913b8646556f29788196397c21b7a4988d /phpBB/includes | |
| parent | eb9734b237eec0c6513b97f85b051dfd6599d0d3 (diff) | |
| download | forums-3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5.tar forums-3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5.tar.gz forums-3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5.tar.bz2 forums-3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5.tar.xz forums-3ed50ce0b7665fcd6a2a80d1f5bc6630089382d5.zip | |
Changes to allow all auth types to be returned
git-svn-id: file:///svn/phpbb/trunk@388 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/auth.php | 238 |
1 files changed, 147 insertions, 91 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index 68df6f53eb..146711ee11 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -22,40 +22,75 @@ * ***************************************************************************/ -/* Notes: - * auth() returns: - * TRUE if the user authorized - * FALSE if the user is not - */ +/* + Possible options to send to auth (not all are functional yet!): + + * If you include a type then a specific lookup will + be done and the single result returned + + * If you set type to ALL an array of all auth types + will be returned + + * If you provide a forum_id a specific lookup on that + forum will be done + + * If you set forum_id to LIST_ALL an array of all + forums to which the user has access of type will be returned + <- used for index and search? (type VIEW and READ respectively) + + * If you set forum_id to LIST_ALL and type to ALL a + multidimensional array containing the auth permissions + for all types and all forums for that user is returned + + * If you set $userdata to ALL, then the permissions of all + users listed in the auth_access table will be returned for + the given type and forum_id <- use to check for moderators? + + All results are returned as associative arrays, even + when a single auth type is specified + +*/ function auth($type, $forum_id, $userdata, $f_access = -1) { global $db; switch($type) { + case ALL: + $a_sql = "auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_votecreate, auth_vote"; + $auth_fields = array("auth_view", "auth_read", "auth_post", "auth_reply", "auth_edit", "auth_delete", "auth_votecreate", "auth_vote"); + break; case VIEW: $a_sql = "auth_view"; + $auth_fields = array("auth_view"); break; case READ: $a_sql = "auth_read"; + $auth_fields = array("auth_read"); break; case POST: $a_sql = "auth_post"; + $auth_fields = array("auth_post"); break; case REPLY: $a_sql = "auth_reply"; + $auth_fields = array("auth_reply"); break; case EDIT: $a_sql = "auth_edit"; + $auth_fields = array("auth_edit"); break; case DELETE: $a_sql = "auth_delete"; + $auth_fields = array("auth_delete"); break; case VOTECREATE: $a_sql = "auth_votecreate"; + $auth_fields = array("auth_votecreate"); break; case VOTE: $a_sql = "auth_vote"; + $auth_fields = array("auth_vote"); break; default: break; @@ -70,14 +105,14 @@ function auth($type, $forum_id, $userdata, $f_access = -1) if($f_access == -1 || $forum_id == LIST_ALL) { $forum_match_sql = ($forum_id != LIST_ALL) ? "WHERE forum_id = $forum_id" : ""; - $sql = "SELECT $a_sql AS forum_auth + $sql = "SELECT $a_sql FROM ".AUTH_FORUMS_TABLE." $forum_match_sql"; $af_result = $db->sql_query($sql); if($forum_id != LIST_ALL) { - $f_access = $db->sql_fetchfield("forum_auth", -1, $af_result); + $f_access = $db->sql_fetchrow($af_result); } else { @@ -97,118 +132,139 @@ function auth($type, $forum_id, $userdata, $f_access = -1) { if($forum_id != LIST_ALL) { - $auth_user = ($f_access == ALL) ? true : false; + for($i = 0; $i < count($f_access); $i++) + { + $auth_user[$auth_fields[$i]] = ($f_access[$auth_fields[$i]] == ALL) ? true : false; + } } else { $auth_user_list = array(); for($i = 0; $i < count($auth_forum_rows); $i++) { - $auth_user_list[] = ($f_access_rows['0']['forum_auth'] == ALL) ? true : false; + for($j = 0; $j < count($f_access); $j++) + { + $auth_user_list[][$auth_fields[$j]] = ($f_access_rows[$i][$auth_fields[$j]] == ALL) ? true : false; + } } } } else { - // - // If the user is logged on and the forum - // type is either ALL or REG then the user - // has access - // - if($f_access == ALL || $f_access == REG) - { - $auth_user = true; - } - else + + $forum_match_sql = ($forum_id != LIST_ALL) ? "AND ( aa.forum_id = $forum_id OR aa.forum_id = " . ALL . ")" : ""; + $sql = "SELECT $a_sql, auth_mod, auth_admin, g.single_user + FROM ".AUTH_ACCESS_TABLE." aa, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g + WHERE ug.user_id = ".$userdata['user_id']. " + AND g.group_id = ug.group_id + AND aa.group_id = ug.group_id + $forum_match_sql"; + $au_result = $db->sql_query($sql); + + $u_access = $db->sql_fetchrowset($au_result); + + for($i = 0; $i < count($auth_fields); $i++) { + $key = $auth_fields[$i]; + $value = $f_access[$key]; + // - // If the type if ACL, MOD or ADMIN - // then we need to see if the user has - // specific permissions to do whatever it - // is they want to do ... to do this - // we pull relevant information for the user - // (and any groups they belong to) + // If the user is logged on and the forum + // type is either ALL or REG then the user + // has access // - $forum_match_sql = ($forum_id != LIST_ALL) ? "AND ( aa.forum_id = $forum_id OR aa.forum_id = " . ALL . ")" : ""; - $sql = "SELECT aa.$a_sql AS user_auth, aa.auth_mod, aa.auth_admin, g.single_user - FROM ".AUTH_ACCESS_TABLE." aa, " . USER_GROUP_TABLE. " ug, " . GROUPS_TABLE. " g - WHERE ug.user_id = ".$userdata['user_id']. " - AND g.group_id = ug.group_id - AND aa.group_id = ug.group_id - $forum_match_sql"; - $au_result = $db->sql_query($sql); - - if(!$db->sql_numrows($au_result)) + if($value == ALL || $value == REG) { - // - // No entry was found for this user - // thus they don't have access, - // You are the Weakest Link, Goodbye! - // - $auth_user = false; + $auth_user[$key] = true; } else { - $u_access = $db->sql_fetchrowset($au_result); - } + // + // If the type if ACL, MOD or ADMIN + // then we need to see if the user has + // specific permissions to do whatever it + // is they want to do ... to do this + // we pull relevant information for the user + // (and any groups they belong to) + // - $single_user = false; + $single_user = false; - // - // Now we compare the users access level - // against the forums We assume here that - // a moderator and admin automatically have - // access to an ACL forum, similarly we assume - // admins meet an auth requirement of MOD - // - // The access level assigned to a single user - // automatically takes precedence over any - // levels granted by that user being a member - // of a multi-user usergroup, eg. a user - // who is banned from a forum won't gain - // access to it even if they belong to a group - // which has access (and vice versa). This - // check is done via the single_user check - // - switch($f_access) - { - case ACL: - for($i = 0; $i < count($u_access); $i++) - { - if(!$single_user) + // + // Now we compare the users access level + // against the forums We assume here that + // a moderator and admin automatically have + // access to an ACL forum, similarly we assume + // admins meet an auth requirement of MOD + // + // The access level assigned to a single user + // automatically takes precedence over any + // levels granted by that user being a member + // of a multi-user usergroup, eg. a user + // who is banned from a forum won't gain + // access to it even if they belong to a group + // which has access (and vice versa). This + // check is done via the single_user check + // + switch($value) + { + case ACL: + for($j = 0; $j < count($u_access); $j++) { - $auth_user = $auth_user || $u_access[$i]['user_auth'] || $u_access[$i]['auth_mod'] || $u_access[$i]['auth_admin']; - $single_user = $u_access[$i]['single_user']; + if(!$single_user) + { + $auth_user[$key] = $auth_user[$key] || $u_access[$j]['user_auth'] || $u_access[$i]['auth_mod'] || $u_access[$j]['auth_admin']; + $single_user = $u_access[$j]['single_user']; + } } - } - break; - - case MOD: - for($i = 0; $i < count($u_access); $i++) - { - if(!$single_user) + break; + + case MOD: + for($j = 0; $j < count($u_access); $j++) { - $auth_user = $auth_user || $u_access[$i]['auth_mod'] || $u_access[$i]['auth_admin']; - $single_user = $u_access[$i]['single_user']; + if(!$single_user) + { + $auth_user[$key] = $auth_user[$key] || $u_access[$j]['auth_mod'] || $u_access[$j]['auth_admin']; + $single_user = $u_access[$j]['single_user']; + } } - } - break; - - case ADMIN: - for($i = 0; $i < count($u_access); $i++) - { - if(!$single_user) + break; + + case ADMIN: + for($j = 0; $j < count($u_access); $j++) { - $auth_user = $auth_user || $u_access[$i]['auth_admin']; - $single_user = $u_access[$i]['single_user']; + if(!$single_user) + { + $auth_user[$key] = $auth_user[$key] || $u_access[$j]['auth_admin']; + $single_user = $u_access[$j]['single_user']; + } } - } - break; + break; - default: - $auth_user = false; - break; + default: + $auth_user[$auth_fields[$i]] = false; + break; + } + } + } + + $single_user = false; + for($j = 0; $j < count($u_access); $j++) + { + 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 = false; + for($j = 0; $j < count($u_access); $j++) + { + if(!$single_user) + { + $auth_user['auth_admin'] = $auth_user['auth_admin'] || $u_access[$j]['auth_admin']; + $single_user = $u_access[$j]['single_user']; } } } |