[Phpbb-checkins] r9978 - /branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Fri Aug 14 11:43:31 2009
New Revision: 9978

Log:
More r9896 cleanup.

Modified:
    branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php

Modified: branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/acp/acp_forums.php Fri Aug 14 11:43:31 2009
***************
*** 74,82 ****
  				{
  					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);
--- 74,82 ----
  				{
  					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,210 ****
  							return;
  						}
  
- 
  						$auth->acl_clear_prefetch();
  
  						$acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id'];
--- 204,209 ----
***************
*** 722,735 ****
  						$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 . '&amp;parent_id=' . $this->parent_id));
  				}
  		}
  
  		// Default management page
--- 721,730 ----
  						$message .= '<br /><br />' . sprintf($user->lang['REDIRECT_ACL'], '<a href="' . append_sid("{$phpbb_admin_path}index.$phpEx", 'i=permissions' . $acl_url) . '">', '</a>');
  					}
  
  					trigger_error($message . adm_back_link($this->u_action . '&amp;parent_id=' . $this->parent_id));
  				}
+ 
+ 			break;
  		}
  
  		// Default management page
***************
*** 1919,1925 ****
  
  		adm_page_footer();
  	}
! 	
  	function copy_permission_page($forum_data)
  	{
  		global $phpEx, $phpbb_admin_path, $template, $user;
--- 1914,1923 ----
  
  		adm_page_footer();
  	}
! 
! 	/**
! 	* Display copy permission page
! 	*/
  	function copy_permission_page($forum_data)
  	{
  		global $phpEx, $phpbb_admin_path, $template, $user;
***************
*** 1927,1937 ****
  		$acl_url = '&amp;mode=setting_forum_local&amp;forum_id[]=' . $forum_data['forum_id'];
  		$action = append_sid($this->u_action . "&amp;parent_id={$this->parent_id}&amp;f={$forum_data['forum_id']}&amp;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(
--- 1925,1932 ----