diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-25 14:47:57 +0000 |
commit | 5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730 (patch) | |
tree | a083f062a59bdacfe913d1cc84d96813037185ec /phpBB/modules/ucp | |
parent | ddfef8d832e84eca694bc6d98f2d4ec3ca480142 (diff) | |
download | forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.gz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.bz2 forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.tar.xz forums-5b9a3c9a7d8f8e4590dddf4440ac82c30ef3f730.zip |
add nils' request and super globals class
rename request:: to phpbb_request::
git-svn-id: file:///svn/phpbb/trunk@9230 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/modules/ucp')
-rw-r--r-- | phpBB/modules/ucp/ucp_attachments.php | 4 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_groups.php | 34 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_main.php | 18 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_pm.php | 6 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_pm_compose.php | 38 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_pm_options.php | 34 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_pm_viewfolder.php | 4 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_prefs.php | 2 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_profile.php | 6 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_register.php | 20 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_remind.php | 2 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_resend.php | 2 | ||||
-rw-r--r-- | phpBB/modules/ucp/ucp_zebra.php | 2 |
13 files changed, 86 insertions, 86 deletions
diff --git a/phpBB/modules/ucp/ucp_attachments.php b/phpBB/modules/ucp/ucp_attachments.php index 39fbe84ae1..5bd66028a2 100644 --- a/phpBB/modules/ucp/ucp_attachments.php +++ b/phpBB/modules/ucp/ucp_attachments.php @@ -33,8 +33,8 @@ class ucp_attachments $sort_key = request_var('sk', 'a'); $sort_dir = request_var('sd', 'a'); - $delete = request::is_set_post('delete'); - $confirm = request::is_set_post('confirm'); + $delete = phpbb_request::is_set_post('delete'); + $confirm = phpbb_request::is_set_post('confirm'); $delete_ids = array_keys(request_var('attachment', array(0))); if ($delete && sizeof($delete_ids)) diff --git a/phpBB/modules/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php index 3dd80fb813..0c4a5dca31 100644 --- a/phpBB/modules/ucp/ucp_groups.php +++ b/phpBB/modules/ucp/ucp_groups.php @@ -33,19 +33,19 @@ class ucp_groups $return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>'); $mark_ary = request_var('mark', array(0)); - $submit = request::variable('submit', false, false, request::POST); - $delete = request::variable('delete', false, false, request::POST); + $submit = phpbb_request::variable('submit', false, false, phpbb_request::POST); + $delete = phpbb_request::variable('delete', false, false, phpbb_request::POST); $error = $data = array(); switch ($mode) { case 'membership': - + $this->page_title = 'UCP_USERGROUPS_MEMBER'; - if ($submit || request::is_set_post('change_default')) + if ($submit || phpbb_request::is_set_post('change_default')) { - $action = (request::is_set_post('change_default')) ? 'change_default' : request_var('action', ''); + $action = (phpbb_request::is_set_post('change_default')) ? 'change_default' : request_var('action', ''); $group_id = ($action == 'change_default') ? request_var('default', 0) : request_var('selected', 0); if (!$group_id) @@ -407,9 +407,9 @@ class ucp_groups case 'manage': $this->page_title = 'UCP_USERGROUPS_MANAGE'; - $action = (request::is_set_post('addusers')) ? 'addusers' : request_var('action', ''); + $action = (phpbb_request::is_set_post('addusers')) ? 'addusers' : request_var('action', ''); $group_id = request_var('g', 0); - + include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT); add_form_key('ucp_groups'); @@ -433,7 +433,7 @@ class ucp_groups { trigger_error($user->lang['NOT_ALLOWED_MANAGE_GROUP'] . $return_page, E_USER_WARNING); } - + $group_name = $group_row['group_name']; $group_type = $group_row['group_type']; @@ -445,7 +445,7 @@ class ucp_groups 'GROUP_COLOUR' => (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '', 'GROUP_DESC_DISP' => generate_text_for_display($group_row['group_desc'], $group_row['group_desc_uid'], $group_row['group_desc_bitfield'], $group_row['group_desc_options']), 'GROUP_TYPE' => $group_row['group_type'], - + 'AVATAR' => $avatar_img, 'AVATAR_IMAGE' => $avatar_img, 'AVATAR_WIDTH' => (isset($group_row['group_avatar_width'])) ? $group_row['group_avatar_width'] : '', @@ -478,7 +478,7 @@ class ucp_groups $data = $submit_ary = array(); - $update = request::is_set_post('update'); + $update = phpbb_request::is_set_post('update'); $error = array(); @@ -501,7 +501,7 @@ class ucp_groups $submit_ary = array( 'colour' => request_var('group_colour', ''), 'rank' => request_var('group_rank', 0), - 'receive_pm' => request::is_set('group_receive_pm') ? 1 : 0, + 'receive_pm' => phpbb_request::is_set('group_receive_pm') ? 1 : 0, 'message_limit' => request_var('group_message_limit', 0), 'max_recipients'=> request_var('group_max_recipients', 0), ); @@ -599,7 +599,7 @@ class ucp_groups // Only set the rank, colour, etc. if it's changed or if we're adding a new // group. This prevents existing group members being updated if no changes // were made. - + $group_attributes = array(); $test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients'); foreach ($test_variables as $test) @@ -668,13 +668,13 @@ class ucp_groups $type_closed = ($group_type == GROUP_CLOSED) ? ' checked="checked"' : ''; $type_hidden = ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : ''; - $display_gallery = request::is_set_post('display_gallery'); + $display_gallery = phpbb_request::is_set_post('display_gallery'); if ($config['allow_avatar_local'] && $display_gallery) { avatar_gallery($category, $avatar_select, 4); } - + $avatars_enabled = ($can_upload || ($config['allow_avatar_local'] || $config['allow_avatar_remote'])) ? true : false; $template->assign_vars(array( @@ -692,7 +692,7 @@ class ucp_groups 'GROUP_RECEIVE_PM' => (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '', 'GROUP_MESSAGE_LIMIT' => (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0, 'GROUP_MAX_RECIPIENTS' => (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0, - + 'GROUP_DESC' => $group_desc_data['text'], 'S_DESC_BBCODE_CHECKED' => $group_desc_data['allow_bbcode'], 'S_DESC_URLS_CHECKED' => $group_desc_data['allow_urls'], @@ -891,7 +891,7 @@ class ucp_groups if (!sizeof($mark_ary)) { $start = 0; - + do { $sql = 'SELECT user_id @@ -1022,7 +1022,7 @@ class ucp_groups $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; $default = request_var('default', 0); - + if (confirm_box(true)) { // Add user/s to group diff --git a/phpBB/modules/ucp/ucp_main.php b/phpBB/modules/ucp/ucp_main.php index ca573ca044..2b239e8205 100644 --- a/phpBB/modules/ucp/ucp_main.php +++ b/phpBB/modules/ucp/ucp_main.php @@ -204,7 +204,7 @@ class ucp_main add_form_key('ucp_front_subscribed'); - $unwatch = request::is_set_post('unwatch'); + $unwatch = phpbb_request::is_set_post('unwatch'); if ($unwatch) { @@ -287,7 +287,7 @@ class ucp_main } else { - $tracking_topics = request::variable($config['cookie_name'] . '_track', '', false, request::COOKIE); + $tracking_topics = phpbb_request::variable($config['cookie_name'] . '_track', '', false, phpbb_request::COOKIE); $tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array(); } @@ -387,10 +387,10 @@ class ucp_main $user->add_lang('viewforum'); - if (request::is_set_post('unbookmark')) + if (phpbb_request::is_set_post('unbookmark')) { $s_hidden_fields = array('unbookmark' => 1); - $topics = array_keys(request::variable('t', array(0 => 0), false, request::POST)); + $topics = array_keys(phpbb_request::variable('t', array(0 => 0), false, phpbb_request::POST)); $url = $this->u_action; if (!sizeof($topics)) @@ -433,10 +433,10 @@ class ucp_main $user->add_lang('posting'); - $edit = request::is_set('edit'); - $draft_id = request::variable('edit', 0); - $submit = request::is_set_post('submit'); - $delete = request::is_set_post('delete'); + $edit = phpbb_request::is_set('edit'); + $draft_id = phpbb_request::variable('edit', 0); + $submit = phpbb_request::is_set_post('submit'); + $delete = phpbb_request::is_set_post('delete'); $s_hidden_fields = ($edit) ? '<input type="hidden" name="edit" value="' . $draft_id . '" />' : ''; $draft_subject = $draft_message = ''; @@ -615,7 +615,7 @@ class ucp_main $template->assign_vars(array( 'L_TITLE' => $user->lang['UCP_MAIN_' . strtoupper($mode)], - 'S_DISPLAY_MARK_ALL' => ($mode == 'watched' || ($mode == 'drafts' && !request::is_set('edit', request::GET))) ? true : false, + 'S_DISPLAY_MARK_ALL' => ($mode == 'watched' || ($mode == 'drafts' && !phpbb_request::is_set('edit', phpbb_request::GET))) ? true : false, 'S_HIDDEN_FIELDS' => (isset($s_hidden_fields)) ? $s_hidden_fields : '', 'S_UCP_ACTION' => $this->u_action, diff --git a/phpBB/modules/ucp/ucp_pm.php b/phpBB/modules/ucp/ucp_pm.php index b631357784..15e73bda27 100644 --- a/phpBB/modules/ucp/ucp_pm.php +++ b/phpBB/modules/ucp/ucp_pm.php @@ -195,8 +195,8 @@ class ucp_pm // First Handle Mark actions and moving messages - $submit_mark = request::is_set_post('submit_mark'); - $move_pm = request::is_set_post('move_pm'); + $submit_mark = phpbb_request::is_set_post('submit_mark'); + $move_pm = phpbb_request::is_set_post('move_pm'); $mark_option = request_var('mark_option', ''); $dest_folder = request_var('dest_folder', PRIVMSGS_NO_BOX); @@ -211,7 +211,7 @@ class ucp_pm // Move PM if ($move_pm) { - $move_msg_ids = request::variable('marked_msg_id', array(0), false, request::POST); + $move_msg_ids = phpbb_request::variable('marked_msg_id', array(0), false, phpbb_request::POST); $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id)) diff --git a/phpBB/modules/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php index 9a540ad22c..ac9a4076cb 100644 --- a/phpBB/modules/ucp/ucp_pm_compose.php +++ b/phpBB/modules/ucp/ucp_pm_compose.php @@ -46,19 +46,19 @@ function compose_pm($id, $mode, $action) $lastclick = request_var('lastclick', 0); $address_list = request_var('address_list', array('' => array(0 => ''))); - $submit = request::is_set_post('post'); - $preview = request::is_set_post('preview'); - $save = request::is_set_post('save'); - $load = request::is_set_post('load'); - $cancel = (request::is_set_post('cancel') && !$save) ? true : false; - $delete = request::is_set_post('delete'); - - $remove_u = request::is_set('remove_u'); - $remove_g = request::is_set('remove_g'); - $add_to = request::is_set('add_to'); - $add_bcc = request::is_set('add_bcc'); - - $refresh = request::is_set_post('add_file') || request::is_set_post('delete_file') || $save || $load + $submit = phpbb_request::is_set_post('post'); + $preview = phpbb_request::is_set_post('preview'); + $save = phpbb_request::is_set_post('save'); + $load = phpbb_request::is_set_post('load'); + $cancel = (phpbb_request::is_set_post('cancel') && !$save) ? true : false; + $delete = phpbb_request::is_set_post('delete'); + + $remove_u = phpbb_request::is_set('remove_u'); + $remove_g = phpbb_request::is_set('remove_g'); + $add_to = phpbb_request::is_set('add_to'); + $add_bcc = phpbb_request::is_set('add_bcc'); + + $refresh = phpbb_request::is_set_post('add_file') || phpbb_request::is_set_post('delete_file') || $save || $load || $remove_u || $remove_g || $add_to || $add_bcc; $action = ($delete && !$preview && !$refresh && $submit) ? 'delete' : $action; @@ -637,10 +637,10 @@ function compose_pm($id, $mode, $action) $icon_id = request_var('icon', 0); - $enable_bbcode = (!$bbcode_status || request::is_set_post('disable_bbcode')) ? false : true; - $enable_smilies = (!$smilies_status || request::is_set_post'disable_smilies')) ? false : true; - $enable_urls = (request::is_set_post('disable_magic_url')) ? 0 : 1; - $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : request::is_set_post('attach_sig'); + $enable_bbcode = (!$bbcode_status || phpbb_request::is_set_post('disable_bbcode')) ? false : true; + $enable_smilies = (!$smilies_status || phpbb_request::is_set_post'disable_smilies')) ? false : true; + $enable_urls = (phpbb_request::is_set_post('disable_magic_url')) ? 0 : 1; + $enable_sig = (!$config['allow_sig'] ||!$config['allow_sig_pm']) ? false : phpbb_request::is_set_post('attach_sig'); if ($submit) { @@ -1014,7 +1014,7 @@ function compose_pm($id, $mode, $action) $s_hidden_fields = '<input type="hidden" name="lastclick" value="' . $current_time . '" />'; $s_hidden_fields .= (isset($check_value)) ? '<input type="hidden" name="status_switch" value="' . $check_value . '" />' : ''; - $s_hidden_fields .= ($draft_id || request::is_set('draft_loaded')) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', (int) $draft_id) . '" />' : ''; + $s_hidden_fields .= ($draft_id || phpbb_request::is_set('draft_loaded')) ? '<input type="hidden" name="draft_loaded" value="' . request_var('draft_loaded', (int) $draft_id) . '" />' : ''; $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_pm_attach'] || !$auth->acl_get('u_pm_attach')) ? '' : ' enctype="multipart/form-data"'; @@ -1059,7 +1059,7 @@ function compose_pm($id, $mode, $action) 'S_HIDDEN_ADDRESS_FIELD' => $s_hidden_address_field, 'S_HIDDEN_FIELDS' => $s_hidden_fields, - 'S_CLOSE_PROGRESS_WINDOW' => request::is_set_post('add_file'), + 'S_CLOSE_PROGRESS_WINDOW' => phpbb_request::is_set_post('add_file'), 'U_PROGRESS_BAR' => append_sid('posting', 'f=0&mode=popup'), 'UA_PROGRESS_BAR' => addslashes(append_sid('posting', 'f=0&mode=popup')), )); 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)) { diff --git a/phpBB/modules/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php index 67db920b2b..a67b64d229 100644 --- a/phpBB/modules/ucp/ucp_pm_viewfolder.php +++ b/phpBB/modules/ucp/ucp_pm_viewfolder.php @@ -24,7 +24,7 @@ function view_folder($id, $mode, $folder_id, $folder) { global $user, $template, $auth, $db, $cache, $config; - $submit_export = request::is_set_post('submit_export'); + $submit_export = phpbb_request::is_set_post('submit_export'); $folder_info = get_pm_from($folder_id, $folder, $user->data['user_id']); @@ -473,7 +473,7 @@ function get_pm_from($folder_id, $folder, $user_id) { $min_post_time = time() - ($sort_days * 86400); - if (request::is_set_post('sort')) + if (phpbb_request::is_set_post('sort')) { $start = 0; } diff --git a/phpBB/modules/ucp/ucp_prefs.php b/phpBB/modules/ucp/ucp_prefs.php index f33ae39ba5..4e78d480ab 100644 --- a/phpBB/modules/ucp/ucp_prefs.php +++ b/phpBB/modules/ucp/ucp_prefs.php @@ -29,7 +29,7 @@ class ucp_prefs { global $config, $db, $user, $auth, $template; - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $error = $data = array(); $s_hidden_fields = ''; diff --git a/phpBB/modules/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php index fc4e7e174b..626fb8023d 100644 --- a/phpBB/modules/ucp/ucp_profile.php +++ b/phpBB/modules/ucp/ucp_profile.php @@ -33,9 +33,9 @@ class ucp_profile $user->add_lang('posting'); - $preview = request::variable('preview', false, false, request::POST); - $submit = request::variable('submit', false, false, request::POST); - $delete = request::variable('delete', false, false, request::POST); + $preview = phpbb_request::variable('preview', false, false, phpbb_request::POST); + $submit = phpbb_request::variable('submit', false, false, phpbb_request::POST); + $delete = phpbb_request::variable('delete', false, false, phpbb_request::POST); $error = $data = array(); $s_hidden_fields = ''; diff --git a/phpBB/modules/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php index a3a128f1b2..b9ba1246ea 100644 --- a/phpBB/modules/ucp/ucp_register.php +++ b/phpBB/modules/ucp/ucp_register.php @@ -37,9 +37,9 @@ class ucp_register include(PHPBB_ROOT_PATH . 'includes/functions_profile_fields.' . PHP_EXT); - $coppa = request::is_set('coppa') ? ((request_var('coppa', false)) ? 1 : 0) : false; - $agreed = request::variable('agreed', false, false, request::POST) ? 1 : 0; - $submit = request::is_set_post('submit'); + $coppa = phpbb_request::is_set('coppa') ? ((request_var('coppa', false)) ? 1 : 0) : false; + $agreed = phpbb_request::variable('agreed', false, false, phpbb_request::POST) ? 1 : 0; + $submit = phpbb_request::is_set_post('submit'); $change_lang = request_var('change_lang', ''); $user_lang = request_var('lang', $user->lang_name); @@ -52,14 +52,14 @@ class ucp_register add_form_key('ucp_register_terms'); } - + if ($config['enable_confirm']) { include(PHPBB_ROOT_PATH . 'includes/captcha/captcha_factory.' . PHP_EXT); $captcha = phpbb_captcha_factory::get_instance($config['captcha_plugin']); $captcha->init(CONFIRM_REG); } - + if ($change_lang || $user_lang != $config['default_lang']) { $use_lang = ($change_lang) ? basename($change_lang) : basename($user_lang); @@ -71,7 +71,7 @@ class ucp_register $submit = false; // Setting back agreed to let the user view the agreement in his/her language - $agreed = (request::is_set_post('change_lang')) ? 0 : $agreed; + $agreed = (phpbb_request::is_set_post('change_lang')) ? 0 : $agreed; } $user->lang_name = $lang = $use_lang; @@ -94,7 +94,7 @@ class ucp_register { $add_lang = ($change_lang) ? '&change_lang=' . urlencode($change_lang) : ''; $add_coppa = ($coppa !== false) ? '&coppa=' . $coppa : ''; - + $s_hidden_fields = array(); // If we change the language, we want to pass on some more possible parameter. @@ -108,7 +108,7 @@ class ucp_register 'lang' => $user->lang_name, 'tz' => request_var('tz', (float) $config['board_timezone']), )); - + if ($config['enable_confirm']) { $s_hidden_fields = array_merge($s_hidden_fields, $captcha->get_hidden_fields()); @@ -435,7 +435,7 @@ class ucp_register { $str = ''; } - + $template->assign_vars(array( 'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'), 'S_CAPTCHA' => $captcha->get_template(), @@ -454,7 +454,7 @@ class ucp_register $l_reg_cond = $user->lang['UCP_ADMIN_ACTIVATE']; break; } - + $template->assign_vars(array( 'ERROR' => (sizeof($error)) ? implode('<br />', $error) : '', 'USERNAME' => $data['username'], diff --git a/phpBB/modules/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php index fd8d1cebc6..db4b3c8fcc 100644 --- a/phpBB/modules/ucp/ucp_remind.php +++ b/phpBB/modules/ucp/ucp_remind.php @@ -31,7 +31,7 @@ class ucp_remind $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); if ($submit) { diff --git a/phpBB/modules/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php index a3b79ffb0f..fef6decf4a 100644 --- a/phpBB/modules/ucp/ucp_resend.php +++ b/phpBB/modules/ucp/ucp_resend.php @@ -31,7 +31,7 @@ class ucp_resend $username = request_var('username', '', true); $email = strtolower(request_var('email', '')); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); add_form_key('ucp_resend'); diff --git a/phpBB/modules/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php index c45eb9a1d6..6ba168a53c 100644 --- a/phpBB/modules/ucp/ucp_zebra.php +++ b/phpBB/modules/ucp/ucp_zebra.php @@ -28,7 +28,7 @@ class ucp_zebra { global $config, $db, $user, $auth, $template; - $submit = request::is_set_post('submit') || request::is_set('add', request::GET) || request::is_set('remove', request::GET); + $submit = phpbb_request::is_set_post('submit') || phpbb_request::is_set('add', phpbb_request::GET) || phpbb_request::is_set('remove', phpbb_request::GET); $s_hidden_fields = ''; $l_mode = strtoupper($mode); |