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

Merge branch 'ticket/11358' into develop-olympus

Browse source 
* ticket/11358:
  [ticket/11358] Changed the name of post parameter.
  [ticket/11358] Changed the action parameter value to represent the link.
  [ticket/11358] Enabled link making all users default for a group.
  [ticket/11358] Removed redundant code and referred proper variable.
  [ticket/11358] Success message even without selecting a user.
This commit is contained in:
Nils Adermann 2013-02-24 18:17:32 +01:00
commit fe219e4bbe
1 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
phpBB/includes/acp/acp_groups.php
View file

@ -120,13 +120,34 @@ class acp_groups
{ {
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);
} }
else if (empty($mark_ary))
{
trigger_error($user->lang['NO_USERS'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING);
}
if (confirm_box(true)) if (confirm_box(true))
{ {
$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'];
group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row);
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id));
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'mark' => $mark_ary,
'g' => $group_id,
'i' => $id,
'mode' => $mode,
'action' => $action))
);
}
if (!sizeof($mark_ary)) break;
case 'set_default_on_all':
if (confirm_box(true))
{ {
$group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
$start = 0; $start = 0;
do do
@ -157,27 +178,20 @@ class acp_groups
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
while ($start); while ($start);
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id));
} }
else else
{ {
group_user_attributes('default', $group_id, $mark_ary, false, $group_name, $group_row); confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'mark' => $mark_ary,
'g' => $group_id,
'i' => $id,
'mode' => $mode,
'action' => $action))
);
} }
trigger_error($user->lang['GROUP_DEFS_UPDATED'] . adm_back_link($this->u_action . '&action=list&g=' . $group_id));
}
else
{
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'mark' => $mark_ary,
'g' => $group_id,
'i' => $id,
'mode' => $mode,
'action' => $action))
);
}
break; break;
case 'deleteusers': case 'deleteusers':
if (empty($mark_ary)) if (empty($mark_ary))
{ {
@ -687,7 +701,7 @@ class acp_groups
'U_ACTION' => $this->u_action . "&g=$group_id", 'U_ACTION' => $this->u_action . "&g=$group_id",
'U_BACK' => $this->u_action, 'U_BACK' => $this->u_action,
'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=list&field=usernames'), 'U_FIND_USERNAME' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser&form=list&field=usernames'),
'U_DEFAULT_ALL' => "{$this->u_action}&action=default&g=$group_id", 'U_DEFAULT_ALL' => "{$this->u_action}&action=set_default_on_all&g=$group_id",
)); ));
// Grab the members // Grab the members