mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-17 07:01:22 +02:00
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9053 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -88,7 +88,7 @@ class acp_groups
|
|||||||
// Approve, demote or promote
|
// Approve, demote or promote
|
||||||
$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
|
$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
|
||||||
$error = group_user_attributes($action, $group_id, $mark_ary, false, $group_name);
|
$error = group_user_attributes($action, $group_id, $mark_ary, false, $group_name);
|
||||||
|
|
||||||
if (!$error)
|
if (!$error)
|
||||||
{
|
{
|
||||||
switch ($action)
|
switch ($action)
|
||||||
@@ -112,7 +112,7 @@ class acp_groups
|
|||||||
{
|
{
|
||||||
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING);
|
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'default':
|
case 'default':
|
||||||
@@ -180,7 +180,7 @@ class acp_groups
|
|||||||
|
|
||||||
case 'deleteusers':
|
case 'deleteusers':
|
||||||
case 'delete':
|
case 'delete':
|
||||||
if (!$group_id)
|
if (!$group_id)
|
||||||
{
|
{
|
||||||
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
|
trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
|
||||||
}
|
}
|
||||||
@@ -188,6 +188,7 @@ class acp_groups
|
|||||||
{
|
{
|
||||||
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
|
trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (confirm_box(true))
|
if (confirm_box(true))
|
||||||
{
|
{
|
||||||
$error = '';
|
$error = '';
|
||||||
@@ -752,14 +753,14 @@ class acp_groups
|
|||||||
foreach ($row_ary as $group_id => $row)
|
foreach ($row_ary as $group_id => $row)
|
||||||
{
|
{
|
||||||
$group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name'];
|
$group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name'];
|
||||||
|
|
||||||
$template->assign_block_vars('groups', array(
|
$template->assign_block_vars('groups', array(
|
||||||
'U_LIST' => "{$this->u_action}&action=list&g=$group_id",
|
'U_LIST' => "{$this->u_action}&action=list&g=$group_id",
|
||||||
'U_EDIT' => "{$this->u_action}&action=edit&g=$group_id",
|
'U_EDIT' => "{$this->u_action}&action=edit&g=$group_id",
|
||||||
'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&action=delete&g=$group_id" : '',
|
'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&action=delete&g=$group_id" : '',
|
||||||
|
|
||||||
'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false,
|
'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false,
|
||||||
|
|
||||||
'GROUP_NAME' => $group_name,
|
'GROUP_NAME' => $group_name,
|
||||||
'TOTAL_MEMBERS' => $row['total_members'],
|
'TOTAL_MEMBERS' => $row['total_members'],
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user