From 5c0b8186a0706a061cc11f9189987600af84db1c Mon Sep 17 00:00:00 2001 From: Graham Eames Date: Sat, 12 Aug 2006 19:06:09 +0000 Subject: [PATCH] Hide forums you can't move posts to from within the mcp git-svn-id: file:///svn/phpbb/trunk@6285 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_permissions.php | 2 +- phpBB/includes/acp/auth.php | 2 +- phpBB/includes/functions_admin.php | 4 ++-- phpBB/includes/mcp/mcp_main.php | 2 +- phpBB/includes/mcp/mcp_topic.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 53b835df7d..ee4b2a1ade 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -298,7 +298,7 @@ class acp_permissions continue 2; } - $forum_list = make_forum_select(false, false, true, false, false, true); + $forum_list = make_forum_select(false, false, true, false, false, false, true); // Build forum options $s_forum_options = ''; diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 4ebf617913..71d17bd40d 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -322,7 +322,7 @@ class auth_admin extends auth $forum_names_ary = array(); if ($local) { - $forum_names_ary = make_forum_select(false, false, true, false, false, true); + $forum_names_ary = make_forum_select(false, false, true, false, false, false, true); } else { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 8e8604197e..307044b9a0 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -102,11 +102,11 @@ function recalc_btree($sql_id, $sql_table, $module_class = '') /** * Simple version of jumpbox, just lists authed forums */ -function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $return_array = false) +function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = false, $ignore_nonpost = false, $ignore_emptycat = true, $only_acl_post = false, $return_array = false) { global $db, $user, $auth; - $acl = ($ignore_acl) ? '' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'); + $acl = ($ignore_acl) ? '' : (($only_acl_post) ? 'f_post' : array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel')); // This query is identical to the jumpbox one $sql = 'SELECT forum_id, parent_id, forum_name, forum_type, forum_status, left_id, right_id diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index 9b2d47c818..b77c3e4451 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -522,7 +522,7 @@ function mcp_move_topic($topic_ids) else { $template->assign_vars(array( - 'S_FORUM_SELECT' => make_forum_select($to_forum_id, $forum_id, false, true, true), + 'S_FORUM_SELECT' => make_forum_select($to_forum_id, $forum_id, false, true, true, true), 'S_CAN_LEAVE_SHADOW' => true, 'ADDITIONAL_MSG' => $additional_msg) ); diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index 75dd9ea2e2..a6cec131b2 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -190,7 +190,7 @@ function mcp_topic_view($id, $mode, $action) 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true), 'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start", - 'S_FORUM_SELECT' => '', + 'S_FORUM_SELECT' => '', 'S_CAN_SPLIT' => ($auth->acl_get('m_split', $topic_info['forum_id'])) ? true : false, 'S_CAN_MERGE' => ($auth->acl_get('m_merge', $topic_info['forum_id'])) ? true : false, 'S_CAN_DELETE' => ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,