1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

- request_var updates

- added group selection to pm filter
- fixed activation/deletion of inactive user accounts in admin index
- fixed some color swatch bugs


git-svn-id: file:///svn/phpbb/trunk@5152 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-05-15 20:17:35 +00:00
parent 4c207e5510
commit 918914926b
17 changed files with 145 additions and 112 deletions

View File

@@ -25,16 +25,16 @@ function mcp_forum_view($id, $mode, $action, $url, $forum_info)
$forum_id = $forum_info['forum_id'];
$start = request_var('start', 0);
$topic_id_list = request_var('topic_id_list', 0);
$post_id_list = request_var('post_id_list', 0);
$topic_id_list = request_var('topic_id_list', array(0));
$post_id_list = request_var('post_id_list', array(0));
$topic_id = request_var('t', 0);
// Resync Topics
if ($action == 'resync')
{
$topic_ids = get_array('topic_id_list', 0);
$topic_ids = request_var('topic_id_list', array(0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
$template->assign_var('MESSAGE', $user->lang['NO_TOPIC_SELECTED']);
}
@@ -45,7 +45,7 @@ function mcp_forum_view($id, $mode, $action, $url, $forum_info)
}
$selected_ids = '';
if ($post_id_list)
if (sizeof($post_id_list))
{
foreach ($post_id_list as $num => $post_id)
{

View File

@@ -33,9 +33,9 @@ class mcp_main extends module
{
case 'lock':
case 'unlock':
$topic_ids = get_array((!$quickmod) ? 'topic_id_list' : 't', 0);
$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
trigger_error('NO_TOPIC_SELECTED');
}
@@ -46,9 +46,9 @@ class mcp_main extends module
case 'lock_post':
case 'unlock_post':
$post_ids = get_array((!$quickmod) ? 'post_id_list' : 'p', 0);
if (!$post_ids)
$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
if (!sizeof($post_ids))
{
trigger_error('NO_POST_SELECTED');
}
@@ -61,9 +61,9 @@ class mcp_main extends module
case 'make_global':
case 'make_normal':
$topic_ids = get_array((!$quickmod) ? 'topic_id_list' : 't', 0);
$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
trigger_error('NO_TOPIC_SELECTED');
}
@@ -75,9 +75,9 @@ class mcp_main extends module
case 'move':
$user->add_lang('viewtopic');
$topic_ids = get_array((!$quickmod) ? 'topic_id_list' : 't', 0);
$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
trigger_error('NO_TOPIC_SELECTED');
}
@@ -89,9 +89,9 @@ class mcp_main extends module
case 'fork':
$user->add_lang('viewtopic');
$topic_ids = get_array((!$quickmod) ? 'topic_id_list' : 't', 0);
$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
trigger_error('NO_TOPIC_SELECTED');
}
@@ -103,9 +103,9 @@ class mcp_main extends module
case 'delete_topic':
$user->add_lang('viewtopic');
$topic_ids = get_array((!$quickmod) ? 'topic_id_list' : 't', 0);
$topic_ids = (!$quickmod) ? request_var('topic_id_list', array(0)) : array(request_var('t', 0));
if (!$topic_ids)
if (!sizeof($topic_ids))
{
trigger_error('NO_TOPIC_SELECTED');
}
@@ -116,9 +116,9 @@ class mcp_main extends module
case 'delete_post':
$user->add_lang('posting');
$post_ids = get_array((!$quickmod) ? 'post_id_list' : 'p', 0);
if (!$post_ids)
$post_ids = (!$quickmod) ? request_var('post_id_list', array(0)) : array(request_var('p', 0));
if (!sizeof($post_ids))
{
trigger_error('NO_POST_SELECTED');
}

View File

@@ -31,9 +31,9 @@ class mcp_queue extends module
include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx);
include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx);
$post_id_list = get_array('post_id_list', 0);
$post_id_list = request_var('post_id_list', array(0));
if (!$post_id_list)
if (!sizeof($post_id_list))
{
trigger_error('NO_POST_SELECTED');
}

View File

@@ -34,8 +34,7 @@ function mcp_topic_view($id, $mode, $action, $url)
$start = request_var('start', 0);
$to_topic_id = request_var('to_topic_id', 0);
$to_forum_id = request_var('to_forum_id', 0);
$post_id_list = get_array('post_id_list', 0);
$post_id_list = request_var('post_id_list', array(0));
// Split Topic?
if ($action == 'split_all' || $action == 'split_beyond')
@@ -218,10 +217,10 @@ function split_topic($mode, $topic_id, $to_forum_id, $subject)
{
global $db, $template, $user, $phpEx, $SID, $phpbb_root_path, $auth;
$post_id_list = get_array('post_id_list', 0);
$post_id_list = request_var('post_id_list', array(0));
$start = request_var('start', 0);
if (!$post_id_list)
if (!sizeof($post_id_list))
{
trigger_error('NO_POST_SELECTED');
}
@@ -414,10 +413,10 @@ function merge_posts($topic_id, $to_topic_id)
$topic_data = $topic_data[$to_topic_id];
$post_id_list = get_array('post_id_list', 0);
$post_id_list = request_var('post_id_list', array(0));
$start = request_var('start', 0);
if (!$post_id_list)
if (!sizeof($post_id_list))
{
$template->assign_var('MESSAGE', $user->lang['NO_POST_SELECTED']);
return;