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/acp | |
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/acp')
26 files changed, 291 insertions, 291 deletions
diff --git a/phpBB/modules/acp/acp_attachments.php b/phpBB/modules/acp/acp_attachments.php index c4642f9dad..3a456b18ca 100644 --- a/phpBB/modules/acp/acp_attachments.php +++ b/phpBB/modules/acp/acp_attachments.php @@ -31,7 +31,7 @@ class acp_attachments $user->add_lang(array('posting', 'viewtopic', 'acp/attachments')); $error = $notify = array(); - $submit = request::is_set_post('submit'); + $submit = phpbb_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 = (request::is_set('config')) ? request_var('config', array('' => '')) : $this->new_config; + $cfg_array = (phpbb_request::is_set('config')) ? request_var('config', array('' => '')) : $this->new_config; $error = array(); // We validate the complete config if whished @@ -274,7 +274,7 @@ class acp_attachments { $l_explain = (isset($user->lang[$vars['lang'] . '_EXPLAIN'])) ? $user->lang[$vars['lang'] . '_EXPLAIN'] : ''; } - + $content = build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars); if (empty($content)) { @@ -297,7 +297,7 @@ class acp_attachments case 'extensions': - if ($submit || request::is_set_post('add_extension_check')) + if ($submit || phpbb_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 = request::is_set_post('add_extension_check'); + $add = phpbb_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' => (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')) + 'GROUP_SELECT_OPTIONS' => (phpbb_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 = request::is_set_post('allow_in_pm'); + $allow_in_pm = phpbb_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 = request::is_set_post('allow_group'); + $allow_group = phpbb_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 = request::is_set_post('add'); + $action = phpbb_request::is_set_post('add'); switch ($action) { @@ -876,8 +876,8 @@ class acp_attachments if ($submit) { - $delete_files = array_keys(request::variable('delete', array('' => 0), false, request::POST)); - $add_files = array_keys(request::variable('add', array('' => 0), false, request::POST)); + $delete_files = array_keys(phpbb_request::variable('delete', array('' => 0), false, phpbb_request::POST)); + $add_files = array_keys(phpbb_request::variable('add', array('' => 0), false, phpbb_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 (request::is_set('securesubmit')) + if (phpbb_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 = (int) request::variable('ipexclude', false, false, request::POST); + $ip_exclude = (int) phpbb_request::variable('ipexclude', false, false, phpbb_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 (request::is_set_post('unsecuresubmit')) + else if (phpbb_request::is_set_post('unsecuresubmit')) { $unip_sql = request_var('unip', array(0)); diff --git a/phpBB/modules/acp/acp_ban.php b/phpBB/modules/acp/acp_ban.php index 8456c957a2..578ddd02d8 100644 --- a/phpBB/modules/acp/acp_ban.php +++ b/phpBB/modules/acp/acp_ban.php @@ -29,8 +29,8 @@ class acp_ban include(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); - $bansubmit = request::is_set_post('bansubmit'); - $unbansubmit = request::is_set_post('unbansubmit'); + $bansubmit = phpbb_request::is_set_post('bansubmit'); + $unbansubmit = phpbb_request::is_set_post('unbansubmit'); $current_time = time(); $user->add_lang(array('acp/ban', 'acp/users')); @@ -109,7 +109,7 @@ class acp_ban 'L_NO_BAN_CELL' => $l_no_ban_cell, 'S_USERNAME_BAN' => ($mode == 'user') ? true : false, - + 'U_ACTION' => $this->u_action, 'U_FIND_USERNAME' => append_sid('memberlist', 'mode=searchuser&form=acp_ban&field=ban'), )); diff --git a/phpBB/modules/acp/acp_board.php b/phpBB/modules/acp/acp_board.php index 46ad90e546..b428ef12d7 100644 --- a/phpBB/modules/acp/acp_board.php +++ b/phpBB/modules/acp/acp_board.php @@ -32,7 +32,7 @@ class acp_board $user->add_lang('acp/board'); $action = request_var('action', ''); - $submit = request::is_set_post('submit'); + $submit = phpbb_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 = (request::is_set('config')) ? utf8_normalize_nfc(request_var('config', array('' => ''), true)) : $this->new_config; + $cfg_array = (phpbb_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/modules/acp/acp_bots.php b/phpBB/modules/acp/acp_bots.php index 327b31968d..f067bcc32b 100644 --- a/phpBB/modules/acp/acp_bots.php +++ b/phpBB/modules/acp/acp_bots.php @@ -28,11 +28,11 @@ class acp_bots global $config, $db, $user, $auth, $template, $cache; $action = request_var('action', ''); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $mark = request_var('mark', array(0)); $bot_id = request_var('id', 0); - if (request::is_set_post('add')) + if (phpbb_request::is_set_post('add')) { $action = 'add'; } @@ -157,7 +157,7 @@ class acp_bots { $error[] = $user->lang['ERR_BOT_NO_MATCHES']; } - + if ($bot_row['bot_ip'] && !preg_match('#^[\d\.,:]+$#', $bot_row['bot_ip'])) { if (!$ip_list = gethostbynamel($bot_row['bot_ip'])) @@ -176,7 +176,7 @@ class acp_bots { $error[] = $user->lang['ERR_BOT_AGENT_MATCHES_UA']; } - + $bot_name = false; if ($bot_id) { @@ -201,7 +201,7 @@ class acp_bots { $error[] = $user->lang['BOT_NAME_TAKEN']; } - + if (!sizeof($error)) { // New bot? Create a new user and group entry @@ -219,7 +219,7 @@ class acp_bots { trigger_error($user->lang['NO_BOT_GROUP'] . adm_back_link($this->u_action . "&id=$bot_id&action=$action"), E_USER_WARNING); } - + $user_id = user_add(array( 'user_type' => (int) USER_IGNORE, @@ -233,7 +233,7 @@ class acp_bots 'user_style' => (int) $bot_row['bot_style'], 'user_allow_massemail' => 0, )); - + $sql = 'INSERT INTO ' . BOTS_TABLE . ' ' . $db->sql_build_array('INSERT', array( 'user_id' => (int) $user_id, 'bot_name' => (string) $bot_row['bot_name'], @@ -242,7 +242,7 @@ class acp_bots 'bot_ip' => (string) $bot_row['bot_ip']) ); $db->sql_query($sql); - + $log = 'ADDED'; } else if ($bot_id) @@ -289,12 +289,12 @@ class acp_bots $log = 'UPDATED'; } - + $cache->destroy('_bots'); - + add_log('admin', 'LOG_BOT_' . $log, $bot_row['bot_name']); trigger_error($user->lang['BOT_' . $log] . adm_back_link($this->u_action)); - + } } else if ($bot_id) @@ -335,11 +335,11 @@ class acp_bots 'U_ACTION' => $this->u_action . "&id=$bot_id&action=$action", 'U_BACK' => $this->u_action, 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', - + 'BOT_NAME' => $bot_row['bot_name'], 'BOT_IP' => $bot_row['bot_ip'], 'BOT_AGENT' => $bot_row['bot_agent'], - + 'S_EDIT_BOT' => true, 'S_ACTIVE_OPTIONS' => $s_active_options, 'S_STYLE_OPTIONS' => $style_select, @@ -389,7 +389,7 @@ class acp_bots } $db->sql_freeresult($result); } - + /** * Validate bot name against username table */ @@ -409,7 +409,7 @@ class acp_bots $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - + return ($row) ? false : true; } } diff --git a/phpBB/modules/acp/acp_captcha.php b/phpBB/modules/acp/acp_captcha.php index dbc18e59bc..c45b6e8c36 100644 --- a/phpBB/modules/acp/acp_captcha.php +++ b/phpBB/modules/acp/acp_captcha.php @@ -34,13 +34,13 @@ class acp_captcha $selected = request_var('select_captcha', $config['captcha_plugin']); $configure = request_var('configure', false); - + // Oh, they are just here for the view - if (request::is_set('captcha_demo', request::GET)) + if (phpbb_request::is_set('captcha_demo', phpbb_request::GET)) { $this->deliver_demo($selected); } - + // Delegate if ($configure) { @@ -106,7 +106,7 @@ class acp_captcha } $demo_captcha = phpbb_captcha_factory::get_instance($selected); - + foreach ($config_vars as $config_var => $template_var) { $template->assign_var($template_var, request_var($config_var, $config[$config_var])) ; @@ -117,28 +117,28 @@ class acp_captcha 'CAPTCHA_SELECT' => $captcha_select, )); } - + } } - - + + /** * Entry point for delivering image CAPTCHAs in the ACP. */ function deliver_demo($selected) { global $db, $user, $config; - + $captcha = phpbb_captcha_factory::get_instance($selected); $captcha->init(CONFIRM_REG); $captcha->execute_demo(); garbage_collection(); exit_handler(); } - - - - + + + + } ?>
\ No newline at end of file diff --git a/phpBB/modules/acp/acp_database.php b/phpBB/modules/acp/acp_database.php index b8115f5ed1..9261998d80 100644 --- a/phpBB/modules/acp/acp_database.php +++ b/phpBB/modules/acp/acp_database.php @@ -26,14 +26,14 @@ class acp_database function main($id, $mode) { global $cache, $db, $user, $auth, $template, $table_prefix, $config; - + $user->add_lang('acp/database'); $this->tpl_name = 'acp_database'; $this->page_title = 'ACP_DATABASE'; $action = request_var('action', ''); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $template->assign_vars(array( 'MODE' => $mode @@ -187,7 +187,7 @@ class acp_database $template->assign_vars(array( 'U_ACTION' => $this->u_action . '&action=download' )); - + $available_methods = array('gzip' => 'zlib', 'bzip2' => 'bz2'); foreach ($available_methods as $type => $module) @@ -506,7 +506,7 @@ class base_extractor header('Pragma: no-cache'); header("Content-Type: $mimetype; name=\"$name\""); header("Content-disposition: attachment; filename=$name"); - + switch ($format) { case 'bzip2': @@ -525,13 +525,13 @@ class base_extractor break; } } - + if ($store == true) { $file = PHPBB_ROOT_PATH . 'store/' . $filename . $ext; - + $this->fp = $open($file, 'w'); - + if (!$this->fp) { trigger_error('Unable to write temporary file to storage folder', E_USER_ERROR); @@ -647,11 +647,11 @@ class mysql_extractor extends base_extractor if ($result != false) { $fields_cnt = mysqli_num_fields($result); - + // Get field information $field = mysqli_fetch_fields($result); $field_set = array(); - + for ($j = 0; $j < $fields_cnt; $j++) { $field_set[] = $field[$j]->name; @@ -664,7 +664,7 @@ class mysql_extractor extends base_extractor $first_set = true; $query_len = 0; $max_len = get_usable_memory(); - + while ($row = mysqli_fetch_row($result)) { $values = array(); @@ -735,7 +735,7 @@ class mysql_extractor extends base_extractor $field[] = mysql_fetch_field($result, $i); } $field_set = array(); - + for ($j = 0; $j < $fields_cnt; $j++) { $field_set[] = $field[$j]->name; @@ -844,7 +844,7 @@ class sqlite_extractor extends base_extractor $ar[] = $row; } $db->sql_freeresult($result); - + foreach ($ar as $value) { if (strpos($value['name'], 'autoindex') !== false) @@ -1002,7 +1002,7 @@ class postgres_extractor extends base_extractor $sql_data .= "CREATE SEQUENCE {$table_name}_seq;\n"; } $db->sql_freeresult($result); - + $field_query = "SELECT a.attnum, a.attname as field, t.typname as type, a.attlen as length, a.atttypmod as lengthvar, a.attnotnull as notnull FROM pg_class c, pg_attribute a, pg_type t WHERE c.relname = '" . $db->sql_escape($table_name) . "' @@ -1066,7 +1066,7 @@ class postgres_extractor extends base_extractor { $line .= ' NOT NULL'; } - + $lines[] = $line; } $db->sql_freeresult($result); @@ -1266,33 +1266,33 @@ class mssql_extractor extends base_extractor $sql_data .= "GO\n"; $sql_data .= "\nCREATE TABLE [$table_name] (\n"; $rows = array(); - + $text_flag = false; - + $sql = "SELECT COLUMN_NAME, COLUMN_DEFAULT, IS_NULLABLE, DATA_TYPE, CHARACTER_MAXIMUM_LENGTH, COLUMNPROPERTY(object_id(TABLE_NAME), COLUMN_NAME, 'IsIdentity') as IS_IDENTITY FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '$table_name'"; $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { $line = "\t[{$row['COLUMN_NAME']}] [{$row['DATA_TYPE']}]"; - + if ($row['DATA_TYPE'] == 'text') { $text_flag = true; } - + if ($row['IS_IDENTITY']) { $line .= ' IDENTITY (1 , 1)'; } - + if ($row['CHARACTER_MAXIMUM_LENGTH'] && $row['DATA_TYPE'] !== 'text') { $line .= ' (' . $row['CHARACTER_MAXIMUM_LENGTH'] . ')'; } - + if ($row['IS_NULLABLE'] == 'YES') { $line .= ' NULL'; @@ -1301,27 +1301,27 @@ class mssql_extractor extends base_extractor { $line .= ' NOT NULL'; } - + if ($row['COLUMN_DEFAULT']) { $line .= ' DEFAULT ' . $row['COLUMN_DEFAULT']; } - + $rows[] = $line; } $db->sql_freeresult($result); - + $sql_data .= implode(",\n", $rows); $sql_data .= "\n) ON [PRIMARY]"; - + if ($text_flag) { $sql_data .= " TEXTIMAGE_ON [PRIMARY]"; } - + $sql_data .= "\nGO\n\n"; $rows = array(); - + $sql = "SELECT CONSTRAINT_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE TABLE_NAME = '$table_name'"; @@ -1341,7 +1341,7 @@ class mssql_extractor extends base_extractor $sql_data .= "\n\t) ON [PRIMARY] \nGO\n"; } $db->sql_freeresult($result); - + $index = array(); $sql = "EXEC sp_statistics '$table_name'"; $result = $db->sql_query($sql); @@ -1353,12 +1353,12 @@ class mssql_extractor extends base_extractor } } $db->sql_freeresult($result); - + foreach ($index as $index_name => $column_name) { $index[$index_name] = implode(', ', $column_name); } - + foreach ($index as $index_name => $columns) { $sql_data .= "\nCREATE INDEX [$index_name] ON [$table_name]($columns) ON [PRIMARY]\nGO\n"; @@ -1391,7 +1391,7 @@ class mssql_extractor extends base_extractor $ary_type = $ary_name = array(); $ident_set = false; $sql_data = ''; - + // Grab all of the data from current table. $sql = "SELECT * FROM $table_name"; @@ -1485,7 +1485,7 @@ class mssql_extractor extends base_extractor $ary_type = $ary_name = array(); $ident_set = false; $sql_data = ''; - + // Grab all of the data from current table. $sql = "SELECT * FROM $table_name"; @@ -1604,7 +1604,7 @@ class db2_extractor extends base_extractor FROM syscat.columns WHERE tabname = '$table_name'"; $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { $line = "\t{$row['colname']} {$row['typename']}"; @@ -1613,12 +1613,12 @@ class db2_extractor extends base_extractor { $line .= ' GENERATED BY DEFAULT AS IDENTITY (START WITH 1, INCREMENT BY 1)'; } - + if ($row['typename'] == 'VARCHAR' || $row['typename'] == 'CHARACTER' || $row['typename'] == 'CLOB') { $line .= ' (' . $row['length'] . ')'; } - + if ($row['nulls'] == 'N') { $line .= ' NOT NULL'; @@ -1632,7 +1632,7 @@ class db2_extractor extends base_extractor { $line .= ' DEFAULT ' . $row['default']; } - + $rows[] = $line; } $db->sql_freeresult($result); @@ -1871,7 +1871,7 @@ class oracle_extractor extends base_extractor { global $db; $ary_type = $ary_name = array(); - + // Grab all of the data from current table. $sql = "SELECT * FROM $table_name"; @@ -1967,7 +1967,7 @@ class firebird_extractor extends base_extractor { global $db; $ary_type = $ary_name = array(); - + // Grab all of the data from current table. $sql = "SELECT * FROM $table_name"; @@ -2296,7 +2296,7 @@ function fgetd(&$fp, $delim, $read, $seek, $eof, $buffer = 8192) { $record = ''; $delim_len = strlen($delim); - + while (!$eof($fp)) { $pos = strpos($record, $delim); diff --git a/phpBB/modules/acp/acp_disallow.php b/phpBB/modules/acp/acp_disallow.php index ec124b043f..774fef67fc 100644 --- a/phpBB/modules/acp/acp_disallow.php +++ b/phpBB/modules/acp/acp_disallow.php @@ -38,8 +38,8 @@ class acp_disallow $form_key = 'acp_disallow'; add_form_key($form_key); - $disallow = request::is_set_post('disallow'); - $allow = request::is_set_post('allow'); + $disallow = phpbb_request::is_set_post('disallow'); + $allow = phpbb_request::is_set_post('allow'); if (($allow || $disallow) && !check_form_key($form_key)) { diff --git a/phpBB/modules/acp/acp_email.php b/phpBB/modules/acp/acp_email.php index 1e39049eca..25ce68c75a 100644 --- a/phpBB/modules/acp/acp_email.php +++ b/phpBB/modules/acp/acp_email.php @@ -35,7 +35,7 @@ class acp_email add_form_key($form_key); // Set some vars - $submit = request::is_set_post('submit'); + $submit = phpbb_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 = request::is_set_post('send_immediately'); + $use_queue = phpbb_request::is_set_post('send_immediately'); $priority = request_var('mail_priority_flag', MAIL_NORMAL_PRIORITY); if (!check_form_key($form_key)) @@ -107,7 +107,7 @@ class acp_email $db->sql_freeresult($result); trigger_error($user->lang['NO_USER'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $i = $j = 0; // Send with BCC, no more than 50 recipients for one mail (to not exceed the limit) @@ -172,7 +172,7 @@ class acp_email $messenger->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); $messenger->headers('X-AntiAbuse: Username - ' . $user->data['username']); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); - + $messenger->subject(htmlspecialchars_decode($subject)); $messenger->set_mail_priority($priority); @@ -180,7 +180,7 @@ class acp_email 'CONTACT_EMAIL' => $config['board_contact'], 'MESSAGE' => htmlspecialchars_decode($message)) ); - + if (!($messenger->send($used_method))) { $errored = true; @@ -238,7 +238,7 @@ class acp_email $select_list = '<option value="0"' . ((!$group_id) ? ' selected="selected"' : '') . '>' . $user->lang['ALL_USERS'] . '</option>'; $select_list .= group_select_options($group_id, $exclude); - + $s_priority_options = '<option value="' . MAIL_LOW_PRIORITY . '">' . $user->lang['MAIL_LOW_PRIORITY'] . '</option>'; $s_priority_options .= '<option value="' . MAIL_NORMAL_PRIORITY . '" selected="selected">' . $user->lang['MAIL_NORMAL_PRIORITY'] . '</option>'; $s_priority_options .= '<option value="' . MAIL_HIGH_PRIORITY . '">' . $user->lang['MAIL_HIGH_PRIORITY'] . '</option>'; diff --git a/phpBB/modules/acp/acp_forums.php b/phpBB/modules/acp/acp_forums.php index 37453f2f34..303080a5e0 100644 --- a/phpBB/modules/acp/acp_forums.php +++ b/phpBB/modules/acp/acp_forums.php @@ -36,7 +36,7 @@ class acp_forums add_form_key($form_key); $action = request_var('action', ''); - $update = request::is_set_post('update'); + $update = phpbb_request::is_set_post('update'); $forum_id = request_var('f', 0); $this->parent_id = request_var('parent_id', 0); diff --git a/phpBB/modules/acp/acp_groups.php b/phpBB/modules/acp/acp_groups.php index 654fd62553..5af7578665 100644 --- a/phpBB/modules/acp/acp_groups.php +++ b/phpBB/modules/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 = (request::is_set_post('add')) ? 'add' : ((request::is_set_post('addusers')) ? 'addusers' : request_var('action', '')); + $action = (phpbb_request::is_set_post('add')) ? 'add' : ((phpbb_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 = request::is_set_post('update'); + $update = phpbb_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' => request::is_set('group_receive_pm') ? 1 : 0, - 'legend' => request::is_set('group_legend') ? 1 : 0, + 'receive_pm' => phpbb_request::is_set('group_receive_pm') ? 1 : 0, + 'legend' => phpbb_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'] = request::is_set('group_founder_manage') ? 1 : 0; + $submit_ary['founder_manage'] = phpbb_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 = request::is_set_post('display_gallery'); + $display_gallery = phpbb_request::is_set_post('display_gallery'); if ($config['allow_avatar_local'] && $display_gallery) { diff --git a/phpBB/modules/acp/acp_icons.php b/phpBB/modules/acp/acp_icons.php index 6d2c8ad6f1..1da9bc0910 100644 --- a/phpBB/modules/acp/acp_icons.php +++ b/phpBB/modules/acp/acp_icons.php @@ -32,9 +32,9 @@ class acp_icons // Set up general vars $action = request_var('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; + $action = (phpbb_request::is_set_post('add')) ? 'add' : $action; + $action = (phpbb_request::is_set_post('edit')) ? 'edit' : $action; + $action = (phpbb_request::is_set_post('import')) ? 'import' : $action; $icon_id = request_var('id', 0); $mode = ($mode == 'smilies') ? 'smilies' : 'icons'; @@ -167,19 +167,19 @@ class acp_icons } } } - + $sql = "SELECT * FROM $table ORDER BY {$fields}_order " . (($icon_id || $action == 'add') ? 'DESC' : 'ASC'); $result = $db->sql_query($sql); - + $data = array(); $after = false; $display = 0; $order_lists = array('', ''); $add_order_lists = array('', ''); $display_count = 0; - + while ($row = $db->sql_fetchrow($result)) { if ($action == 'add') @@ -233,12 +233,12 @@ class acp_icons $colspan = (($mode == 'smilies') ? '7' : '5'); $colspan += ($icon_id) ? 1 : 0; $colspan += ($action == 'add') ? 2 : 0; - + $template->assign_vars(array( 'S_EDIT' => true, 'S_SMILIES' => ($mode == 'smilies') ? true : false, 'S_ADD' => ($action == 'add') ? true : false, - + 'S_ORDER_LIST_DISPLAY' => $order_list . $order_lists[1], 'S_ORDER_LIST_UNDISPLAY' => $order_list . $order_lists[0], 'S_ORDER_LIST_DISPLAY_COUNT' => $display_count + 1, @@ -285,10 +285,10 @@ class acp_icons 'S_ADD_CODE' => true, 'S_IMG_OPTIONS' => $smiley_options, - + 'S_ADD_ORDER_LIST_DISPLAY' => $add_order_list . $add_order_lists[1], 'S_ADD_ORDER_LIST_UNDISPLAY' => $add_order_list . $add_order_lists[0], - + 'IMG_SRC' => PHPBB_ROOT_PATH . $img_path . '/' . $default_row['smiley_url'], 'IMG_PATH' => $img_path, 'PHPBB_ROOT_PATH' => PHPBB_ROOT_PATH, @@ -302,27 +302,27 @@ class acp_icons } return; - + break; case 'create': case 'modify': // Get items to create/modify - $images = array_keys(request::variable('image', array('' => 0), false, request::POST)); - + $images = array_keys(phpbb_request::variable('image', array('' => 0), false, phpbb_request::POST)); + // Now really get the items - $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_id = phpbb_request::variable('id', array('' => 0), false, phpbb_request::POST); + $image_order = phpbb_request::variable('order', array('' => 0), false, phpbb_request::POST); + $image_width = phpbb_request::variable('width', array('' => 0), false, phpbb_request::POST); + $image_height = phpbb_request::variable('height', array('' => 0), false, phpbb_request::POST); + $image_add = phpbb_request::variable('add_img', array('' => 0), false, phpbb_request::POST); + $image_display_on_posting = phpbb_request::variable('display_on_posting', array('' => 0), false, phpbb_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 (request::variable('add_additional_code', false, false, request::POST)) + if (phpbb_request::variable('add_additional_code', false, false, phpbb_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 (request::variable('add_display_on_posting', false, false, request::POST)) + if (phpbb_request::variable('add_display_on_posting', false, false, phpbb_request::POST)) { $image_display_on_posting[$add_image] = 1; } @@ -425,13 +425,13 @@ class acp_icons $db->sql_query($sql); $icons_updated++; } - + } } - + $cache->destroy('_icons'); $cache->destroy('sql', $table); - + $level = E_USER_NOTICE; switch ($icons_updated) { @@ -439,11 +439,11 @@ class acp_icons $suc_lang = "{$lang}_NONE"; $level = E_USER_WARNING; break; - + case 1: $suc_lang = "{$lang}_ONE"; break; - + default: $suc_lang = $lang; } diff --git a/phpBB/modules/acp/acp_inactive.php b/phpBB/modules/acp/acp_inactive.php index 52c7de217f..369dc38d78 100644 --- a/phpBB/modules/acp/acp_inactive.php +++ b/phpBB/modules/acp/acp_inactive.php @@ -40,7 +40,7 @@ class acp_inactive $action = request_var('action', ''); $mark = request_var('mark', array(0)); $start = request_var('start', 0); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); // Sort keys $sort_days = request_var('st', 0); @@ -66,7 +66,7 @@ class acp_inactive FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark); $result = $db->sql_query($sql); - + $user_affected = array(); while ($row = $db->sql_fetchrow($result)) { @@ -196,7 +196,7 @@ class acp_inactive unset($usernames); } $db->sql_freeresult($result); - + break; } } @@ -246,7 +246,7 @@ class acp_inactive 'S_SORT_DIR' => $s_sort_dir, 'S_ON_PAGE' => on_page($inactive_count, $config['topics_per_page'], $start), 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param", $inactive_count, $config['topics_per_page'], $start, true), - + 'U_ACTION' => $this->u_action . '&start=' . $start, )); diff --git a/phpBB/modules/acp/acp_jabber.php b/phpBB/modules/acp/acp_jabber.php index 48ad5c5986..cb8a6a3a83 100644 --- a/phpBB/modules/acp/acp_jabber.php +++ b/phpBB/modules/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 = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); if ($mode != 'settings') { diff --git a/phpBB/modules/acp/acp_language.php b/phpBB/modules/acp/acp_language.php index 28de0452d0..cdc8a798e1 100644 --- a/phpBB/modules/acp/acp_language.php +++ b/phpBB/modules/acp/acp_language.php @@ -39,7 +39,7 @@ class acp_language * inside the request class. Reducing some of the redundance of this code would certainly * not hurt either. */ - request::enable_super_globals(); + phpbb_request::enable_super_globals(); include_once(PHPBB_ROOT_PATH . 'includes/functions_user.' . PHP_EXT); @@ -47,27 +47,27 @@ class acp_language // Check and set some common vars - $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; + $action = (phpbb_request::is_set_post('update_details')) ? 'update_details' : ''; + $action = (phpbb_request::is_set_post('download_file')) ? 'download_file' : $action; + $action = (phpbb_request::is_set_post('upload_file')) ? 'upload_file' : $action; + $action = (phpbb_request::is_set_post('upload_data')) ? 'upload_data' : $action; + $action = (phpbb_request::is_set_post('submit_file')) ? 'submit_file' : $action; + $action = (phpbb_request::is_set_post('remove_store')) ? 'details' : $action; - $submit = (empty($action) && !request::is_set_post('update') && !request::is_set_post('test_connection')) ? false : true; + $submit = (empty($action) && !phpbb_request::is_set_post('update') && !phpbb_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 (request::is_set_post('missing_file')) + if (phpbb_request::is_set_post('missing_file')) { $missing_file = request_var('missing_file', array('' => 0)); /** * @todo Do NOT overwrite a request variable. */ - request::overwrite('language_file', key($missing_file)); + phpbb_request::overwrite('language_file', key($missing_file)); } $selected_lang_file = request_var('language_file', '|common.' . PHP_EXT); @@ -141,7 +141,7 @@ class acp_language ); /** - * @todo Do not use $_POST here, but request::variable which needs to support more dimensions + * @todo Do not use $_POST here, but phpbb_request::variable which needs to support more dimensions */ $hidden_data .= build_hidden_fields(array('entry' => $_POST['entry']), true, STRIP); @@ -194,7 +194,7 @@ class acp_language case 'submit_file': case 'download_file': case 'upload_data': - + if (!$submit || !check_form_key($form_name)) { trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); @@ -274,16 +274,16 @@ class acp_language if (!$safe_mode) { $mkdir_ary = array('language', 'language/' . $row['lang_iso']); - + if ($this->language_directory) { $mkdir_ary[] = 'language/' . $row['lang_iso'] . '/' . $this->language_directory; } - + foreach ($mkdir_ary as $dir) { $dir = PHPBB_ROOT_PATH . 'store/' . $dir; - + if (!is_dir($dir)) { if (!@mkdir($dir, 0777)) @@ -329,7 +329,7 @@ class acp_language } $entry = "\tarray(\n"; - + foreach ($value as $_key => $_value) { $entry .= "\t\t" . (int) $_key . "\t=> '" . $this->prepare_lang_entry($_value) . "',\n"; @@ -446,7 +446,7 @@ class acp_language { trigger_error($user->lang['NO_LANG_ID'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $this->page_title = 'LANGUAGE_PACK_DETAILS'; $sql = 'SELECT * @@ -455,7 +455,7 @@ class acp_language $result = $db->sql_query($sql); $lang_entries = $db->sql_fetchrow($result); $db->sql_freeresult($result); - + $lang_iso = $lang_entries['lang_iso']; $missing_vars = $missing_files = array(); @@ -501,8 +501,8 @@ class acp_language trigger_error($user->lang['WRONG_LANGUAGE_FILE'] . adm_back_link($this->u_action . '&action=details&id=' . $lang_id), E_USER_WARNING); } } - - if (request::is_set_post('remove_store')) + + if (phpbb_request::is_set_post('remove_store')) { $store_filename = $this->get_filename($lang_iso, $this->language_directory, $this->language_file, true, true); @@ -545,7 +545,7 @@ class acp_language if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, '', $file))) { $missing_vars[$file] = $this->compare_language_files($config['default_lang'], $lang_iso, '', $file); - + if (sizeof($missing_vars[$file])) { $is_missing_var = true; @@ -563,7 +563,7 @@ class acp_language if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, 'acp', $file))) { $missing_vars['acp/' . $file] = $this->compare_language_files($config['default_lang'], $lang_iso, 'acp', $file); - + if (sizeof($missing_vars['acp/' . $file])) { $is_missing_var = true; @@ -582,7 +582,7 @@ class acp_language if (file_exists(PHPBB_ROOT_PATH . $this->get_filename($lang_iso, 'mods', $file))) { $missing_vars['mods/' . $file] = $this->compare_language_files($config['default_lang'], $lang_iso, 'mods', $file); - + if (sizeof($missing_vars['mods/' . $file])) { $is_missing_var = true; @@ -594,7 +594,7 @@ class acp_language } } } - + // More missing files... for example email templates? foreach ($email_files as $file) { @@ -1059,7 +1059,7 @@ class acp_language $compress->add_data('', 'language/' . $row['lang_iso'] . '/index.html'); $compress->add_data('', 'language/' . $row['lang_iso'] . '/email/index.html'); $compress->add_data('', 'language/' . $row['lang_iso'] . '/acp/index.html'); - + if (sizeof($mod_files)) { $compress->add_data('', 'language/' . $row['lang_iso'] . '/mods/index.html'); @@ -1219,7 +1219,7 @@ $lang = array_merge($lang, array( function get_filename($lang_iso, $directory, $filename, $check_store = false, $only_return_filename = false) { global $safe_mode; - + $check_filename = "language/$lang_iso/" . (($directory) ? $directory . '/' : '') . $filename; if ($check_store) diff --git a/phpBB/modules/acp/acp_logs.php b/phpBB/modules/acp/acp_logs.php index 204b2d4935..0b2ec76271 100644 --- a/phpBB/modules/acp/acp_logs.php +++ b/phpBB/modules/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 = request::variable('delmarked', false, false, request::POST); - $deleteall = request::variable('delall', false, false, request::POST); + $deletemark = phpbb_request::variable('delmarked', false, false, phpbb_request::POST); + $deleteall = phpbb_request::variable('delall', false, false, phpbb_request::POST); $marked = request_var('mark', array(0)); // Sort keys @@ -112,7 +112,7 @@ class acp_logs if ($mode == 'mod') { $forum_box = '<option value="0">' . $user->lang['ALL_FORUMS'] . '</option>' . make_forum_select($forum_id); - + $template->assign_vars(array( 'S_SHOW_FORUMS' => true, 'S_FORUM_BOX' => $forum_box) @@ -142,7 +142,7 @@ class acp_logs foreach ($log_data as $row) { $data = array(); - + $checks = array('viewtopic', 'viewlogs', 'viewforum'); foreach ($checks as $check) { diff --git a/phpBB/modules/acp/acp_modules.php b/phpBB/modules/acp/acp_modules.php index eb36916344..093216c330 100644 --- a/phpBB/modules/acp/acp_modules.php +++ b/phpBB/modules/acp/acp_modules.php @@ -116,7 +116,7 @@ class acp_modules } break; - + case 'enable': case 'disable': if (!$module_id) @@ -175,7 +175,7 @@ class acp_modules add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname']), $move_module_name); $this->remove_cache_file(); } - + break; case 'quickadd': @@ -212,7 +212,7 @@ class acp_modules if (!sizeof($errors)) { $this->remove_cache_file(); - + trigger_error($user->lang['MODULE_ADDED'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); } } @@ -236,7 +236,7 @@ class acp_modules { trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } - + $module_row = $this->get_module_row($module_id); // no break @@ -255,7 +255,7 @@ class acp_modules 'module_auth' => '', ); } - + $module_data = array(); $module_data['module_basename'] = request_var('module_basename', (string) $module_row['module_basename']); @@ -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 = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); if ($submit) { @@ -300,7 +300,7 @@ class acp_modules if (!sizeof($errors)) { $this->remove_cache_file(); - + trigger_error((($action == 'add') ? $user->lang['MODULE_ADDED'] : $user->lang['MODULE_EDITED']) . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); } } @@ -332,7 +332,7 @@ class acp_modules { $s_mode_options .= '<option value="' . $m_mode . '"' . (($m_mode == $module_data['module_mode']) ? ' selected="selected"' : '') . '>' . $this->lang_name($m_values['title']) . '</option>'; } - + $template->assign_block_vars('m_names.modes', array( 'OPTION' => $m_mode, 'VALUE' => $this->lang_name($m_values['title']), @@ -341,7 +341,7 @@ class acp_modules ); } } - + $s_cat_option = '<option value="0"' . (($module_data['parent_id'] == 0) ? ' selected="selected"' : '') . '>' . $user->lang['NO_PARENT'] . '</option>'; $template->assign_vars(array_merge(array( @@ -354,7 +354,7 @@ class acp_modules 'U_EDIT_ACTION' => $this->u_action . '&parent_id=' . $this->parent_id, 'L_TITLE' => $user->lang[strtoupper($action) . '_MODULE'], - + 'MODULENAME' => $this->lang_name($module_data['module_langname']), 'ACTION' => $action, 'MODULE_ID' => $module_id, @@ -521,7 +521,7 @@ class acp_modules $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - + if (!$row) { trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); @@ -529,7 +529,7 @@ class acp_modules return $row; } - + /** * Get available module information from module files */ @@ -592,7 +592,7 @@ class acp_modules $fileinfo[str_replace($module_class . '_', '', $module_info['filename'])] = $module_info; } } - + return $fileinfo; } @@ -724,7 +724,7 @@ class acp_modules // Sanitise for future path use, it's escaped as appropriate for queries $p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class)); - + $cache->destroy('_modules_' . $p_class); // Additionally remove sql cache diff --git a/phpBB/modules/acp/acp_permission_roles.php b/phpBB/modules/acp/acp_permission_roles.php index 0ca445338b..90ed532874 100644 --- a/phpBB/modules/acp/acp_permission_roles.php +++ b/phpBB/modules/acp/acp_permission_roles.php @@ -37,10 +37,10 @@ class acp_permission_roles $this->tpl_name = 'acp_permission_roles'; - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $role_id = request_var('role_id', 0); $action = request_var('action', ''); - $action = (request::is_set_post('add')) ? 'add' : $action; + $action = (phpbb_request::is_set_post('add')) ? 'add' : $action; $form_name = 'acp_permissions'; add_form_key($form_name); @@ -277,7 +277,7 @@ class acp_permission_roles { trigger_error($user->lang['NO_ROLE_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $sql = 'SELECT * FROM ' . ACL_ROLES_TABLE . ' WHERE role_id = ' . $role_id; diff --git a/phpBB/modules/acp/acp_permissions.php b/phpBB/modules/acp/acp_permissions.php index 3512824d0c..51785a386c 100644 --- a/phpBB/modules/acp/acp_permissions.php +++ b/phpBB/modules/acp/acp_permissions.php @@ -23,7 +23,7 @@ class acp_permissions { var $u_action; var $permission_dropdown; - + function main($id, $mode) { global $db, $user, $auth, $template, $cache, $config; @@ -59,7 +59,7 @@ class acp_permissions // Set some vars $action = request_var('action', array('' => 0)); $action = key($action); - $action = (request::is_set_post('psubmit')) ? 'apply_permissions' : $action; + $action = (phpbb_request::is_set_post('psubmit')) ? 'apply_permissions' : $action; $all_forums = request_var('all_forums', 0); $subforum_id = request_var('subforum_id', 0); @@ -93,7 +93,7 @@ class acp_permissions } $db->sql_freeresult($result); } - + // Map usernames to ids and vice versa if ($usernames) { @@ -111,7 +111,7 @@ class acp_permissions } } unset($username); - + // Build forum ids (of all forums are checked or subforum listing used) if ($all_forums) { @@ -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 = request::is_set_post('all_users'); - $all_groups = request::is_set_post('all_groups'); + $all_users = phpbb_request::is_set_post('all_users'); + $all_groups = phpbb_request::is_set_post('all_groups'); if ($all_users || $all_groups) { @@ -257,7 +257,7 @@ class acp_permissions break; case 'apply_permissions': - if (!request::is_set_post('setting')) + if (!phpbb_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 (!request::is_set_post('setting')) + if (!phpbb_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 = request::is_set_post('all_users'); - $all_groups = request::is_set_post('all_groups'); + $all_users = phpbb_request::is_set_post('all_users'); + $all_groups = phpbb_request::is_set_post('all_groups'); if ((sizeof($user_id) && !$all_users) || (sizeof($group_id) && !$all_groups)) { @@ -527,7 +527,7 @@ class acp_permissions } continue; } - + if ($branch_there) { $s_options .= ' [' . $user->lang['PLUS_SUBFORUMS'] . ']'; @@ -538,14 +538,14 @@ class acp_permissions return $s_options; } - + /** * Build dropdown field for changing permission types */ function build_permission_dropdown($options, $default_option, $permission_scope) { global $user, $auth; - + $s_dropdown_options = ''; foreach ($options as $setting) { @@ -625,21 +625,21 @@ class acp_permissions { trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $ug_id = $forum_id = 0; // We loop through the auth settings defined in our submit list($ug_id, ) = each($psubmit); list($forum_id, ) = each($psubmit[$ug_id]); - $auth_settings = request::variable('setting', array(0 => array(0 => array('' => 0))), false, request::POST); + $auth_settings = phpbb_request::variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_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); } // Do we have a role we want to set? - $assigned_role = request::variable(array('role', $ug_id, $forum_id), 0, false, request::POST)); + $assigned_role = phpbb_request::variable(array('role', $ug_id, $forum_id), 0, false, phpbb_request::POST)); // Do the admin want to set these permissions to other items too? $inherit = request_var('inherit', array(0 => array(0))); @@ -709,8 +709,8 @@ class acp_permissions trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } - $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); + $auth_settings = phpbb_request::variable('setting', array(0 => array(0 => array('' => 0))), false, phpbb_request::POST); + $auth_roles = phpbb_request::variable('role', array(0 => array(0 => 0)), false, phpbb_request::POST); $ug_ids = $forum_ids = array(); // We need to go through the auth settings @@ -802,7 +802,7 @@ class acp_permissions function remove_permissions($mode, $permission_type, &$auth_admin, &$user_id, &$group_id, &$forum_id) { global $user, $db, $auth; - + // User or group to be set? $ug_type = (sizeof($user_id)) ? 'user' : 'group'; diff --git a/phpBB/modules/acp/acp_profile.php b/phpBB/modules/acp/acp_profile.php index 4143b70434..629ac34e43 100644 --- a/phpBB/modules/acp/acp_profile.php +++ b/phpBB/modules/acp/acp_profile.php @@ -38,7 +38,7 @@ class acp_profile $this->tpl_name = 'acp_profile'; $this->page_title = 'ACP_CUSTOM_PROFILE_FIELDS'; - $action = (request::is_set_post('create')) ? 'create' : request_var('action', ''); + $action = (phpbb_request::is_set_post('create')) ? 'create' : request_var('action', ''); $error = array(); $s_hidden_fields = ''; @@ -76,7 +76,7 @@ class acp_profile FROM ' . PROFILE_LANG_TABLE . ' ORDER BY lang_id'; $result = $db->sql_query($sql); - + while ($row = $db->sql_fetchrow($result)) { // Which languages are available for each item @@ -204,7 +204,7 @@ class acp_profile 'field_id' => $field_id, ))); } - + break; case 'activate': @@ -214,7 +214,7 @@ class acp_profile { trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $sql = 'SELECT lang_id FROM ' . LANG_TABLE . " WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'"; @@ -251,7 +251,7 @@ class acp_profile { trigger_error($user->lang['NO_FIELD_ID'] . adm_back_link($this->u_action), E_USER_WARNING); } - + $sql = 'UPDATE ' . PROFILE_FIELDS_TABLE . " SET field_active = 0 WHERE field_id = $field_id"; @@ -283,12 +283,12 @@ class acp_profile case 'create': case 'edit': - + $field_id = request_var('field_id', 0); $step = request_var('step', 1); - $submit = (request::is_set('next') || request::is_set('prev')) ? true : false; - $save = request::is_set('save'); + $submit = (phpbb_request::is_set('next') || phpbb_request::is_set('prev')) ? true : false; + $save = phpbb_request::is_set('save'); // The language id of default language $this->edit_lang_id = $this->lang_defs['iso'][$config['default_lang']]; @@ -352,9 +352,9 @@ class acp_profile { // We are adding a new field, define basic params $lang_options = $field_row = array(); - + $field_type = request_var('field_type', 0); - + if (!$field_type) { trigger_error($user->lang['NO_FIELD_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING); @@ -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 (request::is_set('field_option')) + if (phpbb_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 (request::is_set('rows')) + if (phpbb_request::is_set('rows')) { $cp->vars['rows'] = request_var('rows', 0); $cp->vars['columns'] = request_var('columns', 0); @@ -479,7 +479,7 @@ class acp_profile else if ($field_type == FIELD_DATE && $key == 'field_default_value') { $always_now = request_var('always_now', -1); - + if ($always_now == 1 || ($always_now === -1 && $var == 'now')) { $now = getdate(); @@ -492,12 +492,12 @@ class acp_profile /** * @todo Do NOT overwrite a request variable. */ - request::overwrite('field_default_value', $var, request::REQUEST); - request::overwrite('field_default_value', $var, request::POST); + phpbb_request::overwrite('field_default_value', $var, phpbb_request::REQUEST); + phpbb_request::overwrite('field_default_value', $var, phpbb_request::POST); } else { - if (request::is_set('field_default_value_day')) + if (phpbb_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); @@ -506,14 +506,14 @@ class acp_profile /** * @todo Do NOT overwrite a request variable. */ - request::overwrite('field_default_value', $var, request::REQUEST); - request::overwrite('field_default_value', $var, request::POST); + phpbb_request::overwrite('field_default_value', $var, phpbb_request::REQUEST); + phpbb_request::overwrite('field_default_value', $var, phpbb_request::POST); } else { list($cp->vars['field_default_value_day'], $cp->vars['field_default_value_month'], $cp->vars['field_default_value_year']) = explode('-', $var); } - } + } } /* else if ($field_type == FIELD_BOOL && $key == 'field_default_value') { @@ -542,7 +542,7 @@ class acp_profile } $db->sql_freeresult($result); - + $sql = 'SELECT lang_id, lang_name, lang_explain, lang_default_value FROM ' . PROFILE_LANG_TABLE . ' WHERE lang_id <> ' . $this->edit_lang_id . " @@ -559,7 +559,7 @@ class acp_profile } $db->sql_freeresult($result); } - + foreach ($exclude[3] as $key) { $cp->vars[$key] = utf8_normalize_nfc(request_var($key, array(0 => ''), true)); @@ -578,7 +578,7 @@ class acp_profile { $cp->vars[$key][$lang_id] = explode("\n", $options); } - + } } @@ -633,7 +633,7 @@ class acp_profile } } - $step = (request::is_set('next')) ? $step + 1 : ((request::is_set('prev')) ? $step - 1 : $step); + $step = (phpbb_request::is_set('next')) ? $step + 1 : ((phpbb_request::is_set('prev')) ? $step - 1 : $step); if (sizeof($error)) { @@ -653,7 +653,7 @@ class acp_profile foreach ($key_ary as $key) { - if ($field_type == FIELD_TEXT && $key == 'field_length' && request::is_set('rows')) + if ($field_type == FIELD_TEXT && $key == 'field_length' && phpbb_request::is_set('rows')) { $cp->vars['rows'] = request_var('rows', 0); $cp->vars['columns'] = request_var('columns', 0); @@ -667,7 +667,7 @@ class acp_profile { $_new_key_ary[$key] = 'now'; } - else if (request::is_set('field_default_value_day')) + else if (phpbb_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); @@ -675,13 +675,13 @@ class acp_profile $_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' && request::is_set('l_lang_options')) + else if ($field_type == FIELD_BOOL && $key == 'l_lang_options' && phpbb_request::is_set('l_lang_options')) { $_new_key_ary[$key] = utf8_normalize_nfc(request_var($key, array(array('')), true)); } else { - if (!request::is_set($key)) + if (!phpbb_request::is_set($key)) { $var = false; } @@ -722,7 +722,7 @@ class acp_profile 'L_TITLE' => $user->lang['STEP_' . $step . '_TITLE_' . strtoupper($action)], 'L_EXPLAIN' => $user->lang['STEP_' . $step . '_EXPLAIN_' . strtoupper($action)], - + 'U_ACTION' => $this->u_action . "&action=$action&step=$step", 'U_BACK' => $this->u_action) ); @@ -732,7 +732,7 @@ class acp_profile { // Create basic options - only small differences between field types case 1: - + // Build common create options $template->assign_vars(array( 'S_STEP_ONE' => true, @@ -759,7 +759,7 @@ class acp_profile 'LANG_DEFAULT_VALUE' => $cp->vars['lang_default_value']) ); } - + if ($field_type == FIELD_BOOL || $field_type == FIELD_DROPDOWN) { // Initialize these array elements if we are creating a new field @@ -788,11 +788,11 @@ class acp_profile 'SECOND_LANG_OPTION' => ($field_type == FIELD_BOOL) ? $cp->vars['lang_options'][1] : '') ); } - + break; case 2: - + $template->assign_vars(array( 'S_STEP_TWO' => true, 'L_NEXT_STEP' => (sizeof($this->lang_defs['iso']) == 1) ? $user->lang['SAVE'] : $user->lang['PROFILE_LANG_OPTIONS']) @@ -830,7 +830,7 @@ class acp_profile ); } } - + break; } @@ -842,7 +842,7 @@ class acp_profile break; } - + $sql = 'SELECT * FROM ' . PROFILE_FIELDS_TABLE . ' ORDER BY field_order'; @@ -918,14 +918,14 @@ class acp_profile $languages[$row['lang_id']] = $row['lang_iso']; } $db->sql_freeresult($result); - + $options = array(); $options['lang_name'] = 'string'; if ($cp->vars['lang_explain']) { $options['lang_explain'] = 'text'; } - + switch ($field_type) { case FIELD_BOOL: @@ -935,7 +935,7 @@ class acp_profile case FIELD_DROPDOWN: $options['lang_options'] = 'optionfield'; break; - + case FIELD_TEXT: case FIELD_STRING: if ($cp->vars['lang_default_value']) @@ -944,7 +944,7 @@ class acp_profile } break; } - + $lang_options = array(); foreach ($options as $field => $field_type) @@ -970,7 +970,7 @@ class acp_profile if ($field == 'lang_options') { $var = (!isset($cp->vars['l_lang_options'][$lang_id]) || !is_array($cp->vars['l_lang_options'][$lang_id])) ? $cp->vars['lang_options'] : $cp->vars['l_lang_options'][$lang_id]; - + switch ($field_type) { case 'two_options': @@ -991,7 +991,7 @@ class acp_profile ); break; } - + if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) { $lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN']; @@ -1005,7 +1005,7 @@ class acp_profile 'TITLE' => $user->lang['CP_' . strtoupper($field)], 'FIELD' => ($field_type == 'string') ? '<dd><input class="medium" type="text" name="l_' . $field . '[' . $lang_id . ']" value="' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '" /></dd>' : '<dd><textarea name="l_' . $field . '[' . $lang_id . ']" rows="3" cols="80">' . ((isset($value[$lang_id])) ? $value[$lang_id] : $var) . '</textarea></dd>' ); - + if (isset($user->lang['CP_' . strtoupper($field) . '_EXPLAIN'])) { $lang_options[$lang_id]['fields'][$field]['EXPLAIN'] = $user->lang['CP_' . strtoupper($field) . '_EXPLAIN']; @@ -1078,7 +1078,7 @@ class acp_profile WHERE field_id = $field_id"; $db->sql_query($sql); } - + if ($action == 'create') { $field_ident = 'pf_' . $field_ident; @@ -1095,7 +1095,7 @@ class acp_profile { $sql_ary['field_id'] = $field_id; $sql_ary['lang_id'] = $default_lang_id; - + $profile_sql[] = 'INSERT INTO ' . PROFILE_LANG_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); } else @@ -1168,7 +1168,7 @@ class acp_profile AND lang_id = " . (int) $default_lang_id; $db->sql_query($sql); } - + foreach ($cp->vars['lang_options'] as $option_id => $value) { $sql_ary = array( @@ -1271,7 +1271,7 @@ class acp_profile $lang_id = $sql['lang_id']; $option_id = $sql['option_id']; unset($sql['lang_id'], $sql['field_id'], $sql['option_id']); - + $this->update_insert(PROFILE_FIELDS_LANG_TABLE, $sql, array( 'lang_id' => $lang_id, 'field_id' => $field_id, @@ -1291,7 +1291,7 @@ class acp_profile $db->sql_query($sql); } } - + $db->sql_transaction('commit'); if ($action == 'edit') @@ -1337,7 +1337,7 @@ class acp_profile if (!$row) { $sql_ary = array_merge($where_fields, $sql_ary); - + if (sizeof($sql_ary)) { $db->sql_query("INSERT INTO $table " . $db->sql_build_array('INSERT', $sql_ary)); @@ -1387,7 +1387,7 @@ class acp_profile case FIELD_BOOL: $sql .= 'TINYINT(2) '; break; - + case FIELD_DROPDOWN: $sql .= 'MEDIUMINT(8) '; break; diff --git a/phpBB/modules/acp/acp_prune.php b/phpBB/modules/acp/acp_prune.php index ba49efff1a..42c3c139f4 100644 --- a/phpBB/modules/acp/acp_prune.php +++ b/phpBB/modules/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 = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); if ($all_forums) { @@ -79,7 +79,7 @@ class acp_prune $prune_posted = request_var('prune_days', 0); $prune_viewed = request_var('prune_vieweddays', 0); $prune_all = (!$prune_posted && !$prune_viewed) ? true : false; - + $prune_flags = 0; $prune_flags += (request_var('prune_old_polls', 0)) ? 2 : 0; $prune_flags += (request_var('prune_announce', 0)) ? 4 : 0; @@ -109,7 +109,7 @@ class acp_prune $p_result['topics'] = 0; $p_result['posts'] = 0; $log_data = ''; - + do { if (!$auth->acl_get('f_list', $row['forum_id'])) @@ -129,7 +129,7 @@ class acp_prune $p_result['topics'] += $return['topics']; $p_result['posts'] += $return['posts']; } - + if ($prune_viewed) { $return = prune($row['forum_id'], 'viewed', $prunedate_viewed, $prune_flags, false); @@ -145,11 +145,11 @@ class acp_prune 'NUM_TOPICS' => $p_result['topics'], 'NUM_POSTS' => $p_result['posts']) ); - + $log_data .= (($log_data != '') ? ', ' : '') . $row['forum_name']; } while ($row = $db->sql_fetchrow($result)); - + // Sync all pruned forums at once sync('forum', 'forum_id', $prune_ids, true, true); add_log('admin', 'LOG_PRUNE', $log_data); @@ -231,7 +231,7 @@ class acp_prune $user->add_lang('memberlist'); - $prune = request::is_set_post('prune'); + $prune = phpbb_request::is_set_post('prune'); if ($prune) { @@ -258,7 +258,7 @@ class acp_prune { user_delete('remove', $user_id); } - + $l_log = 'LOG_PRUNE_USER_DEL_DEL'; } else @@ -344,7 +344,7 @@ class acp_prune { $s_find_join_time .= '<option value="' . $key . '">' . $value . '</option>'; } - + $s_find_active_time = ''; foreach ($find_time as $key => $value) { @@ -368,7 +368,7 @@ class acp_prune global $user, $db; $users = request_var('users', '', true); - + if ($users) { $users = explode("\n", $users); diff --git a/phpBB/modules/acp/acp_ranks.php b/phpBB/modules/acp/acp_ranks.php index 08d6cf5c8c..d779132d6e 100644 --- a/phpBB/modules/acp/acp_ranks.php +++ b/phpBB/modules/acp/acp_ranks.php @@ -31,8 +31,8 @@ class acp_ranks // Set up general vars $action = request_var('action', ''); - $action = (request::is_set_post('add')) ? 'add' : $action; - $action = (request::is_set_post('save')) ? 'save' : $action; + $action = (phpbb_request::is_set_post('add')) ? 'add' : $action; + $action = (phpbb_request::is_set_post('save')) ? 'save' : $action; $rank_id = request_var('id', 0); $this->tpl_name = 'acp_ranks'; @@ -71,7 +71,7 @@ class acp_ranks 'rank_min' => $min_posts, 'rank_image' => htmlspecialchars_decode($rank_image) ); - + if ($rank_id) { $sql = 'UPDATE ' . RANKS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " WHERE rank_id = $rank_id"; @@ -139,7 +139,7 @@ class acp_ranks case 'add': $data = $ranks = $existing_imgs = array(); - + $sql = 'SELECT * FROM ' . RANKS_TABLE . ' ORDER BY rank_min ASC, rank_special ASC'; @@ -204,13 +204,13 @@ class acp_ranks 'S_SPECIAL_RANK' => (!isset($ranks['rank_special']) || $ranks['rank_special']) ? true : false, 'MIN_POSTS' => (isset($ranks['rank_min']) && !$ranks['rank_special']) ? $ranks['rank_min'] : 0) ); - + return; break; } - + $template->assign_vars(array( 'U_ACTION' => $this->u_action) ); @@ -232,7 +232,7 @@ class acp_ranks 'U_EDIT' => $this->u_action . '&action=edit&id=' . $row['rank_id'], 'U_DELETE' => $this->u_action . '&action=delete&id=' . $row['rank_id']) - ); + ); } $db->sql_freeresult($result); diff --git a/phpBB/modules/acp/acp_reasons.php b/phpBB/modules/acp/acp_reasons.php index a8d7c1f752..305f4c615e 100644 --- a/phpBB/modules/acp/acp_reasons.php +++ b/phpBB/modules/acp/acp_reasons.php @@ -31,7 +31,7 @@ class acp_reasons // Set up general vars $action = request_var('action', ''); - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $reason_id = request_var('id', 0); $this->tpl_name = 'acp_reasons'; @@ -113,7 +113,7 @@ class acp_reasons $result = $db->sql_query($sql); $max_order = (int) $db->sql_fetchfield('max_reason_order'); $db->sql_freeresult($result); - + $sql_ary = array( 'reason_title' => (string) $reason_row['reason_title'], 'reason_description' => (string) $reason_row['reason_description'], @@ -171,7 +171,7 @@ class acp_reasons 'U_ACTION' => $this->u_action . "&id=$reason_id&action=$action", 'U_BACK' => $this->u_action, 'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '', - + 'REASON_TITLE' => $reason_row['reason_title'], 'REASON_DESCRIPTION' => $reason_row['reason_description'], @@ -271,7 +271,7 @@ class acp_reasons do { ++$order; - + if ($row['reason_order'] != $order) { $sql = 'UPDATE ' . REPORTS_REASONS_TABLE . " diff --git a/phpBB/modules/acp/acp_search.php b/phpBB/modules/acp/acp_search.php index 6f38a95bff..aa9159f8e8 100644 --- a/phpBB/modules/acp/acp_search.php +++ b/phpBB/modules/acp/acp_search.php @@ -52,7 +52,7 @@ class acp_search { global $db, $user, $auth, $template, $cache, $config; - $submit = request::is_set_post('submit'); + $submit = phpbb_request::is_set_post('submit'); $search_types = $this->get_search_types(); @@ -239,7 +239,7 @@ class acp_search } $this->state = explode(',', $config['search_indexing_state']); - if (request::is_set_post('cancel')) + if (phpbb_request::is_set_post('cancel')) { $action = ''; $this->state = array(); diff --git a/phpBB/modules/acp/acp_styles.php b/phpBB/modules/acp/acp_styles.php index dc366a1ff6..4eb0928716 100644 --- a/phpBB/modules/acp/acp_styles.php +++ b/phpBB/modules/acp/acp_styles.php @@ -50,7 +50,7 @@ class acp_styles $this->page_title = 'ACP_CAT_STYLES'; $action = request_var('action', ''); - $action = (request::is_set_post('add')) ? 'add' : $action; + $action = (phpbb_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 = request::is_set_post('save'); + $save_changes = phpbb_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 = request::is_set_post('submit'); + $submit = phpbb_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 = request::is_set_post('save'); + $save_changes = phpbb_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 = request::is_set_post('update'); + $update = phpbb_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 && request::is_set_post('imgpath')) + if ($update && phpbb_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 = request::is_set_post('update'); + $update = phpbb_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 = request::is_set_post('update'); + $update = phpbb_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 = request::is_set_post('update'); + $update = phpbb_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 = request::is_set_post('update'); + $update = phpbb_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 = request::is_set_post('update'); + $update = phpbb_request::is_set_post('update'); if ($basis) { diff --git a/phpBB/modules/acp/acp_users.php b/phpBB/modules/acp/acp_users.php index 395e07751d..721c31f3cf 100644 --- a/phpBB/modules/acp/acp_users.php +++ b/phpBB/modules/acp/acp_users.php @@ -42,7 +42,7 @@ class acp_users $user_id = request_var('u', 0); $action = request_var('action', ''); - $submit = (request::is_set_post('update') && !request::is_set_post('cancel')) ? true : false; + $submit = (phpbb_request::is_set_post('update') && !phpbb_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 = request::is_set_post('delmarked'); - $deleteall = request::is_set_post('delall'); + $deletemark = phpbb_request::is_set_post('delmarked'); + $deleteall = phpbb_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 = request::is_set_post('display_gallery'); + $display_gallery = phpbb_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 = request::is_set_post('preview'); + $preview = phpbb_request::is_set_post('preview'); if ($submit || $preview) { @@ -1636,7 +1636,7 @@ class acp_users case 'attach': $start = request_var('start', 0); - $deletemark = request::is_set_post('delmarked'); + $deletemark = phpbb_request::is_set_post('delmarked'); $marked = request_var('mark', array(0)); // Sort keys diff --git a/phpBB/modules/acp/acp_words.php b/phpBB/modules/acp/acp_words.php index 1b3d78acaf..c473d27f13 100644 --- a/phpBB/modules/acp/acp_words.php +++ b/phpBB/modules/acp/acp_words.php @@ -23,7 +23,7 @@ if (!defined('IN_PHPBB')) class acp_words { var $u_action; - + function main($id, $mode) { global $db, $user, $auth, $template, $cache, $config; @@ -32,7 +32,7 @@ class acp_words // Set up general vars $action = request_var('action', ''); - $action = (request::is_set_post('add')) ? 'add' : ((request::is_set_post('save')) ? 'save' : $action); + $action = (phpbb_request::is_set_post('add')) ? 'add' : ((phpbb_request::is_set_post('save')) ? 'save' : $action); $s_hidden_fields = ''; $word_info = array(); @@ -47,7 +47,7 @@ class acp_words { case 'edit': $word_id = request_var('id', 0); - + if (!$word_id) { trigger_error($user->lang['NO_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); @@ -72,7 +72,7 @@ class acp_words 'REPLACEMENT' => (isset($word_info['replacement'])) ? $word_info['replacement'] : '', 'S_HIDDEN_FIELDS' => $s_hidden_fields) ); - + return; break; @@ -86,7 +86,7 @@ class acp_words $word_id = request_var('id', 0); $word = utf8_normalize_nfc(request_var('word', '', true)); $replacement = utf8_normalize_nfc(request_var('replacement', '', true)); - + if (!$word || !$replacement) { trigger_error($user->lang['ENTER_WORD'] . adm_back_link($this->u_action), E_USER_WARNING); @@ -96,7 +96,7 @@ class acp_words 'word' => $word, 'replacement' => $replacement ); - + if ($word_id) { $db->sql_query('UPDATE ' . WORDS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE word_id = ' . $word_id); |