mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
[ticket/13455] Update calls to request_var()
PHPBB3-13455
This commit is contained in:
@@ -44,14 +44,14 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||
add_form_key('ucp_pm_compose');
|
||||
|
||||
// Grab only parameters needed here
|
||||
$to_user_id = request_var('u', 0);
|
||||
$to_group_id = request_var('g', 0);
|
||||
$msg_id = request_var('p', 0);
|
||||
$draft_id = request_var('d', 0);
|
||||
$lastclick = request_var('lastclick', 0);
|
||||
$to_user_id = $request->variable('u', 0);
|
||||
$to_group_id = $request->variable('g', 0);
|
||||
$msg_id = $request->variable('p', 0);
|
||||
$draft_id = $request->variable('d', 0);
|
||||
$lastclick = $request->variable('lastclick', 0);
|
||||
|
||||
// Reply to all triggered (quote/reply)
|
||||
$reply_to_all = request_var('reply_to_all', 0);
|
||||
$reply_to_all = $request->variable('reply_to_all', 0);
|
||||
|
||||
$address_list = $request->variable('address_list', array('' => array(0 => '')));
|
||||
|
||||
@@ -620,9 +620,9 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||
// Save Draft
|
||||
if ($save && $auth->acl_get('u_savedrafts'))
|
||||
{
|
||||
$subject = utf8_normalize_nfc(request_var('subject', '', true));
|
||||
$subject = utf8_normalize_nfc($request->variable('subject', '', true));
|
||||
$subject = (!$subject && $action != 'post') ? $user->lang['NEW_MESSAGE'] : $subject;
|
||||
$message = utf8_normalize_nfc(request_var('message', '', true));
|
||||
$message = utf8_normalize_nfc($request->variable('message', '', true));
|
||||
|
||||
if ($subject && $message)
|
||||
{
|
||||
@@ -716,10 +716,10 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||
{
|
||||
$error[] = $user->lang['FORM_INVALID'];
|
||||
}
|
||||
$subject = utf8_normalize_nfc(request_var('subject', '', true));
|
||||
$message_parser->message = utf8_normalize_nfc(request_var('message', '', true));
|
||||
$subject = utf8_normalize_nfc($request->variable('subject', '', true));
|
||||
$message_parser->message = utf8_normalize_nfc($request->variable('message', '', true));
|
||||
|
||||
$icon_id = request_var('icon', 0);
|
||||
$icon_id = $request->variable('icon', 0);
|
||||
|
||||
$enable_bbcode = (!$bbcode_status || isset($_POST['disable_bbcode'])) ? false : true;
|
||||
$enable_smilies = (!$smilies_status || isset($_POST['disable_smilies'])) ? false : true;
|
||||
@@ -907,7 +907,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
|
||||
{
|
||||
if ($action == 'quotepost')
|
||||
{
|
||||
$post_id = request_var('p', 0);
|
||||
$post_id = $request->variable('p', 0);
|
||||
if ($config['allow_post_links'])
|
||||
{
|
||||
$message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}{$user->lang['COLON']} {$message_subject}[/url]\n\n";
|
||||
@@ -1224,13 +1224,13 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
|
||||
}
|
||||
|
||||
// Add Selected Groups
|
||||
$group_list = request_var('group_list', array(0));
|
||||
$group_list = $request->variable('group_list', array(0));
|
||||
|
||||
// Build usernames to add
|
||||
$usernames = request_var('username', '', true);
|
||||
$usernames = $request->variable('username', '', true);
|
||||
$usernames = (empty($usernames)) ? array() : array($usernames);
|
||||
|
||||
$username_list = request_var('username_list', '', true);
|
||||
$username_list = $request->variable('username_list', '', true);
|
||||
if ($username_list)
|
||||
{
|
||||
$usernames = array_merge($usernames, explode("\n", $username_list));
|
||||
@@ -1247,7 +1247,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
|
||||
$submit = false;
|
||||
|
||||
// Preview is only true if there was also a message entered
|
||||
if (request_var('message', ''))
|
||||
if ($request->variable('message', ''))
|
||||
{
|
||||
$preview = true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user