mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
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
This commit is contained in:
@@ -32,8 +32,8 @@ class mcp_ban
|
||||
// Include the admin banning interface...
|
||||
include(PHPBB_ROOT_PATH . 'includes/acp/acp_ban.' . 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'));
|
||||
@@ -171,7 +171,7 @@ class mcp_ban
|
||||
case 'user':
|
||||
$pre_fill = (string) $db->sql_fetchfield('username');
|
||||
break;
|
||||
|
||||
|
||||
case 'ip':
|
||||
$pre_fill = (string) $db->sql_fetchfield('user_ip');
|
||||
break;
|
||||
|
@@ -33,10 +33,10 @@ function mcp_forum_view($id, $mode, $action, $forum_info)
|
||||
if ($merge_select)
|
||||
{
|
||||
// Fixes a "bug" that makes forum_view use the same ordering as topic_view
|
||||
request::overwrite('sk', null, request::POST);
|
||||
request::overwrite('sd', null, request::POST);
|
||||
request::overwrite('sk', null, request::REQUEST);
|
||||
request::overwrite('sd', null, request::REQUEST);
|
||||
phpbb_request::overwrite('sk', null, phpbb_request::POST);
|
||||
phpbb_request::overwrite('sd', null, phpbb_request::POST);
|
||||
phpbb_request::overwrite('sk', null, phpbb_request::REQUEST);
|
||||
phpbb_request::overwrite('sd', null, phpbb_request::REQUEST);
|
||||
}
|
||||
|
||||
$forum_id = $forum_info['forum_id'];
|
||||
|
@@ -576,7 +576,7 @@ function mcp_move_topic($topic_ids)
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (request::is_set_post('confirm'))
|
||||
else if (phpbb_request::is_set_post('confirm'))
|
||||
{
|
||||
$additional_msg = $user->lang['FORUM_NOT_EXIST'];
|
||||
}
|
||||
@@ -584,7 +584,7 @@ function mcp_move_topic($topic_ids)
|
||||
if ($to_forum_id && !$additional_msg && confirm_box(true))
|
||||
{
|
||||
$topic_data = get_topic_data($topic_ids);
|
||||
$leave_shadow = request::is_set_post('move_leave_shadow');
|
||||
$leave_shadow = phpbb_request::is_set_post('move_leave_shadow');
|
||||
|
||||
$topics_moved = sizeof($topic_ids);
|
||||
$topics_authed_moved = 0;
|
||||
@@ -783,7 +783,7 @@ function mcp_delete_topic($topic_ids)
|
||||
confirm_box(false, (sizeof($topic_ids) == 1) ? 'DELETE_TOPIC' : 'DELETE_TOPICS', $s_hidden_fields);
|
||||
}
|
||||
|
||||
if (!request::is_set('quickmod'))
|
||||
if (!phpbb_request::is_set('quickmod'))
|
||||
{
|
||||
$redirect = request_var('redirect', 'index.' . PHP_EXT);
|
||||
$redirect = reapply_sid($redirect);
|
||||
@@ -976,7 +976,7 @@ function mcp_fork_topic($topic_ids)
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (request::is_set_post('confirm'))
|
||||
else if (phpbb_request::is_set_post('confirm'))
|
||||
{
|
||||
$additional_msg = $user->lang['FORUM_NOT_EXIST'];
|
||||
}
|
||||
|
@@ -484,7 +484,7 @@ function approve_post($post_id_list, $id, $mode)
|
||||
|
||||
if (confirm_box(true))
|
||||
{
|
||||
$notify_poster = request::is_set('notify_poster');
|
||||
$notify_poster = phpbb_request::is_set('notify_poster');
|
||||
|
||||
// If Topic -> total_topics = total_topics+1, total_posts = total_posts+1, forum_topics = forum_topics+1, forum_posts = forum_posts+1
|
||||
// If Post -> total_posts = total_posts+1, forum_posts = forum_posts+1, topic_replies = topic_replies+1
|
||||
@@ -807,7 +807,7 @@ function disapprove_post($post_id_list, $id, $mode)
|
||||
'redirect' => $redirect)
|
||||
);
|
||||
|
||||
$notify_poster = request::is_set('notify_poster');
|
||||
$notify_poster = phpbb_request::is_set('notify_poster');
|
||||
$disapprove_reason = '';
|
||||
|
||||
if ($reason_id)
|
||||
|
@@ -45,7 +45,7 @@ function mcp_topic_view($id, $mode, $action)
|
||||
$forum_id = request_var('f', 0);
|
||||
$to_topic_id = request_var('to_topic_id', 0);
|
||||
$to_forum_id = request_var('to_forum_id', 0);
|
||||
$sort = request::is_set_post('sort');
|
||||
$sort = phpbb_request::is_set_post('sort');
|
||||
$submitted_id_list = request_var('post_ids', array(0));
|
||||
$checked_ids = $post_id_list = request_var('post_id_list', array(0));
|
||||
|
||||
|
@@ -195,7 +195,7 @@ class mcp_warn
|
||||
|
||||
$post_id = request_var('p', 0);
|
||||
$forum_id = request_var('f', 0);
|
||||
$notify = request::is_set('notify_user');
|
||||
$notify = phpbb_request::is_set('notify_user');
|
||||
$warning = utf8_normalize_nfc(request_var('warning', '', true));
|
||||
|
||||
$sql = 'SELECT u.*, p.*
|
||||
@@ -337,7 +337,7 @@ class mcp_warn
|
||||
|
||||
$user_id = request_var('u', 0);
|
||||
$username = request_var('username', '', true);
|
||||
$notify = request::is_set('notify_user');
|
||||
$notify = phpbb_request::is_set('notify_user');
|
||||
$warning = utf8_normalize_nfc(request_var('warning', '', true));
|
||||
|
||||
$sql_where = ($user_id) ? "user_id = $user_id" : "username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'";
|
||||
|
Reference in New Issue
Block a user