forums - The forums.mageia.org Website

about summary refs log tree commit diff stats

path: root/phpBB/includes/acp/auth.php

diff options

Diffstat (limited to 'phpBB/includes/acp/auth.php')

-rw-r--r--

phpBB/includes/acp/auth.php

65

1 files changed, 47 insertions, 18 deletions

r $phpbb_permissions \phpbb\permissions */

$phpbb_permissions = $phpbb_container->get('acl.permissions');

+ /** @var \phpbb\group\helper $group_helper */

+ $group_helper = $phpbb_container->get('group_helper');

+

// Define names for template loops, might be able to be set

$tpl_pmask = 'p_mask';

$tpl_fmask = 'f_mask';

@@ -300,7 +305,7 @@ class auth_admin extends \phpbb\auth\auth

$ug_names_ary = array();

while ($row = $db->sql_fetchrow($result))

{

- $ug_names_ary[$row['ug_id']] = ($user_mode == 'user') ? $row['ug_name'] : (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['ug_name']] : $row['ug_name']);

+ $ug_names_ary[$row['ug_id']] = ($user_mode == 'user') ? $row['ug_name'] : $group_helper->get_name($row['ug_name']);

}

$db->sql_freeresult($result);

@@ -408,14 +413,7 @@ class auth_admin extends \phpbb\auth\auth

{

foreach ($memberships as $row)

{

- if ($groups[$row['group_id']]['group_type'] == GROUP_SPECIAL)

- {

- $user_groups_default[$row['user_id']][] = $user->lang['G_' . $groups[$row['group_id']]['group_name']];

- }

- else

- {

- $user_groups_custom[$row['user_id']][] = $groups[$row['group_id']]['group_name'];

- }

+ $user_groups_default[$row['user_id']][] = $group_helper->get_name($groups[$row['group_id']]['group_name']);

}

}

unset($memberships, $groups);

@@ -468,7 +466,10 @@ class auth_admin extends \phpbb\auth\auth

// Build role dropdown options

$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;

+ $role_options = array();

+

$s_role_options = '';

+ $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;

@reset($roles);

while (list($role_id, $role_row) = each($roles))

@@ -478,6 +479,13 @@ class auth_admin extends \phpbb\auth\auth

$title = ($role_description) ? ' title="' . $role_description . '"' : '';

$s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';

+

+ $role_options[] = array(

+ 'ID' => $role_id,

+ 'ROLE_NAME' => $role_name,

+ 'TITLE' => $role_description,

+ 'SELECTED' => $role_id == $current_role_id,

+ );

}

if ($s_role_options)

@@ -505,11 +513,14 @@ class auth_admin extends \phpbb\auth\auth

$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(

'NAME' => $ug_names_ary[$ug_id],

- 'S_ROLE_OPTIONS' => $s_role_options,

'UG_ID' => $ug_id,

+ 'S_ROLE_OPTIONS' => $s_role_options,

'S_CUSTOM' => $s_custom_permissions,

- 'FORUM_ID' => $forum_id)

- );

+ 'FORUM_ID' => $forum_id,

+ 'S_ROLE_ID' => $current_role_id,

+ ));

+

+ $template->assign_block_vars_array($tpl_pmask . '.' . $tpl_fmask . '.role_options', $role_options);

$this->assign_cat_array($ug_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, ($mode == 'view'), $show_trace);

@@ -554,6 +565,9 @@ class auth_admin extends \phpbb\auth\auth

// Build role dropdown options

$current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;

+ $role_options = array();

+

+ $current_role_id = (isset($cur_roles[$ug_id][$forum_id])) ? $cur_roles[$ug_id][$forum_id] : 0;

$s_role_options = '';

@reset($roles);

@@ -564,6 +578,13 @@ class auth_admin extends \phpbb\auth\auth

$title = ($role_description) ? ' title="' . $role_description . '"' : '';

$s_role_options .= '<option value="' . $role_id . '"' . (($role_id == $current_role_id) ? ' selected="selected"' : '') . $title . '>' . $role_name . '</option>';

+

+ $role_options[] = array(

+ 'ID' => $role_id,

+ 'ROLE_NAME' => $role_name,

+ 'TITLE' => $role_description,

+ 'SELECTED' => $role_id == $current_role_id,

+ );

}

if ($s_role_options)

@@ -592,12 +613,14 @@ class auth_admin extends \phpbb\auth\auth

$template->assign_block_vars($tpl_pmask . '.' . $tpl_fmask, array(

'NAME' => ($forum_id == 0) ? $forum_names_ary[0] : $forum_names_ary[$forum_id]['forum_name'],

'PADDING' => ($forum_id == 0) ? '' : $forum_names_ary[$forum_id]['padding'],

- 'S_ROLE_OPTIONS' => $s_role_options,

'S_CUSTOM' => $s_custom_permissions,

'UG_ID' => $ug_id,

+ 'S_ROLE_OPTIONS' => $s_role_options,

'FORUM_ID' => $forum_id)

);

+ $template->assign_block_vars_array($tpl_pmask . '.' . $tpl_fmask . '.role_options', $role_options);

+

$this->assign_cat_array($forum_array, $tpl_pmask . '.' . $tpl_fmask . '.' . $tpl_category, $tpl_mask, $ug_id, $forum_id, ($mode == 'view'), $show_trace);

}

@@ -611,13 +634,17 @@ class auth_admin extends \phpbb\auth\auth

*/

function display_role_mask(&$hold_ary)

{

- global $db, $template, $user, $phpbb_root_path, $phpbb_admin_path, $phpEx;

+ global $db, $template, $user, $phpbb_root_path, $phpEx;

+ global $phpbb_container;

if (!sizeof($hold_ary))

{

return;

}

+ /** @var \phpbb\group\helper $group_helper */

+ $group_helper = $phpbb_container->get('group_helper');

+

// Get forum names

$sql = 'SELECT forum_id, forum_name

FROM ' . FORUMS_TABLE . '

@@ -673,7 +700,7 @@ class auth_admin extends \phpbb\auth\auth

{

$template->assign_block_vars('role_mask.groups', array(

'GROUP_ID' => $row['group_id'],

- 'GROUP_NAME' => ($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name'],

+ 'GROUP_NAME' => $group_helper->get_name($row['group_name']),

'U_PROFILE' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=group&g={$row['group_id']}"))

);

}

@@ -1106,8 +1133,9 @@ class auth_admin extends \phpbb\auth\auth

*/

function assign_cat_array(&$category_array, $tpl_cat, $tpl_mask, $ug_id, $forum_id, $s_view, $show_trace = false)

{

- global $template, $user, $phpbb_admin_path, $phpEx, $phpbb_container;

+ global $template, $phpbb_admin_path, $phpEx, $phpbb_container;

+ /* @var $phpbb_permissions \phpbb\permissions */

$phpbb_permissions = $phpbb_container->get('acl.permissions');

@reset($category_array);

@@ -1194,8 +1222,9 @@ class auth_admin extends \phpbb\auth\auth

*/

function build_permission_array(&$permission_row, &$content_array, &$categories, $key_sort_array)

{

- global $user, $phpbb_container;

+ global $phpbb_container;

+ /* @var $phpbb_permissions \phpbb\permissions */

$phpbb_permissions = $phpbb_container->get('acl.permissions');

foreach ($key_sort_array as $forum_id)