diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-08-14 10:43:31 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-08-14 10:43:31 +0000 |
| commit | 1683559e19c42effff71d21e2210a5a876241c64 (patch) | |
| tree | 49fe755abfe838aa1a2bb523ba211cc7b79fb123 /phpBB/includes/acp/acp_forums.php | |
| parent | 412bb22acbe3c5cbb0d86d941f98bb8cae909f56 (diff) | |
| download | forums-1683559e19c42effff71d21e2210a5a876241c64.tar forums-1683559e19c42effff71d21e2210a5a876241c64.tar.gz forums-1683559e19c42effff71d21e2210a5a876241c64.tar.bz2 forums-1683559e19c42effff71d21e2210a5a876241c64.tar.xz forums-1683559e19c42effff71d21e2210a5a876241c64.zip | |
More r9896 cleanup.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9978 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index b2e04083fe..5f56bfb84d 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -74,9 +74,9 @@ class acp_forums { trigger_error($user->lang['NO_PERMISSION_FORUM_ADD'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } - + case 'copy_perm': - + if (!(($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) { trigger_error($user->lang['NO_PERMISSION_COPY'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); @@ -204,7 +204,6 @@ class acp_forums return; } - $auth->acl_clear_prefetch(); $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; @@ -722,14 +721,10 @@ class acp_forums $message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>'); } - // redirect directly to permission settings screen if authed - if ($action == 'add' && !$forum_perm_from && $auth->acl_get('a_fauth')) - { - meta_refresh(4, append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url)); - } - trigger_error($message . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id)); } + + break; } // Default management page @@ -1919,7 +1914,10 @@ class acp_forums adm_page_footer(); } - + + /** + * Display copy permission page + */ function copy_permission_page($forum_data) { global $phpEx, $phpbb_admin_path, $template, $user; @@ -1927,11 +1925,8 @@ class acp_forums $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; $action = append_sid($this->u_action . "&parent_id={$this->parent_id}&f={$forum_data['forum_id']}&action=copy_perm"); - $l_acl = sprintf($user->lang['COPY_TO_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>'); - - $this->tpl_name = 'acp_forums_copy_perm'; $template->assign_vars(array( |