makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11582] Use member isntead of a new variable everytime

Browse source 
PHPBB3-11582
This commit is contained in:
Joas Schilling 2013-07-06 13:52:09 +02:00
parent 9c653341e4
commit 22ba3de1a2
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/includes/acp/acp_permissions.php
View file

@ -22,15 +22,18 @@ class acp_permissions
{ {
var $u_action; var $u_action;
var $permission_dropdown; var $permission_dropdown;
protected $permissions;
function main($id, $mode) function main($id, $mode)
{ {
global $db, $user, $auth, $template, $cache; global $db, $user, $auth, $template, $cache, $phpbb_container;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx;
include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx); include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx); include_once($phpbb_root_path . 'includes/acp/auth.' . $phpEx);
$this->permissions = $phpbb_container->get('acl.permissions');
$auth_admin = new auth_admin(); $auth_admin = new auth_admin();
$user->add_lang('acp/permissions'); $user->add_lang('acp/permissions');
@ -49,7 +52,7 @@ class acp_permissions
if ($user_id && isset($auth_admin->acl_options['id'][$permission]) && $auth->acl_get('a_viewauth')) if ($user_id && isset($auth_admin->acl_options['id'][$permission]) && $auth->acl_get('a_viewauth'))
{ {
$this->page_title = sprintf($user->lang['TRACE_PERMISSION'], $user->lang['acl_' . $permission]['lang']); $this->page_title = sprintf($user->lang['TRACE_PERMISSION'], $this->permissions->get_permission_lang($permission));
$this->permission_trace($user_id, $forum_id, $permission); $this->permission_trace($user_id, $forum_id, $permission);
return; return;
} }
@ -510,12 +513,9 @@ class acp_permissions
trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['ONLY_FORUM_DEFINED'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
global $phpbb_container;
$phpbb_permissions = $phpbb_container->get('acl.permissions');
$template->assign_vars(array( $template->assign_vars(array(
'S_PERMISSION_DROPDOWN' => (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false, 'S_PERMISSION_DROPDOWN' => (sizeof($this->permission_dropdown) > 1) ? $this->build_permission_dropdown($this->permission_dropdown, $permission_type, $permission_scope) : false,
'L_PERMISSION_TYPE' => $phpbb_permissions->get_type_lang($permission_type), 'L_PERMISSION_TYPE' => $this->permissions->get_type_lang($permission_type),
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
'S_HIDDEN_FIELDS' => $s_hidden_fields) 'S_HIDDEN_FIELDS' => $s_hidden_fields)
@ -590,9 +590,7 @@ class acp_permissions
*/ */
function build_permission_dropdown($options, $default_option, $permission_scope) function build_permission_dropdown($options, $default_option, $permission_scope)
{ {
global $auth, $phpbb_container; global $auth;
$phpbb_permissions = $phpbb_container->get('acl.permissions');
$s_dropdown_options = ''; $s_dropdown_options = '';
foreach ($options as $setting) foreach ($options as $setting)
@ -603,7 +601,7 @@ class acp_permissions
} }
$selected = ($setting == $default_option) ? ' selected="selected"' : ''; $selected = ($setting == $default_option) ? ' selected="selected"' : '';
$l_setting = $phpbb_permissions->get_type_lang($setting, $permission_scope); $l_setting = $this->permissions->get_type_lang($setting, $permission_scope);
$s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>'; $s_dropdown_options .= '<option value="' . $setting . '"' . $selected . '>' . $l_setting . '</option>';
} }
@ -984,7 +982,7 @@ class acp_permissions
$back = request_var('back', 0); $back = request_var('back', 0);
$template->assign_vars(array( $template->assign_vars(array(
'PERMISSION' => $user->lang['acl_' . $permission]['lang'], 'PERMISSION' => $this->permissions->get_permission_lang($permission),
'PERMISSION_USERNAME' => $userdata['username'], 'PERMISSION_USERNAME' => $userdata['username'],
'FORUM_NAME' => $forum_name, 'FORUM_NAME' => $forum_name,

2
phpBB/includes/permissions.php
View file

@ -165,7 +165,7 @@ class phpbb_permissions
*/ */
public function get_permission_lang($permission) public function get_permission_lang($permission)
{ {
return (isset($this->permissions[$permission]['lang'])) ? $this->user->lang($this->permissions[$permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission)); return (isset($this->permissions['acl_' . $permission]['lang'])) ? $this->user->lang($this->permissions['acl_' . $permission]['lang']) : $this->user->lang('ACL_' . strtoupper($permission));
} }
protected $types = array( protected $types = array(