1 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/modules/ucp/ucp_pm_options.php b/phpBB/modules/ucp/ucp_pm_options.php
index af3b211a5e..4b25056d82 100644
--- a/phpBB/modules/ucp/ucp_pm_options.php
+++ b/phpBB/modules/ucp/ucp_pm_options.php
@@ -27,7 +27,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 
 	add_form_key('ucp_pm_options');
 	// Change "full folder" setting - what to do if folder is full
-	if (request::is_set_post('fullfolder'))
+	if (phpbb_request::is_set_post('fullfolder'))
 	{
 		check_form_key('ucp_pm_options', $config['form_token_lifetime'], $redirect_url);
 		$full_action = request_var('full_action', 0);
@@ -66,9 +66,9 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 			trigger_error($message);
 		}
 	}
-	
+
 	// Add Folder
-	if (request::is_set_post('addfolder'))
+	if (phpbb_request::is_set_post('addfolder'))
 	{
 		if (check_form_key('ucp_pm_options'))
 		{
@@ -120,7 +120,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	}
 
 	// Rename folder
-	if (request::is_set_post('rename_folder'))
+	if (phpbb_request::is_set_post('rename_folder'))
 	{
 		if (check_form_key('ucp_pm_options'))
 		{
@@ -165,7 +165,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	}
 
 	// Remove Folder
-	if (request::is_set_post('remove_folder'))
+	if (phpbb_request::is_set_post('remove_folder'))
 	{
 		$remove_folder_id = request_var('remove_folder_id', 0);
 
@@ -223,7 +223,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 				// Move Messages
 				case 1:
 					$num_moved = move_pm($user->data['user_id'], $user->data['message_limit'], $msg_ids, $move_to, $remove_folder_id);
-					
+
 					// Something went wrong, only partially moved?
 					if ($num_moved != $folder_row['pm_count'])
 					{
@@ -276,7 +276,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	}
 
 	// Add Rule
-	if (request::is_set_post('add_rule'))
+	if (phpbb_request::is_set_post('add_rule'))
 	{
 		if (check_form_key('ucp_pm_options'))
 		{
@@ -345,7 +345,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	}
 
 	// Remove Rule
-	if (request::is_set_post('delete_rule') && !request::is_set_post('cancel'))
+	if (phpbb_request::is_set_post('delete_rule') && !phpbb_request::is_set_post('cancel'))
 	{
 		$delete_id = array_keys(request_var('delete_rule', array(0 => 0)));
 		$delete_id = (!empty($delete_id[0])) ? $delete_id[0] : 0;
@@ -402,7 +402,7 @@ function message_options($id, $mode, $global_privmsgs_rules, $global_rule_condit
 	$result = $db->sql_query($sql);
 	$num_messages = (int) $db->sql_fetchfield('num_messages');
 	$db->sql_freeresult($result);
-	
+
 	$folder[PRIVMSGS_INBOX] = array(
 		'folder_name'		=> $user->lang['PM_INBOX'],
 		'message_status'	=> sprintf($user->lang['FOLDER_MESSAGE_STATUS'], $num_messages, $user->data['message_limit'])
@@ -658,7 +658,7 @@ function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule_conditions)
 {
 	global $db, $template, $auth, $user;
-	
+
 	$template->assign_vars(array(
 		'S_COND_DEFINED'	=> true,
 		'S_COND_SELECT'		=> (!$hardcoded && isset($global_rule_conditions[$rule_option])) ? true : false)
@@ -682,7 +682,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 	{
 		case 'text':
 			$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
-			
+
 			$template->assign_vars(array(
 				'S_TEXT_CONDITION'	=> true,
 				'CURRENT_STRING'	=> $rule_string,
@@ -696,7 +696,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 		case 'user':
 			$rule_user_id = request_var('rule_user_id', 0);
 			$rule_string = utf8_normalize_nfc(request_var('rule_string', '', true));
-			
+
 			if ($rule_string && !$rule_user_id)
 			{
 				$sql = 'SELECT user_id
@@ -758,10 +758,10 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 			{
 				$sql .= 'WHERE';
 			}
-			
-			$sql .= " (g.group_name NOT IN ('GUESTS', 'BOTS') OR g.group_type <> " . GROUP_SPECIAL . ')	
+
+			$sql .= " (g.group_name NOT IN ('GUESTS', 'BOTS') OR g.group_type <> " . GROUP_SPECIAL . ')
 				ORDER BY g.group_type DESC, g.group_name ASC';
-			
+
 			$result = $db->sql_query($sql);
 
 			$s_group_options = '';
@@ -774,7 +774,7 @@ function define_cond_option($hardcoded, $cond_option, $rule_option, $global_rule
 
 				$s_class	= ($row['group_type'] == GROUP_SPECIAL) ? ' class="sep"' : '';
 				$s_selected	= ($row['group_id'] == $rule_group_id) ? ' selected="selected"' : '';
-				
+
 				$s_group_options .= '<option value="' . $row['group_id'] . '"' . $s_class . $s_selected . '>' . (($row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
 			}
 			$db->sql_freeresult($result);
@@ -812,7 +812,7 @@ function show_defined_rules($user_id, $check_lang, $rule_lang, $action_lang, $fo
 		WHERE user_id = ' . $user_id . '
 		ORDER BY rule_id ASC';
 	$result = $db->sql_query($sql);
-	
+
 	$count = 0;
 	while ($row = $db->sql_fetchrow($result))
 	{