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

Merge branch '3.1.x'

Browse source 
Conflicts:
	phpBB/includes/acp/acp_users.php
This commit is contained in:
Marc Alexander 2015-10-07 16:55:57 +02:00
commit b13393078c
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_inactive.php
View file

@ -275,7 +275,7 @@ class acp_inactive
'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])), 'REMINDED_EXPLAIN' => $user->lang('USER_LAST_REMINDED', (int) $row['user_reminded'], $user->format_date($row['user_reminded_time'])),
'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview')), 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour'], false, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=users&mode=overview&redirect=acp_inactive')),
'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']),
'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']),

26
phpBB/includes/acp/acp_users.php
View file

@ -44,6 +44,11 @@ class acp_users
$user_id = $request->variable('u', 0); $user_id = $request->variable('u', 0);
$action = $request->variable('action', ''); $action = $request->variable('action', '');
// Get referer to redirect user to the appropriate page after delete action
$redirect = request_var('redirect', '');
$redirect_tag = "redirect=$redirect";
$redirect_url = append_sid("{$phpbb_admin_path}index.$phpEx", "i=$redirect");
$submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false; $submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false;
$form_name = 'acp_users'; $form_name = 'acp_users';
@ -146,9 +151,9 @@ class acp_users
} }
$template->assign_vars(array( $template->assign_vars(array(
'U_BACK' => $this->u_action, 'U_BACK' => (empty($redirect)) ? $this->u_action : $redirect_url,
'U_MODE_SELECT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&u=$user_id"), 'U_MODE_SELECT' => append_sid("{$phpbb_admin_path}index.$phpEx", "i=$id&u=$user_id"),
'U_ACTION' => $this->u_action . '&u=' . $user_id, 'U_ACTION' => $this->u_action . '&u=' . $user_id . ((empty($redirect)) ? '' : '&' . $redirect_tag),
'S_FORM_OPTIONS' => $s_form_options, 'S_FORM_OPTIONS' => $s_form_options,
'MANAGED_USERNAME' => $user_row['username']) 'MANAGED_USERNAME' => $user_row['username'])
); );
@ -221,19 +226,30 @@ class acp_users
user_delete($delete_type, $user_id, $user_row['username']); user_delete($delete_type, $user_id, $user_row['username']);
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_DELETED', false, array($user_row['username'])); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_DELETED', false, array($user_row['username']));
trigger_error($user->lang['USER_DELETED'] . adm_back_link($this->u_action)); trigger_error($user->lang['USER_DELETED'] . adm_back_link(
(empty($redirect)) ? $this->u_action : $redirect_url
)
);
} }
else else
{ {
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array( $delete_confirm_hidden_fields = array(
'u' => $user_id, 'u' => $user_id,
'i' => $id, 'i' => $id,
'mode' => $mode, 'mode' => $mode,
'action' => $action, 'action' => $action,
'update' => true, 'update' => true,
'delete' => 1, 'delete' => 1,
'delete_type' => $delete_type)) 'delete_type' => $delete_type,
); );
// Checks if the redirection page is specified
if (!empty($redirect))
{
$delete_confirm_hidden_fields['redirect'] = $redirect;
}
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($delete_confirm_hidden_fields));
} }
} }
else else