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

[ticket/13636] Deleting inactive user in acp_users gives unexpected link

Browse source 
Change "referer" to "redirect" in variable names and GET params as well.

PHPBB3-13636
This commit is contained in:
MateBartus 2015-02-24 21:23:58 +01:00
parent b8dfbfe390
commit 19fe32d5b2
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,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&referer=acp_inactive')), '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']),

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

@ -44,9 +44,10 @@ class acp_users
$user_id = request_var('u', 0); $user_id = request_var('u', 0);
$action = request_var('action', ''); $action = request_var('action', '');
$referer = request_var('referer', ''); // Get referer to redirect user to the appropriate page after delete action
$referer_tag = "referer=$referer"; $redirect = request_var('redirect', '');
$referer_url = append_sid("{$phpbb_admin_path}index.$phpEx", "i=$referer"); $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;
@ -150,9 +151,9 @@ class acp_users
} }
$template->assign_vars(array( $template->assign_vars(array(
'U_BACK' => ( (empty($referer)) ? $this->u_action : $referer_url ), '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 . ( (empty($referer)) ? '' : '&' . $referer_tag ), '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'])
); );
@ -226,7 +227,7 @@ class acp_users
add_log('admin', 'LOG_USER_DELETED', $user_row['username']); add_log('admin', 'LOG_USER_DELETED', $user_row['username']);
trigger_error($user->lang['USER_DELETED'] . adm_back_link( trigger_error($user->lang['USER_DELETED'] . adm_back_link(
(empty($referer)) ? $this->u_action : $referer_url (empty($redirect)) ? $this->u_action : $redirect_url
) )
); );
} }
@ -243,9 +244,9 @@ class acp_users
); );
// Checks if the redirection page is specified // Checks if the redirection page is specified
if (!empty($referer)) if (!empty($redirect))
{ {
$delete_confirm_hidden_fields['referer'] = $referer; $delete_confirm_hidden_fields['redirect'] = $redirect;
} }
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($delete_confirm_hidden_fields)); confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($delete_confirm_hidden_fields));