mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
hidden fields adjustments
git-svn-id: file:///svn/phpbb/trunk@5201 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
bcc1eb1c0e
commit
9d825c0e20
2 changed files with 14 additions and 25 deletions
|
@ -1268,9 +1268,11 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
$s_hidden_fields = '<input type="hidden" name="user_id" value="' . $user->data['user_id'] . '" />';
|
$s_hidden_fields = build_hidden_fields(array(
|
||||||
$s_hidden_fields .= '<input type="hidden" name="sess" value="' . $user->session_id . '" />';
|
'user_id' => $user->data['user_id'],
|
||||||
$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $SID . '" />';
|
'sess' => $user->session_id,
|
||||||
|
'sid' => $SID)
|
||||||
|
);
|
||||||
|
|
||||||
// generate activation key
|
// generate activation key
|
||||||
$confirm_key = gen_rand_string(10);
|
$confirm_key = gen_rand_string(10);
|
||||||
|
@ -1372,8 +1374,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
|
||||||
$redirect = htmlspecialchars($split_page[0][1] . '.' . $phpEx . $SID . ((!empty($split_page[0][2])) ? '&' . $split_page[0][2] : ''));
|
$redirect = htmlspecialchars($split_page[0][1] . '.' . $phpEx . $SID . ((!empty($split_page[0][2])) ? '&' . $split_page[0][2] : ''));
|
||||||
}
|
}
|
||||||
|
|
||||||
$s_hidden_fields = '<input type="hidden" name="redirect" value="' . $redirect . '" />';
|
$s_hidden_fields = build_hidden_fields(array('redirect' => $redirect, 'sid' => $SID));
|
||||||
$s_hidden_fields .= '<input type="hidden" name="sid" value="' . $SID . '" />';
|
|
||||||
|
|
||||||
$template->assign_vars(array(
|
$template->assign_vars(array(
|
||||||
'LOGIN_ERROR' => $err,
|
'LOGIN_ERROR' => $err,
|
||||||
|
|
|
@ -717,25 +717,6 @@ function handle_mark_actions($user_id, $mark_action)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'delete_marked':
|
case 'delete_marked':
|
||||||
$hidden_fields = array('cur_folder_id' => $cur_folder_id, 'mark_option' => 'delete_marked', 'submit_mark' => true);
|
|
||||||
$hidden_fields['marked_msg_id'] = $msg_ids;
|
|
||||||
$s_hidden_fields = '';
|
|
||||||
|
|
||||||
foreach ($hidden_fields as $key => $var)
|
|
||||||
{
|
|
||||||
if (is_array($var))
|
|
||||||
{
|
|
||||||
foreach ($var as $_key => $_var)
|
|
||||||
{
|
|
||||||
$s_hidden_fields .= '<input type="hidden" name="' . $key . '[' . $_key . ']" value="' . $_var . '" />';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
$s_hidden_fields .= '<input type="hidden" name="' . $key . '" value="' . $var . '" />';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
unset($hidden_fields);
|
|
||||||
|
|
||||||
if (confirm_box(true))
|
if (confirm_box(true))
|
||||||
{
|
{
|
||||||
|
@ -749,7 +730,14 @@ function handle_mark_actions($user_id, $mark_action)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
confirm_box(false, 'DELETE_MARKED_PM', $s_hidden_fields);
|
$s_hidden_fields = array(
|
||||||
|
'cur_folder_id' => $cur_folder_id,
|
||||||
|
'mark_option' => 'delete_marked',
|
||||||
|
'submit_mark' => true,
|
||||||
|
'marked_msg_id' => $msg_ids
|
||||||
|
);
|
||||||
|
|
||||||
|
confirm_box(false, 'DELETE_MARKED_PM', build_hidden_fields($s_hidden_fields));
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Reference in a new issue