diff options
author | Nils Adermann <naderman@naderman.de> | 2008-11-24 00:20:33 +0000 |
---|---|---|
committer | Nils Adermann <naderman@naderman.de> | 2008-11-24 00:20:33 +0000 |
commit | 07e9b83a3de0264916a058b9cf180b91b297604f (patch) | |
tree | 386aed44943159d6634f74ee756c4073d5dbab19 /phpBB/includes/acp | |
parent | 8427ae3fd4bd0055931579d18cb9d43d69f72a90 (diff) | |
download | forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.gz forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.bz2 forums-07e9b83a3de0264916a058b9cf180b91b297604f.tar.xz forums-07e9b83a3de0264916a058b9cf180b91b297604f.zip |
- updated all code to use the request class instead of any direct access to
super globals
- disabled super globals in common.php. See commit r9101 for
more information
- cleaned up/simplified a few lines along the way.
git-svn-id: file:///svn/phpbb/trunk@9102 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp')
26 files changed, 151 insertions, 128 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 7b866e3c36..c4642f9dad 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -31,7 +31,7 @@ class acp_attachments $user->add_lang(array('posting', 'viewtopic', 'acp/attachments')); $error = $notify = array(); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $action = request_var('action', ''); $form_key = 'acp_attach'; @@ -128,7 +128,7 @@ class acp_attachments ); $this->new_config = $config; - $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => '')) : $this->new_config; + $cfg_array = (request::is_set('config')) ? request_var('config', array('' => '')) : $this->new_config; $error = array(); // We validate the complete config if whished @@ -297,7 +297,7 @@ class acp_attachments case 'extensions': - if ($submit || isset($_POST['add_extension_check'])) + if ($submit || request::is_set_post('add_extension_check')) { if ($submit) { @@ -361,7 +361,7 @@ class acp_attachments // Add Extension? $add_extension = strtolower(request_var('add_extension', '')); $add_extension_group = request_var('add_group_select', 0); - $add = (isset($_POST['add_extension_check'])) ? true : false; + $add = request::is_set_post('add_extension_check'); if ($add_extension && $add) { @@ -402,7 +402,7 @@ class acp_attachments $template->assign_vars(array( 'S_EXTENSIONS' => true, 'ADD_EXTENSION' => (isset($add_extension)) ? $add_extension : '', - 'GROUP_SELECT_OPTIONS' => (isset($_POST['add_extension_check'])) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group')) + 'GROUP_SELECT_OPTIONS' => (request::is_set_post('add_extension_check')) ? $this->group_select('add_group_select', $add_extension_group, 'extension_group') : $this->group_select('add_group_select', false, 'extension_group')) ); $sql = 'SELECT * @@ -512,10 +512,10 @@ class acp_attachments $size_select = request_var('size_select', 'b'); $forum_select = request_var('forum_select', false); $allowed_forums = request_var('allowed_forums', array(0)); - $allow_in_pm = (isset($_POST['allow_in_pm'])) ? true : false; + $allow_in_pm = request::is_set_post('allow_in_pm'); $max_filesize = request_var('max_filesize', 0); $max_filesize = ($size_select == 'kb') ? round($max_filesize * 1024) : (($size_select == 'mb') ? round($max_filesize * 1048576) : $max_filesize); - $allow_group = (isset($_POST['allow_group'])) ? true : false; + $allow_group = request::is_set_post('allow_group'); if ($max_filesize == $config['max_filesize']) { @@ -593,7 +593,7 @@ class acp_attachments ); $group_id = request_var('g', 0); - $action = (isset($_POST['add'])) ? 'add' : $action; + $action = request::is_set_post('add'); switch ($action) { @@ -876,8 +876,8 @@ class acp_attachments if ($submit) { - $delete_files = (isset($_POST['delete'])) ? array_keys(request_var('delete', array('' => 0))) : array(); - $add_files = (isset($_POST['add'])) ? array_keys(request_var('add', array('' => 0))) : array(); + $delete_files = array_keys(request::variable('delete', array('' => 0), false, request::POST)); + $add_files = array_keys(request::variable('add', array('' => 0), false, request::POST)); $post_ids = request_var('post_id', array('' => 0)); if (sizeof($delete_files)) @@ -1231,14 +1231,14 @@ class acp_attachments { global $db, $user; - if (isset($_REQUEST['securesubmit'])) + if (request::is_set('securesubmit')) { // Grab the list of entries $ips = request_var('ips', ''); $ip_list = array_unique(explode("\n", $ips)); $ip_list_log = implode(', ', $ip_list); - $ip_exclude = (!empty($_POST['ipexclude'])) ? 1 : 0; + $ip_exclude = (int) request::variable('ipexclude', false, false, request::POST); $iplist = array(); $hostlist = array(); @@ -1385,7 +1385,7 @@ class acp_attachments trigger_error($user->lang['SECURE_DOWNLOAD_UPDATE_SUCCESS'] . adm_back_link($this->u_action)); } - else if (isset($_POST['unsecuresubmit'])) + else if (request::is_set_post('unsecuresubmit')) { $unip_sql = request_var('unip', array(0)); diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index f00c1a7fb4..8456c957a2 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -29,8 +29,8 @@ class acp_ban include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); - $bansubmit = (isset($_POST['bansubmit'])) ? true : false; - $unbansubmit = (isset($_POST['unbansubmit'])) ? true : false; + $bansubmit = request::is_set_post('bansubmit'); + $unbansubmit = request::is_set_post('unbansubmit'); $current_time = time(); $user->add_lang(array('acp/ban', 'acp/users')); diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b2961dfb2b..46ad90e546 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -32,7 +32,7 @@ class acp_board $user->add_lang('acp/board'); $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $form_key = 'acp_board'; add_form_key($form_key); @@ -371,7 +371,7 @@ class acp_board } $this->new_config = $config; - $cfg_array = (isset($_REQUEST['config'])) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config; + $cfg_array = (request::is_set('config')) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config; $error = array(); // We validate the complete config if whished diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index 672fb39c1d..327b31968d 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -28,11 +28,11 @@ class acp_bots global $config, $db, $user, $auth, $template, $cache; $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $mark = request_var('mark', array(0)); $bot_id = request_var('id', 0); - if (isset($_POST['add'])) + if (request::is_set_post('add')) { $action = 'add'; } diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index f90699b2a8..dbc18e59bc 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -36,7 +36,7 @@ class acp_captcha $configure = request_var('configure', false); // Oh, they are just here for the view - if (isset($_GET['captcha_demo'])) + if (request::is_set('captcha_demo', request::GET)) { $this->deliver_demo($selected); } @@ -109,7 +109,7 @@ class acp_captcha foreach ($config_vars as $config_var => $template_var) { - $template->assign_var($template_var, (isset($_REQUEST[$config_var])) ? request_var($config_var, '') : $config[$config_var]) ; + $template->assign_var($template_var, request_var($config_var, $config[$config_var])) ; } $template->assign_vars(array( diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index c7c794dfba..b8115f5ed1 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -33,7 +33,7 @@ class acp_database $this->page_title = 'ACP_DATABASE'; $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $template->assign_vars(array( 'MODE' => $mode diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/includes/acp/acp_disallow.php index abcb964906..ec124b043f 100644 --- a/phpBB/includes/acp/acp_disallow.php +++ b/phpBB/includes/acp/acp_disallow.php @@ -38,8 +38,8 @@ class acp_disallow $form_key = 'acp_disallow'; add_form_key($form_key); - $disallow = (isset($_POST['disallow'])) ? true : false; - $allow = (isset($_POST['allow'])) ? true : false; + $disallow = request::is_set_post('disallow'); + $allow = request::is_set_post('allow'); if (($allow || $disallow) && !check_form_key($form_key)) { diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index b8672a1c03..1e39049eca 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -35,7 +35,7 @@ class acp_email add_form_key($form_key); // Set some vars - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $error = array(); $usernames = request_var('usernames', '', true); @@ -48,7 +48,7 @@ class acp_email { // Error checking needs to go here ... if no subject and/or no message then skip // over the send and return to the form - $use_queue = (isset($_POST['send_immediately'])) ? false : true; + $use_queue = request::is_set_post('send_immediately'); $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); if (!check_form_key($form_key)) diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index da32a66fa7..37453f2f34 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -36,7 +36,7 @@ class acp_forums add_form_key($form_key); $action = request_var('action', ''); - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); $forum_id = request_var('f', 0); $this->parent_id = request_var('parent_id', 0); diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index cae2c30433..654fd62553 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -37,14 +37,14 @@ class acp_groups include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); // Check and set some common vars - $action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['addusers'])) ? 'addusers' : request_var('action', '')); + $action = (request::is_set_post('add')) ? 'add' : ((request::is_set_post('addusers')) ? 'addusers' : request_var('action', '')); $group_id = request_var('g', 0); $mark_ary = request_var('mark', array(0)); $name_ary = request_var('usernames', '', true); $leader = request_var('leader', 0); $default = request_var('default', 0); $start = request_var('start', 0); - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); // Clear some vars @@ -303,8 +303,8 @@ class acp_groups $submit_ary = array( 'colour' => request_var('group_colour', ''), 'rank' => request_var('group_rank', 0), - 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, - 'legend' => isset($_REQUEST['group_legend']) ? 1 : 0, + 'receive_pm' => request::is_set('group_receive_pm') ? 1 : 0, + 'legend' => request::is_set('group_legend') ? 1 : 0, 'message_limit' => request_var('group_message_limit', 0), 'max_recipients' => request_var('group_max_recipients', 0), 'founder_manage' => 0, @@ -312,7 +312,7 @@ class acp_groups if ($user->data['user_type'] == USER_FOUNDER) { - $submit_ary['founder_manage'] = isset($_REQUEST['group_founder_manage']) ? 1 : 0; + $submit_ary['founder_manage'] = request::is_set('group_founder_manage') ? 1 : 0; } if (!empty($_FILES['uploadfile']['tmp_name']) || $data['uploadurl'] || $data['remotelink']) @@ -519,7 +519,7 @@ class acp_groups $avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . PHPBB_ADMIN_PATH . 'images/no_avatar.gif" alt="" />'; - $display_gallery = (isset($_POST['display_gallery'])) ? true : false; + $display_gallery = request::is_set_post('display_gallery'); if ($config['allow_avatar_local'] && $display_gallery) { diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index aa7429dc96..6d2c8ad6f1 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -32,9 +32,9 @@ class acp_icons // Set up general vars $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - $action = (isset($_POST['edit'])) ? 'edit' : $action; - $action = (isset($_POST['import'])) ? 'import' : $action; + $action = (request::is_set_post('add')) ? 'add' : $action; + $action = (request::is_set_post('edit')) ? 'edit' : $action; + $action = (request::is_set_post('import')) ? 'import' : $action; $icon_id = request_var('id', 0); $mode = ($mode == 'smilies') ? 'smilies' : 'icons'; @@ -309,20 +309,20 @@ class acp_icons case 'modify': // Get items to create/modify - $images = (isset($_POST['image'])) ? array_keys(request_var('image', array('' => 0))) : array(); + $images = array_keys(request::variable('image', array('' => 0), false, request::POST)); // Now really get the items - $image_id = (isset($_POST['id'])) ? request_var('id', array('' => 0)) : array(); - $image_order = (isset($_POST['order'])) ? request_var('order', array('' => 0)) : array(); - $image_width = (isset($_POST['width'])) ? request_var('width', array('' => 0)) : array(); - $image_height = (isset($_POST['height'])) ? request_var('height', array('' => 0)) : array(); - $image_add = (isset($_POST['add_img'])) ? request_var('add_img', array('' => 0)) : array(); - $image_emotion = utf8_normalize_nfc(request_var('emotion', array('' => ''), true)); - $image_code = utf8_normalize_nfc(request_var('code', array('' => ''), true)); - $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); + $image_id = request::variable('id', array('' => 0), false, request::POST); + $image_order = request::variable('order', array('' => 0), false, request::POST); + $image_width = request::variable('width', array('' => 0), false, request::POST); + $image_height = request::variable('height', array('' => 0), false, request::POST); + $image_add = request::variable('add_img', array('' => 0), false, request::POST); + $image_display_on_posting = request::variable('display_on_posting', array('' => 0), false, request::POST); + $image_emotion = utf8_normalize_nfc(request_var('emotion', array('' => ''), true)); + $image_code = utf8_normalize_nfc(request_var('code', array('' => ''), true)); // Ok, add the relevant bits if we are adding new codes to existing emoticons... - if (!empty($_POST['add_additional_code'])) + if (request::variable('add_additional_code', false, false, request::POST)) { $add_image = request_var('add_image', ''); $add_code = utf8_normalize_nfc(request_var('add_code', '', true)); @@ -338,7 +338,7 @@ class acp_icons $image_width[$add_image] = request_var('add_width', 0); $image_height[$add_image] = request_var('add_height', 0); - if (!empty($_POST['add_display_on_posting'])) + if (request::variable('add_display_on_posting', false, false, request::POST)) { $image_display_on_posting[$add_image] = 1; } diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 1a1ff3ecf7..52c7de217f 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -38,9 +38,9 @@ class acp_inactive $user->add_lang('memberlist'); $action = request_var('action', ''); - $mark = (isset($_REQUEST['mark'])) ? request_var('mark', array(0)) : array(); + $mark = request_var('mark', array(0)); $start = request_var('start', 0); - $submit = isset($_POST['submit']); + $submit = request::is_set_post('submit'); // Sort keys $sort_days = request_var('st', 0); diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 8f51c84ea2..48ad5c5986 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -33,7 +33,7 @@ class acp_jabber include_once(PHPBB_ROOT_PATH . 'includes/functions_jabber.' . PHP_EXT); $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); if ($mode != 'settings') { diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php index 66f201dbed..28de0452d0 100644 --- a/phpBB/includes/acp/acp_language.php +++ b/phpBB/includes/acp/acp_language.php @@ -34,30 +34,40 @@ class acp_language global $config, $db, $user, $auth, $template, $cache; global $safe_mode, $file_uploads; + /** + * @todo make this work with the request class, might require some additional functionality + * inside the request class. Reducing some of the redundance of this code would certainly + * not hurt either. + */ + request::enable_super_globals(); + include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); $this->default_variables(); // Check and set some common vars - $action = (isset($_POST['update_details'])) ? 'update_details' : ''; - $action = (isset($_POST['download_file'])) ? 'download_file' : $action; - $action = (isset($_POST['upload_file'])) ? 'upload_file' : $action; - $action = (isset($_POST['upload_data'])) ? 'upload_data' : $action; - $action = (isset($_POST['submit_file'])) ? 'submit_file' : $action; - $action = (isset($_POST['remove_store'])) ? 'details' : $action; + $action = (request::is_set_post('update_details')) ? 'update_details' : ''; + $action = (request::is_set_post('download_file')) ? 'download_file' : $action; + $action = (request::is_set_post('upload_file')) ? 'upload_file' : $action; + $action = (request::is_set_post('upload_data')) ? 'upload_data' : $action; + $action = (request::is_set_post('submit_file')) ? 'submit_file' : $action; + $action = (request::is_set_post('remove_store')) ? 'details' : $action; - $submit = (empty($action) && !isset($_POST['update']) && !isset($_POST['test_connection'])) ? false : true; + $submit = (empty($action) && !request::is_set_post('update') && !request::is_set_post('test_connection')) ? false : true; $action = (empty($action)) ? request_var('action', '') : $action; $form_name = 'acp_lang'; add_form_key('acp_lang'); $lang_id = request_var('id', 0); - if (isset($_POST['missing_file'])) + if (request::is_set_post('missing_file')) { $missing_file = request_var('missing_file', array('' => 0)); - list($_REQUEST['language_file'], ) = array_keys($missing_file); + /** + * @todo Do NOT overwrite a request variable. + */ + request::overwrite('language_file', key($missing_file)); } $selected_lang_file = request_var('language_file', '|common.' . PHP_EXT); @@ -114,11 +124,12 @@ class acp_language $requested_data = call_user_func(array($method, 'data')); foreach ($requested_data as $data => $default) { + $default_value = request_var($data, ''); $template->assign_block_vars('data', array( 'DATA' => $data, 'NAME' => $user->lang[strtoupper($method . '_' . $data)], 'EXPLAIN' => $user->lang[strtoupper($method . '_' . $data) . '_EXPLAIN'], - 'DEFAULT' => (!empty($_REQUEST[$data])) ? request_var($data, '') : $default + 'DEFAULT' => (empty($default_value)) ? $default : $default_value )); } @@ -129,6 +140,9 @@ class acp_language 'method' => $method) ); + /** + * @todo Do not use $_POST here, but request::variable which needs to support more dimensions + */ $hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP); $template->assign_vars(array( @@ -488,7 +502,7 @@ class acp_language } } - if (isset($_POST['remove_store'])) + if (request::is_set_post('remove_store')) { $store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true); diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index 7ad0734151..204b2d4935 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -33,8 +33,8 @@ class acp_logs $action = request_var('action', ''); $forum_id = request_var('f', 0); $start = request_var('start', 0); - $deletemark = (!empty($_POST['delmarked'])) ? true : false; - $deleteall = (!empty($_POST['delall'])) ? true : false; + $deletemark = request::variable('delmarked', false, false, request::POST); + $deleteall = request::variable('delall', false, false, request::POST); $marked = request_var('mark', array(0)); // Sort keys diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 111725088b..70b3c621c8 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -266,7 +266,7 @@ class acp_modules $module_data['module_langname'] = utf8_normalize_nfc(request_var('module_langname', (string) $module_row['module_langname'], true)); $module_data['module_mode'] = request_var('module_mode', (string) $module_row['module_mode']); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); if ($submit) { diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/includes/acp/acp_permission_roles.php index cdc276ad01..0ca445338b 100644 --- a/phpBB/includes/acp/acp_permission_roles.php +++ b/phpBB/includes/acp/acp_permission_roles.php @@ -37,10 +37,10 @@ class acp_permission_roles $this->tpl_name = 'acp_permission_roles'; - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $role_id = request_var('role_id', 0); $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; + $action = (request::is_set_post('add')) ? 'add' : $action; $form_name = 'acp_permissions'; add_form_key($form_name); diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index ed7ca5e942..3512824d0c 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -59,7 +59,7 @@ class acp_permissions // Set some vars $action = request_var('action', array('' => 0)); $action = key($action); - $action = (isset($_POST['psubmit'])) ? 'apply_permissions' : $action; + $action = (request::is_set_post('psubmit')) ? 'apply_permissions' : $action; $all_forums = request_var('all_forums', 0); $subforum_id = request_var('subforum_id', 0); @@ -229,8 +229,8 @@ class acp_permissions trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); } // All users/groups selected? - $all_users = (isset($_POST['all_users'])) ? true : false; - $all_groups = (isset($_POST['all_groups'])) ? true : false; + $all_users = request::is_set_post('all_users'); + $all_groups = request::is_set_post('all_groups'); if ($all_users || $all_groups) { @@ -257,7 +257,7 @@ class acp_permissions break; case 'apply_permissions': - if (!isset($_POST['setting'])) + if (!request::is_set_post('setting')) { trigger_error($user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); } @@ -270,7 +270,7 @@ class acp_permissions break; case 'apply_all_permissions': - if (!isset($_POST['setting'])) + if (!request::is_set_post('setting')) { trigger_error($user->lang['NO_AUTH_SETTING_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); } @@ -376,8 +376,8 @@ class acp_permissions case 'usergroup': case 'usergroup_view': - $all_users = (isset($_POST['all_users'])) ? true : false; - $all_groups = (isset($_POST['all_groups'])) ? true : false; + $all_users = request::is_set_post('all_users'); + $all_groups = request::is_set_post('all_groups'); if ((sizeof($user_id) && !$all_users) || (sizeof($group_id) && !$all_groups)) { @@ -632,18 +632,14 @@ class acp_permissions list($ug_id, ) = each($psubmit); list($forum_id, ) = each($psubmit[$ug_id]); - if (empty($_POST['setting']) || empty($_POST['setting'][$ug_id]) || empty($_POST['setting'][$ug_id][$forum_id]) || !is_array($_POST['setting'][$ug_id][$forum_id])) + $auth_settings = request::variable('setting', array(0 => array(0 => array('' => 0))), false, request::POST); + if (!isset($auth_settings[$ug_id][$forum_id]) || !sizeof($auth_settings[$ug_id][$forum_id]))) { trigger_error('WRONG_PERMISSION_SETTING_FORMAT', E_USER_WARNING); } - // We obtain and check $_POST['setting'][$ug_id][$forum_id] directly and not using request_var() because request_var() - // currently does not support the amount of dimensions required. ;) - // $auth_settings = request_var('setting', array(0 => array(0 => array('' => 0)))); - $auth_settings = array_map('intval', $_POST['setting'][$ug_id][$forum_id]); - // Do we have a role we want to set? - $assigned_role = (isset($_POST['role'][$ug_id][$forum_id])) ? (int) $_POST['role'][$ug_id][$forum_id] : 0; + $assigned_role = request::variable(array('role', $ug_id, $forum_id), 0, false, request::POST)); // Do the admin want to set these permissions to other items too? $inherit = request_var('inherit', array(0 => array(0))); @@ -713,23 +709,21 @@ class acp_permissions trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $auth_settings = (isset($_POST['setting'])) ? $_POST['setting'] : array(); - $auth_roles = (isset($_POST['role'])) ? $_POST['role'] : array(); + $auth_settings = request::variable('setting', array(0 => array(0 => array('' => 0))), false, request::POST); + $auth_roles = request::variable('role', array(0 => array(0 => 0)), false, request::POST); $ug_ids = $forum_ids = array(); // We need to go through the auth settings foreach ($auth_settings as $ug_id => $forum_auth_row) { - $ug_id = (int) $ug_id; $ug_ids[] = $ug_id; foreach ($forum_auth_row as $forum_id => $auth_options) { - $forum_id = (int) $forum_id; $forum_ids[] = $forum_id; // Check role... - $assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? (int) $auth_roles[$ug_id][$forum_id] : 0; + $assigned_role = (isset($auth_roles[$ug_id][$forum_id])) ? $auth_roles[$ug_id][$forum_id] : 0; // If the auth settings differ from the assigned role, then do not set a role... if ($assigned_role) diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index a05766f4a6..4143b70434 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -38,7 +38,7 @@ class acp_profile $this->tpl_name = 'acp_profile'; $this->page_title = 'ACP_CUSTOM_PROFILE_FIELDS'; - $action = (isset($_POST['create'])) ? 'create' : request_var('action', ''); + $action = (request::is_set_post('create')) ? 'create' : request_var('action', ''); $error = array(); $s_hidden_fields = ''; @@ -287,8 +287,8 @@ class acp_profile $field_id = request_var('field_id', 0); $step = request_var('step', 1); - $submit = (isset($_REQUEST['next']) || isset($_REQUEST['prev'])) ? true : false; - $save = (isset($_REQUEST['save'])) ? true : false; + $submit = (request::is_set('next') || request::is_set('prev')) ? true : false; + $save = request::is_set('save'); // The language id of default language $this->edit_lang_id = $this->lang_defs['iso'][$config['default_lang']]; @@ -399,7 +399,7 @@ class acp_profile $cp->vars['lang_default_value'] = utf8_normalize_nfc(request_var('lang_default_value', $field_row['lang_default_value'], true)); // Field option... - if (isset($_REQUEST['field_option'])) + if (request::is_set('field_option')) { $field_option = request_var('field_option', ''); @@ -463,7 +463,7 @@ class acp_profile } else if ($field_type == FIELD_TEXT && $key == 'field_length') { - if (isset($_REQUEST['rows'])) + if (request::is_set('rows')) { $cp->vars['rows'] = request_var('rows', 0); $cp->vars['columns'] = request_var('columns', 0); @@ -487,16 +487,27 @@ class acp_profile $cp->vars['field_default_value_day'] = $now['mday']; $cp->vars['field_default_value_month'] = $now['mon']; $cp->vars['field_default_value_year'] = $now['year']; - $var = $_POST['field_default_value'] = 'now'; + + $var = 'now'; + /** + * @todo Do NOT overwrite a request variable. + */ + request::overwrite('field_default_value', $var, request::REQUEST); + request::overwrite('field_default_value', $var, request::POST); } else { - if (isset($_REQUEST['field_default_value_day'])) + if (request::is_set('field_default_value_day')) { $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0); $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); - $var = $_POST['field_default_value'] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); + $var = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); + /** + * @todo Do NOT overwrite a request variable. + */ + request::overwrite('field_default_value', $var, request::REQUEST); + request::overwrite('field_default_value', $var, request::POST); } else { @@ -622,7 +633,7 @@ class acp_profile } } - $step = (isset($_REQUEST['next'])) ? $step + 1 : ((isset($_REQUEST['prev'])) ? $step - 1 : $step); + $step = (request::is_set('next')) ? $step + 1 : ((request::is_set('prev')) ? $step - 1 : $step); if (sizeof($error)) { @@ -642,7 +653,7 @@ class acp_profile foreach ($key_ary as $key) { - if ($field_type == FIELD_TEXT && $key == 'field_length' && isset($_REQUEST['rows'])) + if ($field_type == FIELD_TEXT && $key == 'field_length' && request::is_set('rows')) { $cp->vars['rows'] = request_var('rows', 0); $cp->vars['columns'] = request_var('columns', 0); @@ -656,21 +667,21 @@ class acp_profile { $_new_key_ary[$key] = 'now'; } - else if (isset($_REQUEST['field_default_value_day'])) + else if (request::is_set('field_default_value_day')) { $cp->vars['field_default_value_day'] = request_var('field_default_value_day', 0); $cp->vars['field_default_value_month'] = request_var('field_default_value_month', 0); $cp->vars['field_default_value_year'] = request_var('field_default_value_year', 0); - $_new_key_ary[$key] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); + $_new_key_ary[$key] = sprintf('%2d-%2d-%4d', $cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']); } } - else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && isset($_REQUEST['l_lang_options'])) + else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && request::is_set('l_lang_options')) { $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true)); } else { - if (!isset($_REQUEST[$key])) + if (!request::is_set($key)) { $var = false; } @@ -680,7 +691,11 @@ class acp_profile } else { - $_new_key_ary[$key] = (is_array($_REQUEST[$key])) ? utf8_normalize_nfc(request_var($key, array(''), true)) : utf8_normalize_nfc(request_var($key, '', true)); + $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(''), true)); + if (!sizeof($_new_key_ary[$key])) + { + $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, '', true)); + } } } } diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php index a1e4620377..ba49efff1a 100644 --- a/phpBB/includes/acp/acp_prune.php +++ b/phpBB/includes/acp/acp_prune.php @@ -55,7 +55,7 @@ class acp_prune $all_forums = request_var('all_forums', 0); $forum_id = request_var('f', array(0)); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); if ($all_forums) { @@ -231,7 +231,7 @@ class acp_prune $user->add_lang('memberlist'); - $prune = (isset($_POST['prune'])) ? true : false; + $prune = request::is_set_post('prune'); if ($prune) { diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/includes/acp/acp_ranks.php index aa827d646c..08d6cf5c8c 100644 --- a/phpBB/includes/acp/acp_ranks.php +++ b/phpBB/includes/acp/acp_ranks.php @@ -31,8 +31,8 @@ class acp_ranks // Set up general vars $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; - $action = (isset($_POST['save'])) ? 'save' : $action; + $action = (request::is_set_post('add')) ? 'add' : $action; + $action = (request::is_set_post('save')) ? 'save' : $action; $rank_id = request_var('id', 0); $this->tpl_name = 'acp_ranks'; diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index c7706402be..a8d7c1f752 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -31,7 +31,7 @@ class acp_reasons // Set up general vars $action = request_var('action', ''); - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $reason_id = request_var('id', 0); $this->tpl_name = 'acp_reasons'; diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index a593afc648..6f38a95bff 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -52,7 +52,7 @@ class acp_search { global $db, $user, $auth, $template, $cache, $config; - $submit = (isset($_POST['submit'])) ? true : false; + $submit = request::is_set_post('submit'); $search_types = $this->get_search_types(); @@ -99,7 +99,7 @@ class acp_search unset($search); unset($error); - $cfg_array = (isset($_REQUEST['config'])) ? request_var('config', array('' => ''), true) : array(); + $cfg_array = request_var('config', array('' => ''), true); $updated = request_var('updated', false); foreach ($settings as $config_name => $var_type) @@ -228,9 +228,9 @@ class acp_search { global $db, $user, $auth, $template, $cache, $config; - if (isset($_REQUEST['action']) && is_array($_REQUEST['action'])) + $action = request_var('action', array('' => false)); + if (sizeof($action)) { - $action = request_var('action', array('' => false)); $action = key($action); } else @@ -239,7 +239,7 @@ class acp_search } $this->state = explode(',', $config['search_indexing_state']); - if (isset($_POST['cancel'])) + if (request::is_set_post('cancel')) { $action = ''; $this->state = array(); diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index b2389da3d4..03abe01dbc 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -50,7 +50,7 @@ class acp_styles $this->page_title = 'ACP_CAT_STYLES'; $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : $action; + $action = (request::is_set_post('add')) ? 'add' : $action; $style_id = request_var('id', 0); // Fill the configuration variables @@ -646,7 +646,7 @@ parse_css_file = {PARSE_CSS_FILE} $template_data = htmlspecialchars_decode($template_data); $template_file = utf8_normalize_nfc(request_var('template_file', '', true)); $text_rows = max(5, min(999, request_var('text_rows', 20))); - $save_changes = (isset($_POST['save'])) ? true : false; + $save_changes = request::is_set_post('save'); // make sure template_file path doesn't go upwards $template_file = str_replace('..', '.', $template_file); @@ -805,7 +805,7 @@ parse_css_file = {PARSE_CSS_FILE} $source = str_replace('/', '.', request_var('source', '')); $file_ary = array_diff(request_var('delete', array('')), array('')); - $submit = isset($_POST['submit']) ? true : false; + $submit = request::is_set_post('submit'); $sql = 'SELECT * FROM ' . STYLES_TEMPLATE_TABLE . " @@ -930,7 +930,7 @@ parse_css_file = {PARSE_CSS_FILE} $theme_data = htmlspecialchars_decode($theme_data); $theme_file = utf8_normalize_nfc(request_var('template_file', '', true)); $text_rows = max(5, min(999, request_var('text_rows', 20))); - $save_changes = (isset($_POST['save'])) ? true : false; + $save_changes = request::is_set_post('save'); // make sure theme_file path doesn't go upwards $theme_file = str_replace('..', '.', $theme_file); @@ -1111,7 +1111,7 @@ parse_css_file = {PARSE_CSS_FILE} $this->page_title = 'EDIT_IMAGESET'; - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); $imgname = request_var('imgname', ''); $imgpath = request_var('imgpath', ''); @@ -1172,7 +1172,7 @@ parse_css_file = {PARSE_CSS_FILE} } } - if ($update && isset($_POST['imgpath'])) + if ($update && request::is_set_post('imgpath')) { if ($valid_name) { @@ -1379,7 +1379,7 @@ parse_css_file = {PARSE_CSS_FILE} global $db, $template, $user, $cache, $config; $new_id = request_var('new_id', 0); - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); $sql_where = ''; switch ($mode) @@ -1514,7 +1514,7 @@ parse_css_file = {PARSE_CSS_FILE} { global $db, $template, $user, $cache, $config; - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); $inc_template = request_var('inc_template', 0); $inc_theme = request_var('inc_theme', 0); @@ -1911,7 +1911,7 @@ parse_css_file = {PARSE_CSS_FILE} { global $template, $db, $config, $user, $safe_mode, $cache; - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); $l_type = strtoupper($mode); $error = array(); @@ -2269,7 +2269,7 @@ parse_css_file = {PARSE_CSS_FILE} $element_ary = array('template' => STYLES_TEMPLATE_TABLE, 'theme' => STYLES_THEME_TABLE, 'imageset' => STYLES_IMAGESET_TABLE); $install_path = request_var('path', ''); - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); // Installing, obtain cfg file contents if ($install_path) @@ -2432,7 +2432,7 @@ parse_css_file = {PARSE_CSS_FILE} ); $basis = request_var('basis', 0); - $update = (isset($_POST['update'])) ? true : false; + $update = request::is_set_post('update'); if ($basis) { diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index aec2a58abd..395e07751d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -42,7 +42,7 @@ class acp_users $user_id = request_var('u', 0); $action = request_var('action', ''); - $submit = (isset($_POST['update']) && !isset($_POST['cancel'])) ? true : false; + $submit = (request::is_set_post('update') && !request::is_set_post('cancel')) ? true : false; $form_name = 'acp_users'; add_form_key($form_name); @@ -937,8 +937,8 @@ class acp_users // Set up general vars $start = request_var('start', 0); - $deletemark = (isset($_POST['delmarked'])) ? true : false; - $deleteall = (isset($_POST['delall'])) ? true : false; + $deletemark = request::is_set_post('delmarked'); + $deleteall = request::is_set_post('delall'); $marked = request_var('mark', array(0)); $message = utf8_normalize_nfc(request_var('message', '', true)); @@ -1474,7 +1474,7 @@ class acp_users // Generate users avatar $avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '<img src="' . PHPBB_ADMIN_PATH . 'images/no_avatar.gif" alt="" />'; - $display_gallery = (isset($_POST['display_gallery'])) ? true : false; + $display_gallery = request::is_set_post('display_gallery'); $avatar_select = basename(request_var('avatar_select', '')); $category = basename(request_var('category', '')); @@ -1551,7 +1551,7 @@ class acp_users $enable_urls = ($config['allow_sig_links']) ? ((request_var('disable_magic_url', false)) ? false : true) : false; $signature = utf8_normalize_nfc(request_var('signature', (string) $user_row['user_sig'], true)); - $preview = (isset($_POST['preview'])) ? true : false; + $preview = request::is_set_post('preview'); if ($submit || $preview) { @@ -1636,7 +1636,7 @@ class acp_users case 'attach': $start = request_var('start', 0); - $deletemark = (isset($_POST['delmarked'])) ? true : false; + $deletemark = request::is_set_post('delmarked'); $marked = request_var('mark', array(0)); // Sort keys diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/includes/acp/acp_words.php index 5db6bef3e5..1b3d78acaf 100644 --- a/phpBB/includes/acp/acp_words.php +++ b/phpBB/includes/acp/acp_words.php @@ -32,7 +32,7 @@ class acp_words // Set up general vars $action = request_var('action', ''); - $action = (isset($_POST['add'])) ? 'add' : ((isset($_POST['save'])) ? 'save' : $action); + $action = (request::is_set_post('add')) ? 'add' : ((request::is_set_post('save')) ? 'save' : $action); $s_hidden_fields = ''; $word_info = array(); |