1 files changed, 116 insertions, 21 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php
index 164970b5d5..e9f0af5071 100644
--- a/phpBB/includes/acp/acp_permissions.php
+++ b/phpBB/includes/acp/acp_permissions.php
@@ -57,6 +57,21 @@ class acp_permissions
 			trigger_error('NO_MODE', E_USER_ERROR);
 		}
 
+		// Copy forum permissions
+		if ($mode == 'setting_forum_copy')
+		{
+			$this->tpl_name = 'permission_forum_copy';
+
+			if ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth'))
+			{
+				$this->page_title = 'ACP_FORUM_PERMISSIONS_COPY';
+				$this->copy_forum_permissions();
+				return;
+			}
+
+			trigger_error('NO_MODE', E_USER_ERROR);
+		}
+
 		// Set some vars
 		$action = request_var('action', array('' => 0));
 		$action = key($action);
@@ -217,43 +232,71 @@ class acp_permissions
 			trigger_error($user->lang['WRONG_PERMISSION_TYPE'] . adm_back_link($this->u_action), E_USER_WARNING);
 		}
 
-
 		// Handle actions
 		if (strpos($mode, 'setting_') === 0 && $action)
 		{
 			switch ($action)
 			{
 				case 'delete':
-
-					if (!check_form_key($form_name))
+					if (confirm_box(true))
 					{
-						trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING);
-					}
-					// All users/groups selected?
-					$all_users = (isset($_POST['all_users'])) ? true : false;
-					$all_groups = (isset($_POST['all_groups'])) ? true : false;
+						// All users/groups selected?
+						$all_users = (isset($_POST['all_users'])) ? true : false;
+						$all_groups = (isset($_POST['all_groups'])) ? true : false;
 
-					if ($all_users || $all_groups)
-					{
-						$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
+						if ($all_users || $all_groups)
+						{
+							$items = $this->retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type);
+
+							if ($all_users && sizeof($items['user_ids']))
+							{
+								$user_id = $items['user_ids'];
+							}
+							else if ($all_groups && sizeof($items['group_ids']))
+							{
+								$group_id = $items['group_ids'];
+							}
+						}
 
-						if ($all_users && sizeof($items['user_ids']))
+						if (sizeof($user_id) || sizeof($group_id))
 						{
-							$user_id = $items['user_ids'];
+							$this->remove_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id, $forum_id);
 						}
-						else if ($all_groups && sizeof($items['group_ids']))
+						else
 						{
-							$group_id = $items['group_ids'];
+							trigger_error($user->lang['NO_USER_GROUP_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
 						}
 					}
-
-					if (sizeof($user_id) || sizeof($group_id))
-					{
-						$this->remove_permissions($mode, $permission_type, $auth_admin, $user_id, $group_id, $forum_id);
-					}
 					else
 					{
-						trigger_error($user->lang['NO_USER_GROUP_SELECTED'] . adm_back_link($this->u_action), E_USER_WARNING);
+						if (isset($_POST['cancel']))
+						{
+							$u_redirect = $this->u_action . '&amp;type=' . $permission_type;
+							foreach ($forum_id as $fid)
+							{
+								$u_redirect .= '&amp;forum_id[]=' . $fid;
+							}
+							redirect($u_redirect);
+						}
+
+						$s_hidden_fields = array(
+							'i'				=> $id,
+							'mode'			=> $mode,
+							'action'		=> array($action => 1),
+							'user_id'		=> $user_id,
+							'group_id'		=> $group_id,
+							'forum_id'		=> $forum_id,
+							'type'			=> $permission_type,
+						);
+						if (isset($_POST['all_users']))
+						{
+							$s_hidden_fields['all_users'] = 1;
+						}
+						if (isset($_POST['all_groups']))
+						{
+							$s_hidden_fields['all_groups'] = 1;
+						}
+						confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields($s_hidden_fields));
 					}
 				break;
 
@@ -963,6 +1006,7 @@ class acp_permissions
 				LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (ug.group_id = g.group_id)
 			WHERE ug.user_id = ' . $user_id . '
 				AND ug.user_pending = 0
+				AND NOT (ug.group_leader = 1 AND g.group_skip_auth = 1)
 			ORDER BY g.group_type DESC, g.group_id DESC';
 		$result = $db->sql_query($sql);
 
@@ -1124,6 +1168,57 @@ class acp_permissions
 	}
 
 	/**
+	* Handles copying permissions from one forum to others
+	*/
+	function copy_forum_permissions()
+	{
+		global $auth, $cache, $template, $user;
+
+		$user->add_lang('acp/forums');
+
+		$submit = isset($_POST['submit']) ? true : false;
+
+		if ($submit)
+		{
+			$src = request_var('src_forum_id', 0);
+			$dest = request_var('dest_forum_ids', array(0));
+
+			if (confirm_box(true))
+			{
+				if (copy_forum_permissions($src, $dest))
+				{
+					cache_moderators();
+
+					$auth->acl_clear_prefetch();
+					$cache->destroy('sql', FORUMS_TABLE);
+
+					trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action));
+				}
+				else
+				{
+					trigger_error($user->lang['SELECTED_FORUM_NOT_EXIST'] . adm_back_link($this->u_action), E_USER_WARNING);
+				}
+			}
+			else
+			{
+				$s_hidden_fields = array(
+					'submit'			=> $submit,
+					'src_forum_id'		=> $src,
+					'dest_forum_ids'	=> $dest,
+				);
+
+				$s_hidden_fields = build_hidden_fields($s_hidden_fields);
+
+				confirm_box(false, $user->lang['COPY_PERMISSIONS_CONFIRM'], $s_hidden_fields);
+			}
+		}
+
+		$template->assign_vars(array(
+			'S_FORUM_OPTIONS' => make_forum_select(false, false, false, false, false),
+		));
+	}
+
+	/**
 	* Get already assigned users/groups
 	*/
 	function retrieve_defined_user_groups($permission_scope, $forum_id, $permission_type)