diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:33 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:33 +0100 |
| commit | ee82970d96e0a6772b24c48aab8ebd1888ec5216 (patch) | |
| tree | 2f284a1671eb3667a4b280b252ecd6e930b5920c /phpBB/develop/add_permissions.php | |
| parent | c9f68f0b5c339cf7c0126eef8e7c533a0107bd66 (diff) | |
| parent | 108312d52a447e3ad5a2e8d1682f0439e5443cf0 (diff) | |
| download | forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.gz forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.bz2 forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.tar.xz forums-ee82970d96e0a6772b24c48aab8ebd1888ec5216.zip | |
Merge commit 'release-3.0-B2'
Diffstat (limited to 'phpBB/develop/add_permissions.php')
| -rw-r--r-- | phpBB/develop/add_permissions.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php index f368da5944..bc8c317c12 100644 --- a/phpBB/develop/add_permissions.php +++ b/phpBB/develop/add_permissions.php @@ -33,9 +33,9 @@ require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.'.$phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.'.$phpEx); include($phpbb_root_path . 'includes/functions.'.$phpEx); -define('ACL_NO', 0); +define('ACL_NEVER', 0); define('ACL_YES', 1); -define('ACL_UNSET', -1); +define('ACL_NO', -1); define('ACL_GROUPS_TABLE', $table_prefix.'acl_groups'); define('ACL_OPTIONS_TABLE', $table_prefix.'acl_options'); @@ -212,14 +212,14 @@ foreach ($prefixes as $prefix) echo "<p><b>Adding $auth_option...</b></p>\n"; - mass_auth('group', 0, 'guests', $auth_option, ACL_NO); - mass_auth('group', 0, 'inactive', $auth_option, ACL_NO); - mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NO); - mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NO); - mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO)); - mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NO)); + mass_auth('group', 0, 'guests', $auth_option, ACL_NEVER); + mass_auth('group', 0, 'inactive', $auth_option, ACL_NEVER); + mass_auth('group', 0, 'inactive_coppa', $auth_option, ACL_NEVER); + mass_auth('group', 0, 'registered_coppa', $auth_option, ACL_NEVER); + mass_auth('group', 0, 'registered', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER)); + mass_auth('group', 0, 'global_moderators', $auth_option, (($prefix != 'a_') ? ACL_YES : ACL_NEVER)); mass_auth('group', 0, 'administrators', $auth_option, ACL_YES); - mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NO)); + mass_auth('group', 0, 'bots', $auth_option, (($prefix != 'm_' && $prefix != 'a_') ? ACL_YES : ACL_NEVER)); } } } @@ -236,7 +236,7 @@ echo "<p><b>Done</b></p>\n"; $forum_id = forum ids (array|int|0) -> 0 == all forums $ug_id = [int] user_id|group_id : [string] usergroup name $acl_list = [string] acl entry : [array] acl entries - $setting = ACL_YES|ACL_NO|ACL_UNSET + $setting = ACL_YES|ACL_NEVER|ACL_NO */ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) { @@ -337,7 +337,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) switch ($setting) { - case ACL_UNSET: + case ACL_NO: if (isset($cur_auth[$forum][$auth_option_id])) { $sql_ary['delete'][] = "DELETE FROM $table |