diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-05 14:30:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-05 14:30:11 +0000 |
| commit | e6c79242e6a7debfccc643a09dfab4a4d7746a8a (patch) | |
| tree | 359aff16844a95c92252eae7879ab0b6f93cd76b /phpBB/includes/auth.php | |
| parent | 50a8caee5daa1caf1596e847b5708cba11e8ac83 (diff) | |
| download | forums-e6c79242e6a7debfccc643a09dfab4a4d7746a8a.tar forums-e6c79242e6a7debfccc643a09dfab4a4d7746a8a.tar.gz forums-e6c79242e6a7debfccc643a09dfab4a4d7746a8a.tar.bz2 forums-e6c79242e6a7debfccc643a09dfab4a4d7746a8a.tar.xz forums-e6c79242e6a7debfccc643a09dfab4a4d7746a8a.zip | |
dumdidum... sorry. ;)
git-svn-id: file:///svn/phpbb/trunk@8146 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/auth.php')
| -rw-r--r-- | phpBB/includes/auth.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/includes/auth.php b/phpBB/includes/auth.php index de9cc9bac7..c965149018 100644 --- a/phpBB/includes/auth.php +++ b/phpBB/includes/auth.php @@ -9,6 +9,14 @@ */ /** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +/** * Permission/Auth class * @package phpBB3 */ @@ -156,7 +164,7 @@ class auth { global $db; - $sql = 'SELECT forum_id + $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE; if (sizeof($this->acl)) @@ -578,7 +586,7 @@ class auth ) ), - 'WHERE' => 'ao.auth_option_id = a.auth_option_id + 'WHERE' => 'ao.auth_option_id = a.auth_option_id AND a.group_id = ug.group_id AND ug.user_pending = 0 ' . (($sql_user) ? 'AND ug.' . $sql_user : '') . " @@ -725,7 +733,7 @@ class auth $hold_ary = array(); - // Grab group settings... + // Grab group settings... $sql = $db->sql_build_query('SELECT', array( 'SELECT' => 'a.group_id, ao.auth_option, a.forum_id, a.auth_setting, a.auth_role_id, r.auth_setting as role_auth_setting', |