makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-26 03:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11582] Use new class for categories

Browse source 
PHPBB3-11582
This commit is contained in:
Joas Schilling 2013-06-28 11:10:33 +02:00
parent 573987d2d2
commit e8d2a2fd88
4 changed files with 44 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/acp/acp_permission_roles.php
View file

@ -456,7 +456,10 @@ class acp_permission_roles
*/ */
function display_auth_options($auth_options) function display_auth_options($auth_options)
{ {
global $template, $user; global $template, $user, $phpbb_container;
$permissions = $phpbb_container->get('acl.permissions');
$permission_categories = $permissions->get_categories();
$content_array = $categories = array(); $content_array = $categories = array();
$key_sort_array = array(0); $key_sort_array = array(0);
@ -473,7 +476,7 @@ class acp_permission_roles
foreach ($content_array as $cat => $cat_array) foreach ($content_array as $cat => $cat_array)
{ {
$template->assign_block_vars('auth', array( $template->assign_block_vars('auth', array(
'CAT_NAME' => $user->lang['permission_cat'][$cat], 'CAT_NAME' => $user->lang($permission_categories[$cat]),
'S_YES' => ($cat_array['S_YES'] && !$cat_array['S_NEVER'] && !$cat_array['S_NO']) ? 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_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$cat_array['S_NO']) ? true : false,

16
phpBB/includes/acp/auth.php
View file

@ -1100,7 +1100,10 @@ class auth_admin extends phpbb_auth
*/ */
function assign_cat_array(&$category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $show_trace = false, $s_view) function assign_cat_array(&$category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $show_trace = false, $s_view)
{ {
global $template, $user, $phpbb_admin_path, $phpEx; global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;
$permissions = $phpbb_container->get('acl.permissions');
$permission_categories = $permissions->get_categories();
@reset($category_array); @reset($category_array);
while (list($cat, $cat_array) = each($category_array)) while (list($cat, $cat_array) = each($category_array))
@ -1110,8 +1113,8 @@ class auth_admin extends phpbb_auth
'S_NEVER' => ($cat_array['S_NEVER'] && !$cat_array['S_YES'] && !$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, 'S_NO' => ($cat_array['S_NO'] && !$cat_array['S_NEVER'] && !$cat_array['S_YES']) ? true : false,
'CAT_NAME' => $user->lang['permission_cat'][$cat]) 'CAT_NAME' => $user->lang($permission_categories[$cat]),
); ));
/* Sort permissions by name (more naturaly and user friendly than sorting by a primary key) /* Sort permissions by name (more naturaly and user friendly than sorting by a primary key)
* Commented out due to it's memory consumption and time needed * Commented out due to it's memory consumption and time needed
@ -1176,7 +1179,10 @@ class auth_admin extends phpbb_auth
*/ */
function build_permission_array(&$permission_row, &$content_array, &$categories, $key_sort_array) function build_permission_array(&$permission_row, &$content_array, &$categories, $key_sort_array)
{ {
global $user; global $user, $phpbb_container;
$permissions = $phpbb_container->get('acl.permissions');
$permission_categories = $permissions->get_categories();
foreach ($key_sort_array as $forum_id) foreach ($key_sort_array as $forum_id)
{ {
@ -1204,7 +1210,7 @@ class auth_admin extends phpbb_auth
// Build our categories array // Build our categories array
if (!isset($categories[$cat])) if (!isset($categories[$cat]))
{ {
$categories[$cat] = $user->lang['permission_cat'][$cat]; $categories[$cat] = $user->lang($permission_categories[$cat]);
} }
// Build our content array // Build our content array

28
phpBB/includes/permissions.php
View file

@ -107,20 +107,20 @@ class phpbb_permissions
); );
protected $categories = array( protected $categories = array(
'actions' => 'Actions', 'actions' => 'ACL_CAT_ACTIONS',
'content' => 'Content', 'content' => 'ACL_CAT_CONTENT',
'forums' => 'Forums', 'forums' => 'ACL_CAT_FORUMS',
'misc' => 'Misc', 'misc' => 'ACL_CAT_MISC',
'permissions' => 'Permissions', 'permissions' => 'ACL_CAT_PERMISSIONS',
'pm' => 'Private messages', 'pm' => 'ACL_CAT_PM',
'polls' => 'Polls', 'polls' => 'ACL_CAT_POLLS',
'post' => 'Post', 'post' => 'ACL_CAT_POST',
'post_actions' => 'Post actions', 'post_actions' => 'ACL_CAT_POST_ACTIONS',
'posting' => 'Posting', 'posting' => 'ACL_CAT_POSTING',
'profile' => 'Profile', 'profile' => 'ACL_CAT_PROFILE',
'settings' => 'Settings', 'settings' => 'ACL_CAT_SETTINGS',
'topic_actions' => 'Topic actions', 'topic_actions' => 'ACL_CAT_TOPIC_ACTIONS',
'user_group' => 'Users & Groups', 'user_group' => 'ACL_CAT_USER_GROUP',
); );
protected $permissions = array( protected $permissions = array(

30
phpBB/language/en/acp/permissions_phpbb.php
View file

@ -65,22 +65,20 @@ if (empty($lang) || !is_array($lang))
// Define categories and permission types // Define categories and permission types
$lang = array_merge($lang, array( $lang = array_merge($lang, array(
'permission_cat' => array( 'ACL_CAT_ACTIONS' => 'Actions',
'actions' => 'Actions', 'ACL_CAT_CONTENT' => 'Content',
'content' => 'Content', 'ACL_CAT_FORUMS' => 'Forums',
'forums' => 'Forums', 'ACL_CAT_MISC' => 'Misc',
'misc' => 'Misc', 'ACL_CAT_PERMISSIONS' => 'Permissions',
'permissions' => 'Permissions', 'ACL_CAT_PM' => 'Private messages',
'pm' => 'Private messages', 'ACL_CAT_POLLS' => 'Polls',
'polls' => 'Polls', 'ACL_CAT_POST' => 'Post',
'post' => 'Post', 'ACL_CAT_POST_ACTIONS' => 'Post actions',
'post_actions' => 'Post actions', 'ACL_CAT_POSTING' => 'Posting',
'posting' => 'Posting', 'ACL_CAT_PROFILE' => 'Profile',
'profile' => 'Profile', 'ACL_CAT_SETTINGS' => 'Settings',
'settings' => 'Settings', 'ACL_CAT_TOPIC_ACTIONS' => 'Topic actions',
'topic_actions' => 'Topic actions', 'ACL_CAT_USER_GROUP' => 'Users & Groups',
'user_group' => 'Users & Groups',
),
'ACL_TYPE_USER' => 'User permissions', 'ACL_TYPE_USER' => 'User permissions',