makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hide forums you can't move posts to from within the mcp

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6285 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Graham Eames 2006-08-12 19:06:09 +00:00
parent 3675b8fcd6
commit 5c0b8186a0
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_permissions.php
View file

@ -298,7 +298,7 @@ class acp_permissions
continue 2; 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 // Build forum options
$s_forum_options = ''; $s_forum_options = '';

2
phpBB/includes/acp/auth.php
View file

@ -322,7 +322,7 @@ class auth_admin extends auth
$forum_names_ary = array(); $forum_names_ary = array();
if ($local) 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 else
{ {

4
phpBB/includes/functions_admin.php
View file

@ -102,11 +102,11 @@ function recalc_btree($sql_id, $sql_table, $module_class = '')
/** /**
* Simple version of jumpbox, just lists authed forums * 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; 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 // This query is identical to the jumpbox one
$sql = 'SELECT forum_id, parent_id, forum_name, forum_type, forum_status, left_id, right_id $sql = 'SELECT forum_id, parent_id, forum_name, forum_type, forum_status, left_id, right_id

2
phpBB/includes/mcp/mcp_main.php
View file

@ -522,7 +522,7 @@ function mcp_move_topic($topic_ids)
else else
{ {
$template->assign_vars(array( $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, 'S_CAN_LEAVE_SHADOW' => true,
'ADDITIONAL_MSG' => $additional_msg) 'ADDITIONAL_MSG' => $additional_msg)
); );

2
phpBB/includes/mcp/mcp_topic.php
View file

@ -190,7 +190,7 @@ function mcp_topic_view($id, $mode, $action)
'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true),
'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start", 'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start",
'S_FORUM_SELECT' => '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id) : make_forum_select($topic_info['forum_id'])) . '</select>', 'S_FORUM_SELECT' => '<select name="to_forum_id">' . (($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true)) . '</select>',
'S_CAN_SPLIT' => ($auth->acl_get('m_split', $topic_info['forum_id'])) ? true : false, '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_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, 'S_CAN_DELETE' => ($auth->acl_get('m_delete', $topic_info['forum_id'])) ? true : false,