diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 16:49:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-06-22 16:49:04 +0000 |
| commit | 8b1555c15bbfe153570600f95259fb286db4cdee (patch) | |
| tree | 82d2d4b326be82368f5535b74aeb706bc5f5da01 /phpBB/includes/acp/acp_permission_roles.php | |
| parent | 725b21f2d206efb4b34eb95ec3329bc81f66b805 (diff) | |
| download | forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.gz forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.bz2 forums-8b1555c15bbfe153570600f95259fb286db4cdee.tar.xz forums-8b1555c15bbfe153570600f95259fb286db4cdee.zip | |
change ACL_NO to ACL_NEVER and ACL_UNSET to ACL_NO to let our users get what is meant on the first look.
the downside is that the information is no more accurate (permissions are still unset, defaulting to no) - someone might to overlook all explanations. :)
git-svn-id: file:///svn/phpbb/trunk@6115 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_permission_roles.php')
| -rw-r--r-- | phpBB/includes/acp/acp_permission_roles.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php index 1681986a36..2026aebaf0 100644 --- a/phpBB/includes/acp/acp_permission_roles.php +++ b/phpBB/includes/acp/acp_permission_roles.php @@ -239,7 +239,7 @@ class acp_permission_roles $auth_options = array(); while ($row = $db->sql_fetchrow($result)) { - $auth_options[$row['auth_option']] = ACL_UNSET; + $auth_options[$row['auth_option']] = ACL_NO; } $db->sql_freeresult($result); } @@ -294,7 +294,7 @@ class acp_permission_roles ) ); - // We need to fill the auth options array with ACL_UNSET options ;) + // We need to fill the auth options array with ACL_NO options ;) $sql = 'SELECT auth_option_id, auth_option FROM ' . ACL_OPTIONS_TABLE . " WHERE auth_option LIKE '{$permission_type}%' @@ -306,7 +306,7 @@ class acp_permission_roles { if (!isset($auth_options[$row['auth_option']])) { - $auth_options[$row['auth_option']] = ACL_UNSET; + $auth_options[$row['auth_option']] = ACL_NO; } } $db->sql_freeresult($result); @@ -447,17 +447,17 @@ class acp_permission_roles $template->assign_block_vars('auth', array( 'CAT_NAME' => $user->lang['permission_cat'][$cat], - 'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NO'] && !$cat_array['S_UNSET']) ? true : false, - 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_YES'] && !$cat_array['S_UNSET']) ? true : false, - 'S_UNSET' => ($cat_array['S_UNSET'] && !$cat_array['S_NO'] && !$cat_array['S_YES']) ? true : false) + 'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? true : false, + 'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false, + 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false) ); foreach ($cat_array['permissions'] as $permission => $allowed) { $template->assign_block_vars('auth.mask', array( 'S_YES' => ($allowed == ACL_YES) ? true : false, + 'S_NEVER' => ($allowed == ACL_NEVER) ? true : false, 'S_NO' => ($allowed == ACL_NO) ? true : false, - 'S_UNSET' => ($allowed == ACL_UNSET) ? true : false, 'FIELD_NAME' => $permission, 'PERMISSION' => $user->lang['acl_' . $permission]['lang']) @@ -484,7 +484,7 @@ class acp_permission_roles $auth_settings = array(); while ($row = $db->sql_fetchrow($result)) { - $auth_settings[$row['auth_option']] = ACL_UNSET; + $auth_settings[$row['auth_option']] = ACL_NO; } $db->sql_freeresult($result); |