Getting there ... unlike Network Rail ...

git-svn-id: file:///svn/phpbb/trunk@3818 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Paul S. Owen <psotfx@users.sourceforge.net> 2003-04-12 17:07:25 +0000
committer: Paul S. Owen <psotfx@users.sourceforge.net> 2003-04-12 17:07:25 +0000
commit: 32f0680b3060977bc9bee3c4df3a30a9648a43c9 (patch)
tree: 3d7574fe99e4f9b10b70298120a26354f06ebf87 /phpBB/adm
parent: 793182218a4e45fd6e28295e1f07e966922d2db1 (diff)
download: forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar
forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.gz
forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.bz2
forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.xz
forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.zip
1 files changed, 802 insertions, 448 deletions
diff --git a/phpBB/adm/admin_permissions.php b/phpBB/adm/admin_permissions.php
index 4f5187c406..d0755d94d0 100644
--- a/phpBB/adm/admin_permissions.php
+++ b/phpBB/adm/admin_permissions.php
@@ -42,50 +42,38 @@ require('pagestart.' . $phpEx);
 // Grab and set some basic parameters
 //
 // 'mode' determines what we're altering; administrators, users, deps, etc.
-// 'type' is used primarily for deps and contains the original 'mode'
+// 'type' is used primarily for deps and contains the original 'mode' 
+// 'submit' is used to determine what we're doing ... special format
 $mode	= (isset($_REQUEST['mode'])) ? htmlspecialchars($_REQUEST['mode']) : '';
 $type	= (isset($_REQUEST['type'])) ? htmlspecialchars($_REQUEST['type']) : '';
-$action = (isset($_REQUEST['action'])) ? htmlspecialchars($_REQUEST['action']) : '';
+$submit = array_values(preg_grep('#^submit_(.*)$#i', array_keys($_POST)));
+$submit = (sizeof($submit)) ? substr($submit[0], strpos($submit[0], '_') + 1) : '';
+
 
 // Submitted setting data
 //
 // 'auth_settings' contains the submitted option settings assigned to options, should be an 
-//   associative array
+//   associative array with integer values
 // 'auth_setting' contains the value of the submitted 'auth_option', an integer value used
 //   mainly by deps mode
 // 'auth_option' contains a single auth_option string, used mainly by deps mode
-$auth_settings	= (isset($_POST['settings'])) ? $_POST['settings'] : array();
+$auth_settings	= (isset($_POST['settings'])) ? array_map('intval', $_POST['settings']) : '';
 $auth_option	= (isset($_REQUEST['option'])) ? htmlspecialchars($_REQUEST['option']) : '';
 $auth_setting	= (isset($_REQUEST['setting'])) ? intval($_REQUEST['setting']) : '';
 
+
 // Forum, User or Group information
 //
 // 'ug_type' is either user or groups used mainly for forum/admin/mod permissions
 // 'ug_data' contains the list of usernames, user_id's or group_ids for the 'ug_type'
-// 'forum_id' contains the list of forums, 0 is used for "All forums", must be an array
+// 'forum_id' contains the list of forums, 0 is used for "All forums", can be array or scalar
 $ug_type = (isset($_REQUEST['ug_type'])) ? htmlspecialchars($_REQUEST['ug_type']) : '';
 $ug_data = (isset($_POST['ug_data'])) ? $_POST['ug_data'] : '';
-$forum_id = (isset($_REQUEST['f'])) ? ((!is_array($_REQUEST['f'])) ? array(intval($_REQUEST['f'])) : array_filter($_REQUEST['f'], 'int')) : array(0);
-
-
-
-
-
-
-
-
-
-$username = (isset($_REQUEST['username'])) ? $_REQUEST['username'] : '';
-$group_id = (isset($_REQUEST['g'])) ? intval($_REQUEST['g']) : '';
-
-
-
-
-
-
-
+$forum_id = (isset($_REQUEST['f'])) ? ((is_array($_REQUEST['f'])) ? array_map('intval', $_REQUEST['f']) : intval($_REQUEST['f'])) : 0;
 
 
+// Instantiate a new auth admin object in readiness
+$auth_admin = new auth_admin();
 
 
 // What mode are we running? So we can output the correct title, explanation
@@ -141,7 +129,6 @@ switch ($mode)
 		break;
 }
 
-
 // Permission check
 if (!$auth->acl_get($which_acl))
 {
@@ -174,131 +161,682 @@ if ($mode == 'deps')
 }
 
 
+// Does user want to update anything? Check here to find out 
+// and act appropriately
+switch ($submit)
+{
+	case 'update':
 
+		switch ($mode)
+		{
+			case 'deps':
+				$forum_id = (!is_array($forum_id)) ? array($forum_id) : $forum_id;
+				$auth_settings_ary = $db->sql_escape(serialize($auth_settings));
 
+				$sql = '';
+				foreach ($forum_id as $id)
+				{
+					switch (SQL_LAYER)
+					{
+						case 'mysql':
+						case 'mysql4':
+							$sql .= (($sql != '') ? ', ' : '') . "('$option', $auth_setting, $id, '$auth_settings_ary')";
+							break;
 
+						case 'mssql':
+							$sql .= (($sql != '') ? ' UNION ALL ' : '') . " SELECT '$option', $auth_setting, $id, '$auth_settings_ary'";
+							break;
 
+						default:
+							$sql = "INSERT INTO " . ACL_DEPS_TABLE . " (auth_option, auth_setting, forum_id, auth_deps)
+								VALUES ('$option', $auth_setting, $id, '$auth_settings_ary')";
+							$result = $db->sql_query($sql);
+							$sql = '';
+					}
+				}
 
+				if ($sql != '')
+				{
+					echo $sql = "INSERT INTO " . ACL_DEPS_TABLE . " (auth_option, auth_setting, forum_id, auth_deps)
+						VALUES $sql";
+					$result = $db->sql_query($sql);
+				}
 
+				unset($auth_settings_ary);
 
+				exit;
+				break;
 
+			default:
 
-//
-//
-// OUTPUT PAGE
-//
-//
-page_header($l_title);
+				// User wants to submit these changes ... before we allow this
+				// we first check to see if any dependencies exist. If they do
+				// we pull them, and give the user the option of applying them
+				// or skipping them
+				$sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
 
+				$sql_dep = $sql_global = array();
+				foreach ($auth_settings as $option => $setting)
+				{
+					$sql_dep[$setting] .= (($sql_dep[$setting] != '') ? ', ' : '') . "'$option'";
+				}
 
+				$sql_options = '';
+				foreach ($sql_dep as $setting => $options)
+				{
+					$sql_options .= (($sql_options != '') ? ' OR ' : '') . " (auth_option IN ($options) AND auth_setting = $setting)";
+				}
 
+				$sql = "SELECT auth_deps  
+						FROM " . ACL_DEPS_TABLE . " 
+						WHERE $sql_options";
+//							AND forum_id $sql_forum";
+				$result = $db->sql_query($sql);
 
+				if ($row = $db->sql_fetchrow($result))
+				{
+					do
+					{
+						$temp = unserialize($row['auth_deps']);
+						foreach ($temp as $option => $setting)
+						{
+							$auth_settings[$option] = (!isset($auth_settings[$option]) || $setting < $auth_settings[$option]) ? $setting : $auth_settings[$option];
+						}
+					}
+					while ($row = $db->sql_fetchrow($result));
 
+					unset($temp);
+					unset($option);
+					unset($setting);
+					unset($sql_auth_option);
 
+					$sql_option_mode = 'f';
 
+				}
+				$db->sql_freeresult($result);
 
-		$auth_options = $auth_settings = array();
+				//print_r($auth_settings);
 
-		// Grab the list of options ... if we're in deps
-		// mode we want all options, else we skip the master
-		// options
-		$sql_founder = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
-		$sql_limit_option = ($mode == 'deps') ? '' : "AND auth_option <> '" . $sql_option_mode . "_'";
-		$sql = "SELECT auth_option_id, auth_option
-			FROM " . ACL_OPTIONS_TABLE . "
-			WHERE auth_option LIKE '" . $sql_option_mode . "_%' 
-				$sql_limit_option 
-				$sql_founder";
-		$result = $db->sql_query($sql);
+				//echo "HERE :: UPDATE ACLS";
+/*
+				// Admin wants subforums to inherit permissions ... so handle this
+				if (!empty($_POST['inherit']))
+				{
+					array_push($_POST['inherit'], $forum_id);
+					$forum_id = $_POST['inherit'];
+				}
+
+				foreach ($ug_data as $id)
+				{
+					$auth_admin->acl_set($ug_type, $forum_id, $id, $auth_settings);
+				}
+
+				cache_moderators();
+
+				trigger_error($user->lang['AUTH_UPDATED']);
+*/
 
-		while ($row = $db->sql_fetchrow($result))
-		{
-			$auth_options[] = $row;
 		}
-		$db->sql_freeresult($result);
+		break;
+
+	case 'delete':
+		echo "HERE :: DELETE";
+		exit;
 
-		unset($sql_limit_option);
+		switch ($mode)
+		{
+			case 'deps':
+				break;
 
-		// Now we'll build a list of preset options ...
-		$preset_options = $preset_js = $preset_update_options = '';
-		$holding = array();
+			default:
+/*				$option_ids = false;
+				if (!empty($settings)
+				{
+					$sql = "SELECT auth_option_id
+						FROM " . ACL_OPTIONS_TABLE . "
+						WHERE auth_option LIKE '" . $settings['option'] . "_%'";
+					$result = $db->sql_query($sql);
 
-		// Do we have a parent forum? If so offer option to inherit from that
-		if ($forum_info['parent_id'] != 0)
+					if ($row = $db->sql_fetchrow($result))
+					{
+						$option_ids = array();
+						do
+						{
+							$option_ids[] = $row['auth_option_id'];
+						}
+						while($row = $db->sql_fetchrow($result));
+					}
+					$db->sql_freeresult($result);
+				}
+
+				foreach ($_POST['ug_id'] as $id)
+				{
+					$auth_admin->acl_delete($_POST['type'], $forum_id, $id, $option_ids);
+				}
+
+				cache_moderators();
+
+				trigger_error($user->lang['AUTH_UPDATED']);*/
+				break;
+		}
+		break;
+
+	case 'presetsave':
+		$holding_ary = array();
+		foreach ($auth_settings as $option => $setting)
 		{
-			switch ($ug_type)
+			switch ($setting)
 			{
-				case 'group':
-					$sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_info['parent_id'] . " AND a.group_id IN ($where_sql)";
+				case ACL_YES:
+					$holding_ary['yes'][] = $option;
+					break;
+
+				case ACL_NO:
+					$holding_ary['no'][] = $option;
 					break;
 
-				case 'user':
-					$sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_info['parent_id'] . " AND a.user_id IN ($where_sql)";
+				case ACL_UNSET:
+					$holding_ary['unset'][] = $option;
 					break;
 			}
+		}
+		unset($option);
+		unset($setting);
+
+		$sql = array(
+			'preset_user_id'=> intval($user->data['user_id']),
+			'preset_type'	=> $sql_option_mode,
+			'preset_data'	=> $db->sql_escape(serialize($holding_ary))
+		);
+
+		if (!empty($_POST['presetname']))
+		{
+			$sql['preset_name'] = $db->sql_escape($_POST['presetname']);
+		}
+		
+		if (!empty($_POST['presetname']) || $_POST['presetoption'] != -1)
+		{
+			$sql = ($_POST['presetoption'] == -1) ? 'INSERT INTO ' . ACL_PRESETS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql) : 'UPDATE ' . ACL_PRESETS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql) . ' WHERE preset_id =' . intval($_POST['presetoption']);
+			$db->sql_query($sql);
+		}
+		break;
+
+	case 'presetdel':
+		if (!empty($_POST['presetoption']))
+		{
+			$sql = "DELETE FROM " . ACL_PRESETS_TABLE . " 
+				WHERE preset_id = " . intval($_POST['presetoption']);
+			$db->sql_query($sql);
+		}
+		break;
+}
+// End update
+
+
+// Output page header
+page_header($l_title);
+
+
+// First potential form ... this is for selecting forums, users
+// or groups. 
+if (($mode == 'user' || $mode == 'group' || $mode == 'forum' || $mode == 'mod') && empty($submit))
+{
+
+?>
+
+<h1><?php echo $l_title; ?></h1>
+
+<p><?php echo $l_title_explain ?></p>
+
+<form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
+<?php
+
+	// Mode specific markup
+	switch ($mode)
+	{
+		case 'forum':
+		case 'mod':
+
+?>
+	<tr>
+		<th align="center"><?php echo $user->lang['LOOK_UP_FORUM']; ?></th>
+	</tr>
+	<tr>
+		<td class="row1" align="center">&nbsp;<select name="f"><?php echo 
+	
+			make_forum_select(); 
+			
+?></select> &nbsp;<input type="submit" name="submit_usergroups" value="<?php echo $user->lang['LOOK_UP_FORUM']; ?>" class="mainoption" /><input type="hidden" name="ug_type" value="forum" /><input type="hidden" name="action" value="usergroups" />&nbsp;</td>
+	</tr>
+<?php
+		
+			break;
+
+		case 'user':
+?>
+	<tr>
+		<th align="center"><?php echo $user->lang['LOOK_UP_USER']; ?></th>
+	</tr>
+	<tr>
+		<td class="row1" align="center"><input type="text" class="post" name="ug_data" maxlength="30" size="20" /> <input type="submit" name="submit_options" value="<?php echo $user->lang['LOOK_UP_USER']; ?>" class="mainoption" /> <input type="submit" name="usersubmit" value="<?php echo $user->lang['FIND_USERNAME']; ?>" class="liteoption" onClick="window.open('<?php echo "../memberlist.$phpEx$SID&amp;mode=searchuser&amp;field=username"; ?>', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /><input type="hidden" name="ug_type" value="username" /></td>
+	</tr>
+<?php
+
+			break;
+
+		case 'group':
+			// Generate list of groups
+			$sql = "SELECT group_id, group_name    
+				FROM " . GROUPS_TABLE . " 
+				ORDER BY group_type DESC";
 			$result = $db->sql_query($sql);
 
+			$group_options = '';
 			if ($row = $db->sql_fetchrow($result))
 			{
 				do
 				{
-					switch ($row['auth_setting'])
-					{
-						case ACL_ALLOW:
-							$holding['allow'] .= $row['auth_option'] . ', ';
-							break;
-
-						case ACL_DENY:
-							$holding['deny'] .= $row['auth_option'] . ', ';
-							break;
-
-						case ACL_INHERIT:
-							$holding['inherit'] .= $row['auth_option'] . ', ';
-							break;
-					}
+					$group_options .= (($group_options != '') ? ', ' : '') . '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
 				}
 				while ($row = $db->sql_fetchrow($result));
-
-				$preset_options .= '<option value="preset_0">' . $user->lang['INHERIT_PARENT'] . '</option>';
-				$preset_js .= "\tpresets['preset_0'] = new Array();" . "\n";
-				$preset_js .= "\tpresets['preset_0'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
 			}
 			$db->sql_freeresult($result);
+
+?>
+	<tr>
+		<th align="center"><?php echo $user->lang['LOOK_UP_GROUP']; ?></th>
+	</tr>
+	<tr>
+		<td class="row1" align="center">&nbsp;<select name="ug_data"><?php echo $group_options; ?></select> &nbsp;<input type="submit" name="submit_options" value="<?php echo $user->lang['LOOK_UP_GROUP']; ?>" class="mainoption" /><input type="hidden" name="ug_type" value="group" />&nbsp;</td>
+	</tr>
+<?php
+
+		break;
+
+	}
+
+?>
+</table></form>
+
+<?php
+
+}
+// End user, group or forum selection
+
+
+// Second possible form, this lists the currently enabled
+// users/groups for the given mode
+if ((in_array($submit, array('usergroups', 'delete', 'cancel'))) || (empty($submit) && in_array($mode, array('admin', 'supermod'))))
+{
+
+	// Define appropriate SQL for linking on forums
+	$sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ') ' : ' = ' . $forum_id;
+
+?>
+
+<p><?php echo $l_title_explain; ?></p>
+
+<table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr>
+		<td align="center"><h1><?php echo $user->lang['USERS']; ?></h1></td>
+		<td align="center"><h1><?php echo $user->lang['GROUPS']; ?></h1></td>
+	</tr>
+	<tr>
+
+		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
+<?php
+
+	$sql = "SELECT DISTINCT u.user_id, u.username
+		FROM " . USERS_TABLE . " u, " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
+		WHERE o.auth_option LIKE '" . $sql_option_mode . "_%'
+			AND a.auth_option_id = o.auth_option_id
+			AND a.forum_id $sql_forum
+			AND u.user_id = a.user_id
+		ORDER BY u.username, u.user_regdate ASC";
+	$result = $db->sql_query($sql);
+
+	$users = '';
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$users .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
+	}
+	$db->sql_freeresult($result);
+
+?>
+			<tr>
+				<th><?php echo $user->lang['MANAGE_USERS']; ?></th>
+			</tr>
+			<tr>
+				<td class="row1" align="center"><select style="width:280px" name="ug_data[]" multiple="multiple" size="5"><?php echo $users; ?></select></td>
+			</tr>
+			<tr>
+				<td class="cat" align="center"><input class="liteoption" type="submit" name="submit_delete" value="<?php echo $user->lang['DELETE']; ?>" /> &nbsp; <input class="liteoption" type="submit" name="submit_options" value="<?php echo $user->lang['SET_OPTIONS']; ?>" /><input type="hidden" name="ug_type" value="user" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
+			</tr>
+		</table></form></td>
+
+		<td align="center"><form method="post" name="admingroups" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
+<?php
+
+	$sql = "SELECT DISTINCT g.group_id, g.group_name
+		FROM " . GROUPS_TABLE . " g, " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
+		WHERE o.auth_option LIKE '" . $sql_option_mode . "_%'
+			AND a.forum_id $sql_forum
+			AND a.auth_option_id = o.auth_option_id
+			AND g.group_id = a.group_id
+		ORDER BY g.group_type DESC, g.group_name ASC";
+	$result = $db->sql_query($sql);
+
+	$groups = '';
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$groups .= '<option value="' . $row['group_id'] . '">' . ((!empty($user->lang['G_' . $row['group_name']])) ? '* ' . $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+	}
+	$db->sql_freeresult($result);
+
+	$sql = "SELECT group_id, group_name
+		FROM " . GROUPS_TABLE . "
+		ORDER BY group_type DESC, group_name";
+	$result = $db->sql_query($sql);
+
+	$group_list = '';
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$group_list .= '<option value="' . $row['group_id'] . '">' . ((!empty($user->lang['G_' . $row['group_name']])) ? '* ' . $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
+	}
+	$db->sql_freeresult($result);
+
+?>
+		<tr>
+			<th><?php echo $user->lang['MANAGE_GROUPS']; ?></th>
+		</tr>
+		<tr>
+			<td class="row1" align="center"><select style="width:280px" name="ug_data[]" multiple="multiple" size="5"><?php echo $groups; ?></select></td>
+		</tr>
+		<tr>
+			<td class="cat" align="center"><input class="liteoption" type="submit" name="submit_delete" value="<?php echo $user->lang['DELETE']; ?>" /> &nbsp; <input class="liteoption" type="submit" name="submit_options" value="<?php echo $user->lang['SET_OPTIONS']; ?>" /><input type="hidden" name="ug_type" value="group" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
+		</tr>
+	</table></form></td>
+
+	</tr>
+	<tr>
+
+		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
+			<tr>
+				<th><?php echo $user->lang['ADD_USERS']; ?></th>
+			</tr>
+			<tr>
+				<td class="row1" align="center"><textarea cols="40" rows="4" name="ug_data[]"></textarea></td>
+			</tr>
+			<tr>
+				<td class="cat" align="center"> <input type="submit" name="submit_options" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" />&nbsp; <input type="submit" name="usersubmit" value="<?php echo $user->lang['FIND_USERNAME']; ?>" class="liteoption" onclick="window.open('<?php echo "../memberlist.$phpEx$SID"; ?>&amp;mode=searchuser&amp;form=2&amp;field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /><input type="hidden" name="ug_type" value="user" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
+			</tr>
+		</table></form></td>
+
+		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
+			<tr>
+				<th><?php echo $user->lang['ADD_GROUPS']; ?></th>
+			</tr>
+			<tr>
+				<td class="row1" align="center"><select name="ug_data[]" multiple="multiple" size="4"><?php echo $group_list; ?></select></td>
+			</tr>
+			<tr>
+				<td class="cat" align="center"> <input type="submit" name="submit_options" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" /><input type="hidden" name="ug_type" value="group" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
+			</tr>
+		</table></form></td>
+	</tr>
+</table>
+
+<?php
+
+}
+// End user and group acl selections
+
+
+// Third possible form, this is the major section of this script. It
+// handles the entry of permission options for all situations
+if (in_array($submit, array('options', 'presetsave', 'presetdel', 'update')) || $mode == 'deps')
+{
+
+	if (!isset($forum_id) && empty($ug_data) && $mode != 'deps')
+	{
+		trigger_error($user->lang['NO_MODE']);
+	}
+
+
+	// Grab the forum details if non-zero forum_id
+	if ($forum_id != 0)
+	{
+		$forum_data = array();
+		$sql = 'SELECT forum_id, forum_name, parent_id  
+			FROM ' . FORUMS_TABLE . '
+			WHERE forum_id';
+		$sql .= (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+		$result = $db->sql_query($sql);
+
+		if (!($forum_data = $db->sql_fetchrow($result)))
+		{
+			trigger_error($user->lang['NO_FORUM']);
+		}
+		$db->sql_freeresult($result);
+	}
+
+
+	// Grab relevant user or group information
+	$ug_ids = $ug_names = $ug_hidden = '';
+	if ($mode != 'deps')
+	{
+		$l_no_error = '';
+		switch ($ug_type)
+		{
+			case 'user':
+				$l_no_error = $user->lang['NO_USER'];
+				$sql = 'SELECT user_id AS id, username AS name 
+					FROM ' . USERS_TABLE . '
+					WHERE user_id';
+				$sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', $ug_data) . ')' : ' = ' . $ug_data;
+				break;
+
+			case 'username':
+				$l_no_error = $user->lang['NO_USER'];
+				$sql = 'SELECT user_id AS id, username AS name 
+					FROM ' . USERS_TABLE . '
+					WHERE username';
+				$sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', preg_replace('#^[\s]*?(.*?)[\s]*?$#', "'\\1'", $ug_data)) . ')' : ' = ' . "'" . trim($ug_data) . "'";
+				break;
+
+			case 'group':
+				$l_no_error = $user->lang['NO_GROUP'];
+				$sql = 'SELECT group_id AS id, group_name AS name 
+					FROM ' . GROUPS_TABLE . '
+					WHERE group_id';
+				$sql .= (is_array($ug_data)) ? ' IN (' . implode(', ', $ug_data) . ')' : ' = ' . $ug_data;
+				break;
+		}
+		$result = $db->sql_query($sql);
+
+		if (!$row = $db->sql_fetchrow($result))
+		{
+			trigger_error($l_no_error);
+		}
+		unset($l_no_error);
+		unset($ug_data);
+
+		// Store the user_ids and names for later use
+		do 
+		{
+			$ug_names .= (($ug_names != '') ? ', ' : '') . $row['name'];
+			$ug_ids .= (($ug_ids != '') ? ', ' : '') . $row['id'];
+			$ug_hidden .= '<input type="hidden" name="ug_data[]" value="' . $row['id'] . '" />';
 		}
+		while ($row = $db->sql_fetchrow($result));
+		$db->sql_freeresult($result);
+	}
+
 
-		// Look for custom presets
-		$sql = "SELECT preset_id, preset_name, preset_data  
-			FROM " . ACL_PRESETS_TABLE . " 
-			WHERE preset_type = '$sql_option_mode' 
-			ORDER BY preset_id ASC";
+	// Grab the list of options ... if we're in deps mode we want all options, 
+	// else we skip the master options
+	$sql_founder = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
+	$sql_limit_option = ($mode == 'deps') ? '' : "AND auth_option <> '" . $sql_option_mode . "_'";
+	$sql = "SELECT auth_option_id, auth_option
+		FROM " . ACL_OPTIONS_TABLE . "
+		WHERE auth_option LIKE '" . $sql_option_mode . "_%' 
+			$sql_limit_option 
+			$sql_founder";
+	$result = $db->sql_query($sql);
+
+	$auth_options = array();
+	while ($row = $db->sql_fetchrow($result))
+	{
+		$auth_options[] = $row;
+	}
+	$db->sql_freeresult($result);
+
+	unset($sql_limit_option);
+
+
+	// Now we'll build a list of preset options ...
+	$preset_options = $preset_js = $preset_update_options = '';
+	$holding = array();
+
+	// Do we have a parent forum? If so offer option to inherit from that
+	if ($forum_data['parent_id'] != 0)
+	{
+		switch ($ug_type)
+		{
+			case 'group':
+				$sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_data['parent_id'] . " AND a.group_id IN ($ug_ids)";
+				break;
+
+			case 'user':
+				$sql = "SELECT o.auth_option, a.auth_setting FROM " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' AND a.auth_option_id = o.auth_option_id AND a.forum_id = " . $forum_data['parent_id'] . " AND a.user_id IN ($ug_ids)";
+				break;
+		}
 		$result = $db->sql_query($sql);
 
 		if ($row = $db->sql_fetchrow($result))
 		{
 			do
 			{
-				$preset_update_options .= '<option value="' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
-				$preset_options .= '<option value="preset_' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
+				switch ($row['auth_setting'])
+				{
+					case ACL_YES:
+						$holding['allow'] .= $row['auth_option'] . ', ';
+						break;
 
-				$preset_data = unserialize($row['preset_data']);
-				
-				foreach ($preset_data as $preset_type => $preset_type_ary)
+					case ACL_NO:
+						$holding['deny'] .= $row['auth_option'] . ', ';
+						break;
+
+					case ACL_UNSET:
+						$holding['inherit'] .= $row['auth_option'] . ', ';
+						break;
+				}
+			}
+			while ($row = $db->sql_fetchrow($result));
+
+			$preset_options .= '<option value="preset_0">' . $user->lang['INHERIT_PARENT'] . '</option>';
+			$preset_js .= "\tpresets['preset_0'] = new Array();" . "\n";
+			$preset_js .= "\tpresets['preset_0'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
+		}
+		$db->sql_freeresult($result);
+	}
+
+	// Look for custom presets
+	$sql = "SELECT preset_id, preset_name, preset_data  
+		FROM " . ACL_PRESETS_TABLE . " 
+		WHERE preset_type = '" . (($mode == 'deps') ? 'f' : $sql_option_mode) . "' 
+		ORDER BY preset_id ASC";
+	$result = $db->sql_query($sql);
+
+	if ($row = $db->sql_fetchrow($result))
+	{
+		do
+		{
+			$preset_update_options .= '<option value="' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
+			$preset_options .= '<option value="preset_' . $row['preset_id'] . '">' . $row['preset_name'] . '</option>';
+
+			$preset_data = unserialize($row['preset_data']);
+			
+			foreach ($preset_data as $preset_type => $preset_type_ary)
+			{
+				$holding[$preset_type] = '';
+				foreach ($preset_type_ary as $preset_option)
 				{
-					$holding[$preset_type] = '';
-					foreach ($preset_type_ary as $preset_option)
-					{
-						$holding[$preset_type] .= "$preset_option, ";
-					}
+					$holding[$preset_type] .= "$preset_option, ";
 				}
+			}
+
+			$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
+			$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['yes'] . "', '" . $holding['no'] . "', '" . $holding['unset'] . "');\n";
+		}
+		while ($row = $db->sql_fetchrow($result));
+	}
+	$db->sql_freeresult($result);
+
+	unset($holding);
+
+
+	// If we aren't looking @ deps then we try and grab existing sessions for
+	// the given forum and user/group
+	if ($mode != 'deps' && $auth_settings == '')
+	{
+		switch ($ug_type)
+		{
+			case 'group':
+				$sql_table = ACL_GROUPS_TABLE . ' a ';
+				$sql_join = 'a.group_id';
+				break;
+
+			case 'user':
+				$sql_table = ACL_USERS_TABLE . ' a, ';
+				$sql_join = 'a.user_id';;
+				break;
+		}
+	
+		$sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+		$sql = "SELECT o.auth_option, MIN(a.auth_setting) AS min_auth_setting 
+				FROM $sql_table, " . ACL_OPTIONS_TABLE . " o 
+				WHERE o.auth_option LIKE '" . $sql_option_mode . "_%' 
+					AND a.auth_option_id = o.auth_option_id 
+					AND a.forum_id $sql_forum 
+					AND $sql_join IN ($ug_ids)
+				GROUP BY o.auth_option";
+		$result = $db->sql_query($sql);
 
-				$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new Array();" . "\n";
-				$preset_js .= "\tpresets['preset_" . $row['preset_id'] . "'] = new preset_obj('" . $holding['allow'] . "', '" . $holding['deny'] . "', '" . $holding['inherit'] . "');\n";
+		$auth_settings = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$auth_settings[$row['auth_option']] = $row['min_auth_setting'];
+		}
+		$db->sql_freeresult($result);
+	}
+	else if ($mode == 'deps')
+	{
+		$sql_forum = (is_array($forum_id)) ? ' IN (' . implode(', ', $forum_id) . ')' : ' = ' . $forum_id;
+		$sql_auth_option = (preg_match('#^[a-z]_$#', $auth_option)) ? " LIKE '$auth_option%'" : " IN ('" . $auth_option . "', '$sql_option_mode')";
+		$sql = "SELECT auth_deps  
+				FROM " . ACL_DEPS_TABLE . " 
+				WHERE auth_option $sql_auth_option  
+					AND forum_id $sql_forum 
+					AND auth_setting = $auth_setting";
+		$result = $db->sql_query($sql);
+
+		$auth_settings = (!isset($auth_settings)) ? array() : $auth_settings;
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$temp = unserialize($row['auth_deps']);
+			foreach ($temp as $option => $setting)
+			{
+				$auth_settings[$option] = (!isset($auth_settings[$option]) || $setting < $auth_settings[$option]) ? $setting : $auth_settings[$option];
 			}
-			while ($row = $db->sql_fetchrow($result));
 		}
 		$db->sql_freeresult($result);
 
-		unset($holding);
+		unset($temp);
+		unset($option);
+		unset($setting);
+		unset($sql_auth_option);
+	}
 
 ?>
 
@@ -312,11 +850,11 @@ page_header($l_title);
 
 ?>
 
-	function preset_obj(allow, deny, inherit)
+	function preset_obj(yes, no, unset)
 	{
-		this.allow = allow;
-		this.deny = deny;
-		this.inherit = inherit;
+		this.yes = yes;
+		this.no = no;
+		this.unset = unset;
 	}
 
 	function use_preset(option)
@@ -328,30 +866,33 @@ page_header($l_title);
 			for (i = 0; i < document.acl.length; i++)
 			{
 				var elem = document.acl.elements[i];
-				if (elem.name.indexOf('option') == 0)
+				if (elem.name.indexOf('settings') == 0)
 				{
 					switch (option)
 					{
 						case 'all_yes':
-							if (elem.value == <?php echo ACL_ALLOW; ?>)
+							if (elem.value == <?php echo ACL_YES; ?>)
 								elem.checked = true;
 							break;
+
 						case 'all_no':
-							if (elem.value == <?php echo ACL_DENY; ?>)
+							if (elem.value == <?php echo ACL_NO; ?>)
 								elem.checked = true;
 							break;
+
 						case 'all_unset':
-							if (elem.value == <?php echo ACL_INHERIT; ?>)
+							if (elem.value == <?php echo ACL_UNSET; ?>)
 								elem.checked = true;
 							break;
+
 						default:
-						    option_name = elem.name.substr(7, elem.name.length - 8);
+						    option_name = elem.name.substr(9, elem.name.length - 10);
 
-							if (presets[option].allow.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_ALLOW; ?>)
+							if (presets[option].yes.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_YES; ?>)
 								elem.checked = true;
-							else if (presets[option].deny.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_DENY; ?>)
+							else if (presets[option].no.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_NO; ?>)
 								elem.checked = true;
-							else if (presets[option].inherit.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_INHERIT; ?>)
+							else if (presets[option].unset.indexOf(option_name + ',') != -1 && elem.value == <?php echo ACL_UNSET; ?>)
 								elem.checked = true;
 							break;
 					}
@@ -382,59 +923,33 @@ page_header($l_title);
 
 <p><?php echo $l_title_explain; ?></p>
 
-<form method="post" name="acl" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table cellspacing="2" cellpadding="0" border="0" align="center">
 <?php
 
-		// The above query grabs the list of options for the required mode ... 
-		// however for the deps system we need to grab the set of options for 
-		// which dependencies are to be set
-		if ($mode == 'deps')
-		{
-			// Turn auth_options array above into the dep_auth_options list
-			$dep_auth_options = $dep_auth_values = $dep_auth_forums = '';
-			foreach ($auth_options as $option)
-			{
-				$dep_auth_options .= '<option value="' . $option['auth_option'] . '"' . (($option['auth_option'] == $auth_option) ? ' selected="selected"' : '') . '>' . ((!empty($user->lang['acl_' . $option['auth_option']])) ? $user->lang['acl_' . $option['auth_option']] : (($option['auth_option'] == $sql_option_mode . '_') ? 'Any option' : ucfirst(preg_replace('#.*?_#', '', $option['auth_option'])))) . '</option>';
-			}
-			unset($auth_options);
-			unset($option);
+	if ($submit == 'update')
+	{
 
-			// Define the Yes, No, Unset selections
-			$values = array(ACL_DENY => $user->lang['NO'], ACL_ALLOW => $user->lang['YES'], ACL_INHERIT => $user->lang['UNSET']);
-			foreach ($values as $value => $option)
-			{
-				$dep_auth_values .= '<option value="' . $value . '"' . (($value === $auth_setting) ? ' selected="selected"' : '') . '>' . $option . '</option>';
-			}
-			unset($values);
-			unset($option);
+?>
+<h1 style="color:red">Warning!</h1>
 
-			$dep_auth_forums = make_forum_select($forum_id, false, false);
+<p>A number of dependencies have been set for the changes you have requested. You can skip setting these dependences if you wish by clicking the appropriate checkbox. You can also modify the dependencies as required. Clicking update will commit your previous setting changes and those listed below (unless you choose to skip them).</p>
 
-			// We've grabbed the list of options for this mode now we need to
-			// grab the list of options we can set dependencies for
-			switch ($sql_option_mode)
-			{
-				case 'a':
-					$sql_auth_option = "(auth_option LIKE 'a_%' AND auth_option <> 'a_') OR (auth_option LIKE 'm_%' AND auth_option <> 'm_')";
-					break;
-				case 'm':
-					$sql_auth_option = "auth_option LIKE 'm_%' AND auth_option <> 'm_'";
-					break;
-			}
+<?php
 
-			$founder_sql = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
-			$sql = "SELECT auth_option
-				FROM " . ACL_OPTIONS_TABLE . "
-				WHERE $sql_auth_option 
-					$founder_sql";
-			$result = $db->sql_query($sql);
+	}
 
-			$auth_options = array();
-			while ($row = $db->sql_fetchrow($result))
-			{
-				$auth_options[] = $row;
-			}
-			$db->sql_freeresult($result);
+?>
+
+<form method="post" name="acl" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table cellspacing="2" cellpadding="0" border="0" align="center">
+<?php
+
+	// The above query grabs the list of options for the required mode ... 
+	// however for the deps system we need to grab the set of options for 
+	// which dependencies are to be set
+
+	// We output this for both deps and when update is requested where
+	// deps exist
+	if ($mode == 'deps' || $submit == 'update')
+	{
 
 ?>
 	<tr>
@@ -442,34 +957,80 @@ page_header($l_title);
 			<tr>
 				<th colspan="2">&nbsp;</th>
 			</tr>
+<?php
+
+	}
+
+	if ($mode == 'deps')
+	{
+		// Turn auth_options array above into the dep_auth_options list
+		$dep_auth_options = $dep_auth_values = $dep_auth_forums = '';
+		foreach ($auth_options as $option)
+		{
+			$dep_auth_options .= '<option value="' . $option['auth_option'] . '"' . (($option['auth_option'] == $auth_option) ? ' selected="selected"' : '') . '>' . ((!empty($user->lang['acl_' . $option['auth_option']])) ? $user->lang['acl_' . $option['auth_option']] : (($option['auth_option'] == $sql_option_mode . '_') ? 'Any option' : ucfirst(preg_replace('#.*?_#', '', $option['auth_option'])))) . '</option>';
+		}
+		unset($auth_options);
+		unset($option);
+
+
+		// Define the Yes, No, Unset selections
+		$values = array(ACL_NO => $user->lang['NO'], ACL_YES => $user->lang['YES'], ACL_UNSET => $user->lang['UNSET']);
+		foreach ($values as $value => $option)
+		{
+			$dep_auth_values .= '<option value="' . $value . '"' . (($value === $auth_setting) ? ' selected="selected"' : '') . '>' . $option . '</option>';
+		}
+		unset($values);
+		unset($option);
+
+
+		// We've grabbed the list of options for this mode now we need to
+		// grab the list of options we can set dependencies for
+		$founder_sql = ($user->data['user_founder']) ? ' AND founder_only <> 1' : '';
+		$sql = "SELECT auth_option
+			FROM " . ACL_OPTIONS_TABLE . "
+			WHERE auth_option LIKE 'f_%' 
+				AND auth_option <> 'f_' 
+				$founder_sql";
+		$result = $db->sql_query($sql);
+
+		$auth_options = array();
+		while ($row = $db->sql_fetchrow($result))
+		{
+			$auth_options[] = $row;
+		}
+		$db->sql_freeresult($result);
+
+?>
 			<tr>
 				<td class="row1" width="150">Changing option:</td>
-				<td class="row2"><select name="dep_option"><?php echo $dep_auth_options; ?></select></td>
+				<td class="row2"><select name="option" onchange="this.form.submit()"><?php echo $dep_auth_options; ?></select></td>
 			</tr>
 			<tr>
 				<td class="row1" width="150">To value:</td>
-				<td class="row2"><select name="dep_value"><option value="-1"<?php
+				<td class="row2"><select name="setting" onchange="this.form.submit()"><option value="0"<?php
 
-			echo ($dep_value == -1) ? ' selected="selected"' : '';
+		echo ($dep_value == 0) ? ' selected="selected"' : '';
 	
 ?>>Choose value</option><?php echo $dep_auth_values; ?></select></td>
 			</tr>
+<?php
+
+		unset($dep_auth_options);
+		unset($dep_auth_values);
+
+	}
+
+	// We output this for both deps and when update is requested where
+	// deps exist
+	if ($mode == 'deps' || $submit == 'update')
+	{
+
+?>
 			<tr>
 				<td class="row1" width="150">Will set options in: <br /><span class="gensmall"></span></td>
-				<td class="row2"><select name="f[]" multiple="4" onchange="this.form.submit()"><option class="sep" value="0"<?php 
-					
-			echo (in_array(0, $forum_id)) ? ' selected="selected"' : ''; 
-				
-?>>Current forums</option><?php 
-			
-			if ($dep_type == 'mod')
-			{
-			
-?><option class="sep" value="-1">Affected forum</option><?php 
-	
-			}
+				<td class="row2"><select name="f[]" multiple="4" onchange="this.form.submit()"><?php 
 		
-			echo $dep_auth_forums; 
+		echo make_forum_select($forum_id, false); 
 		
 ?></select></td>
 			</tr>
@@ -477,20 +1038,19 @@ page_header($l_title);
 	</tr>
 <?php
 
-			unset($dep_auth_options);
-			unset($dep_auth_values);
-			unset($dep_forum_options);
-			
-		}
-		// End deps output
+		unset($dep_forum_options);
+
+	}
+	// End deps output
+
 
-		// This is the main listing of options
+	// This is the main listing of options
 
 ?>
 	<tr>
 		<td align="right"><?php echo $user->lang['PRESETS']; ?>: <select name="set" onchange="use_preset(this.options[this.selectedIndex].value);"><option class="sep"><?php echo $user->lang['SELECT'] . ' -&gt;'; ?></option><option value="all_yes"><?php echo $user->lang['ALL_YES']; ?></option><option value="all_no"><?php echo $user->lang['ALL_NO']; ?></option><option value="all_unset"><?php echo $user->lang['ALL_UNSET']; ?></option><?php 
 
-		echo ($preset_options) ? '<option class="sep">' . $user->lang['USER_PRESETS'] . ' -&gt;' . '</option>' . $preset_options : ''; 
+	echo ($preset_options) ? '<option class="sep">' . $user->lang['USER_PRESETS'] . ' -&gt;' . '</option>' . $preset_options : ''; 
 
 ?></select></td>
 		</tr>
@@ -504,64 +1064,54 @@ page_header($l_title);
 				</tr>
 <?php
 
-		for($i = 0; $i < sizeof($auth_options); $i++)
-		{
-			$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
-
-			$l_auth_option = (!empty($user->lang['acl_' . $auth_options[$i]['auth_option']])) ? $user->lang['acl_' . $auth_options[$i]['auth_option']] : ucfirst(preg_replace('#.*?_#', '', $auth_options[$i]['auth_option']));
+	for($i = 0; $i < sizeof($auth_options); $i++)
+	{
+		$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
 
+		// Try and output correct language strings, else output prettyfied auth_option
+		$l_auth_option = (!empty($user->lang['acl_' . $auth_options[$i]['auth_option']])) ? $user->lang['acl_' . $auth_options[$i]['auth_option']] : ucfirst(preg_replace('#.*?_#', '', $auth_options[$i]['auth_option']));
 
-			
-			$selected_yes = $selected_no = $selected_unset = '';
-			if (!empty($_POST['presetsave']) || !empty($_POST['presetdel']))
-			{
-				$selected_yes = ($_POST['option'][$auth_settings[$i]['auth_option']] == ACL_ALLOW) ? ' checked="checked"' : '';
-				$selected_no = ($_POST['option'][$auth_settings[$i]['auth_option']] == ACL_DENY) ? ' checked="checked"' : '';
-				$selected_unset = ($_POST['option'][$auth_settings[$i]['auth_option']] == ACL_INHERIT) ? ' checked="checked"' : '';
-			}
-			else
-			{
-				$selected_yes = (isset($auth_settings[$auth_options[$i]['auth_option']]) && $auth_settings[$auth_options[$i]['auth_option']] == ACL_ALLOW) ? ' checked="checked"' : '';
-				$selected_no = (isset($auth_settings[$auth_options[$i]['auth_option']]) && $auth_settings[$auth_options[$i]['auth_option']] == ACL_DENY) ? ' checked="checked"' : '';
-				$selected_unset = (!isset($auth_settings[$auth_options[$i]['auth_option']]) || $auth_settings[$auth_options[$i]['auth_option']] == ACL_INHERIT) ? ' checked="checked"' : '';
-			}
+		
+		// Which option should we select?
+		$selected_yes = (isset($auth_settings[$auth_options[$i]['auth_option']]) && $auth_settings[$auth_options[$i]['auth_option']] == ACL_YES) ? ' checked="checked"' : '';
+		$selected_no = (isset($auth_settings[$auth_options[$i]['auth_option']]) && $auth_settings[$auth_options[$i]['auth_option']] == ACL_NO) ? ' checked="checked"' : '';
+		$selected_unset = (!isset($auth_settings[$auth_options[$i]['auth_option']]) || $auth_settings[$auth_options[$i]['auth_option']] == ACL_UNSET) ? ' checked="checked"' : '';
 
 
-			// Output dependency links?
-			$dep_x_yes = $dep_x_no = $dep_x_unset = '';
-			if ($mode != 'deps')
-			{
-				$dep_x_open = ' <a class="gensmall" style="vertical-align:top" href="javascript:open_win(\'' . "admin_permissions.$phpEx$SID&amp;mode=deps&amp;type=$mode&amp;option=" . $auth_options[$i]['auth_option'] . "&amp;setting=";
-				$dep_x_close = '\', 500, 500)" title="Set Dependency">X</a>';
+		// Output dependency links?
+		$dep_x_yes = $dep_x_no = $dep_x_unset = $dep_x_open = $dep_x_close = '';
+		if (in_array($mode, array('admin', 'supermod', 'mod')) && $auth->acl_get('a_deps') && $submit != 'update')
+		{
+			$dep_x_open = ' <a class="gensmall" style="vertical-align:top" href="javascript:open_win(\'' . "admin_permissions.$phpEx$SID&amp;mode=deps&amp;type=$mode&amp;" . ((is_array($forum_id)) ? implode('&amp;', preg_replace('#([0-9]+)#', 'f[]=\1', $forum_id)) : "f=$forum_id") . '&amp;option=' . $auth_options[$i]['auth_option'] . "&amp;setting=";
+			$dep_x_close = '\', 500, 500)" title="Set Dependency">X</a>';
 
-				$dep_x_yes = $dep_x_open . ACL_ALLOW . $dep_x_close;
-				$dep_x_no = $dep_x_open . ACL_DENY . $dep_x_close;
-				$dep_x_unset = $dep_x_open . ACL_INHERIT . $dep_x_close;
-			}
+			$dep_x_yes = $dep_x_open . ACL_YES . $dep_x_close;
+			$dep_x_no = $dep_x_open . ACL_NO . $dep_x_close;
+			$dep_x_unset = $dep_x_open . ACL_UNSET . $dep_x_close;
+		}
 
 ?>
 			<tr>
 				<td class="<?php echo $row_class; ?>" nowrap="nowrap"><?php echo $l_auth_option; ?>&nbsp;</td>
 
-				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_ALLOW; ?>"<?php echo $selected_yes; ?> /><?php echo $dep_x_yes; ?></td>
+				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_YES; ?>"<?php echo $selected_yes; ?> /><?php echo $dep_x_yes; ?></td>
 
-				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_DENY; ?>"<?php echo $selected_no; ?> /><?php echo $dep_x_no; ?></td>
+				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_NO; ?>"<?php echo $selected_no; ?> /><?php echo $dep_x_no; ?></td>
 
-				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_INHERIT; ?>"<?php echo $selected_unset; ?> /><?php echo $dep_x_unset; ?></td>
+				<td class="<?php echo $row_class; ?>" align="center"><input type="radio" name="settings[<?php echo $auth_options[$i]['auth_option']; ?>]" value="<?php echo ACL_UNSET; ?>"<?php echo $selected_unset; ?> /><?php echo $dep_x_unset; ?></td>
 			</tr>
 <?php
 
-		}
+	}
 
-		// Subforum inheritance
-		if (($sql_option_mode == 'f' || $sql_option_mode == 'm') && $mode != 'deps')
+	// Subforum inheritance
+	if (($sql_option_mode == 'f' || ($sql_option_mode == 'm' && $mode != 'supermod')) && $mode != 'deps' && $submit != 'update')
+	{
+		$children = get_forum_branch($forum_id, 'children', 'descending', false);
+
+		if (!empty($children))
 		{
-			// TMP
-			$forum_id = $forum_id[0];
-			$children = get_forum_branch($forum_id, 'children', 'descending', false);
 
-			if (!empty($children))
-			{
 ?>
 			<tr>
 				<th colspan="4"><?php echo $user->lang['ACL_SUBFORUMS']; ?></th>
@@ -572,8 +1122,9 @@ page_header($l_title);
 						<td class="gensmall" colspan="4" height="16" align="center"><?php echo $user->lang['ACL_SUBFORUMS_EXPLAIN']; ?></td>
 					</tr>
 <?php
-				foreach ($children as $row)
-				{
+
+			foreach ($children as $row)
+			{
 
 ?>
 					<tr>
@@ -581,7 +1132,7 @@ page_header($l_title);
 					</tr>
 <?php
 
-				}
+			}
 
 ?>
 					<tr>
@@ -591,13 +1142,34 @@ page_header($l_title);
 			</tr>
 <?php
 
-			}
 		}
+	}
 
-		// Display event/cron radio buttons
-		if ($auth->acl_gets('a_events', 'a_cron') && $mode != 'deps')
-		{
-			$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
+
+	// Output "Skip dependencies" checkbox
+	if ($submit == 'update')
+	{
+
+?>
+			<tr>
+				<th colspan="4"><?php echo "Dependencies" ?></th>
+			</tr>
+			<tr>
+				<td class="row1" colspan="4"><table width="100%" cellspacing="1" cellpadding="0" border="0">
+					<tr>
+						<td><input type="checkbox" name="skipdeps value="0" /> <?php echo "Skip these dependencies"; ?></td>
+					</tr>
+				</table></td>
+			</tr>
+<?php
+
+	}
+
+
+	// Display event/cron radio buttons
+	if ($auth->acl_gets('a_events', 'a_cron') && $mode != 'deps' && $submit != 'update')
+	{
+		$row_class = ($row_class == 'row1') ? 'row2' : 'row1';
 
 ?>
 			<!-- tr>
@@ -626,11 +1198,11 @@ page_header($l_title);
 			</tr -->
 <?php
 
-		}
+	}
 
 ?>
 			<tr>
-				<td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="update" value="<?php echo $user->lang['UPDATE']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="cancel" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="type" value="<?php echo $_POST['type']; ?>" /><?php echo $ug_hidden; ?></td>
+				<td class="cat" colspan="4" align="center"><input class="mainoption" type="submit" name="submit_update" value="<?php echo $user->lang['UPDATE']; ?>" />&nbsp;&nbsp;<input class="liteoption" type="submit" name="submit_cancel" value="<?php echo $user->lang['CANCEL']; ?>" /><input type="hidden" name="ug_type" value="<?php echo $ug_type; ?>" /><?php echo $ug_hidden; ?><?php echo ($mode == 'deps') ? '<input type="hidden" name="type" value="' . $type . '" />' : '<input type="hidden" name="f" value="' . $forum_id . '" />'; ?></td>
 			</tr>
 		</table>
 
@@ -649,7 +1221,7 @@ page_header($l_title);
 						<td nowrap="nowrap"><?php echo $user->lang['SELECT_PRESET']; ?>: </td>
 						<td><select name="presetoption"><option class="sep" value="-1"><?php echo $user->lang['SELECT'] . ' -&gt;'; ?></option><?php 
 
-				echo $preset_update_options;
+	echo $preset_update_options;
 			
 		?></select></td>
 					</tr>
@@ -660,7 +1232,7 @@ page_header($l_title);
 				</table></td>
 			</tr>
 			<tr>
-				<td class="cat" colspan="4" align="center"><input class="liteoption" type="submit" name="presetsave" value="<?php echo $user->lang['SAVE']; ?>" /> &nbsp;<input class="liteoption" type="submit" name="presetdel" value="<?php echo $user->lang['DELETE']; ?>" /><input type="hidden" name="advanced" value="true" /></td>
+				<td class="cat" colspan="4" align="center"><input class="liteoption" type="submit" name="submit_presetsave" value="<?php echo $user->lang['SAVE']; ?>" /> &nbsp;<input class="liteoption" type="submit" name="submit_presetdel" value="<?php echo $user->lang['DELETE']; ?>" /></td>
 			</tr>
 		</table></td>
 	</tr>
@@ -668,227 +1240,9 @@ page_header($l_title);
 
 <?php
 
-
-page_footer();
-
-
-
-
-
-
-
-
-//
-//
-// Add/Remove/Alter user/group settings
-//
-//
-
-?>
-
-<p><?php echo $l_title_explain; ?></p>
-
-<table width="100%" cellspacing="0" cellpadding="0" border="0">
-	<tr>
-		<td align="center"><h1><?php echo $user->lang['USERS']; ?></h1></td>
-		<td align="center"><h1><?php echo $user->lang['GROUPS']; ?></h1></td>
-	</tr>
-	<tr>
-
-		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-<?php
-
-	$sql = "SELECT DISTINCT u.user_id, u.username
-		FROM " . USERS_TABLE . " u, " . ACL_USERS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
-		WHERE o.auth_option LIKE '" . $sql_option_mode . "_%'
-			AND a.auth_option_id = o.auth_option_id
-			$forum_sql
-			AND u.user_id = a.user_id
-		ORDER BY u.username, u.user_regdate ASC";
-	$result = $db->sql_query($sql);
-
-	$users = '';
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$users .= '<option value="' . $row['user_id'] . '">' . $row['username'] . '</option>';
-	}
-	$db->sql_freeresult($result);
-
-?>
-			<tr>
-				<th><?php echo $user->lang['MANAGE_USERS']; ?></th>
-			</tr>
-			<tr>
-				<td class="row1" align="center"><select style="width:280px" name="entries[]" multiple="multiple" size="5"><?php echo $users; ?></select></td>
-			</tr>
-			<tr>
-				<td class="cat" align="center"><input class="liteoption" type="submit" name="delete" value="<?php echo $user->lang['DELETE']; ?>" /> &nbsp; <input class="liteoption" type="submit" name="advanced" value="<?php echo $user->lang['SET_OPTIONS']; ?>" /><input type="hidden" name="type" value="user" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="option" value="<?php echo $sql_option_mode; ?>" /></td>
-			</tr>
-		</table></form></td>
-
-		<td align="center"><form method="post" name="admingroups" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-<?php
-
-	$sql = "SELECT DISTINCT g.group_id, g.group_name
-		FROM " . GROUPS_TABLE . " g, " . ACL_GROUPS_TABLE . " a, " . ACL_OPTIONS_TABLE . " o
-		WHERE o.auth_option LIKE '" . $sql_option_mode . "_%'
-			$forum_sql
-			AND a.auth_option_id = o.auth_option_id
-			AND g.group_id = a.group_id
-		ORDER BY g.group_type DESC, g.group_name ASC";
-	$result = $db->sql_query($sql);
-
-	$groups = '';
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$groups .= '<option value="' . $row['group_id'] . '">' . ((!empty($user->lang['G_' . $row['group_name']])) ? '* ' . $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-	}
-	$db->sql_freeresult($result);
-
-	$sql = "SELECT group_id, group_name
-		FROM " . GROUPS_TABLE . "
-		ORDER BY group_type DESC, group_name";
-	$result = $db->sql_query($sql);
-
-	$group_list = '';
-	while ($row = $db->sql_fetchrow($result))
-	{
-		$group_list .= '<option value="' . $row['group_id'] . '">' . ((!empty($user->lang['G_' . $row['group_name']])) ? '* ' . $user->lang['G_' . $row['group_name']] : $row['group_name']) . '</option>';
-	}
-	$db->sql_freeresult($result);
-
-?>
-		<tr>
-			<th><?php echo $user->lang['MANAGE_GROUPS']; ?></th>
-		</tr>
-		<tr>
-			<td class="row1" align="center"><select style="width:280px" name="entries[]" multiple="multiple" size="5"><?php echo $groups; ?></select></td>
-		</tr>
-		<tr>
-			<td class="cat" align="center"><input class="liteoption" type="submit" name="delete" value="<?php echo $user->lang['DELETE']; ?>" /> &nbsp; <input class="liteoption" type="submit" name="advanced" value="<?php echo $user->lang['SET_OPTIONS']; ?>" /><input type="hidden" name="type" value="group" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /><input type="hidden" name="option" value="<?php echo $sql_option_mode; ?>" /></td>
-		</tr>
-	</table></form></td>
-
-	</tr>
-	<tr>
-
-		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" width="90%" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th><?php echo $user->lang['ADD_USERS']; ?></th>
-			</tr>
-			<tr>
-				<td class="row1" align="center"><textarea cols="40" rows="4" name="entries"></textarea></td>
-			</tr>
-			<tr>
-				<td class="cat" align="center"> <input type="submit" name="add" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" />&nbsp; <input type="submit" name="usersubmit" value="<?php echo $user->lang['FIND_USERNAME']; ?>" class="liteoption" onclick="window.open('<?php echo "../memberlist.$phpEx$SID"; ?>&amp;mode=searchuser&amp;form=2&amp;field=entries', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /><input type="hidden" name="type" value="user" /><input type="hidden" name="advanced" value="1" /><input type="hidden" name="new" value="1" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
-			</tr>
-		</table></form></td>
-
-		<td><form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table width="90%" class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-			<tr>
-				<th><?php echo $user->lang['ADD_GROUPS']; ?></th>
-			</tr>
-			<tr>
-				<td class="row1" align="center"><select name="entries[]" multiple="multiple" size="4"><?php echo $group_list; ?></select></td>
-			</tr>
-			<tr>
-				<td class="cat" align="center"> <input type="submit" name="add" value="<?php echo $user->lang['SUBMIT']; ?>" class="mainoption" />&nbsp; <input type="reset" value="<?php echo $user->lang['RESET']; ?>" class="liteoption" /><input type="hidden" name="type" value="group" /><input type="hidden" name="advanced" value="1" /><input type="hidden" name="new" value="1" /><input type="hidden" name="f" value="<?php echo $forum_id; ?>" /></td>
-			</tr>
-		</table></form></td>
-	</tr>
-</table>
-
-<?php
-
-	page_footer();
-
-
-
-
-
-
-
-//
-//
-// Select a forum, user or group
-//
-//
-
-
-
-
-?>
-
-<h1><?php echo $l_title; ?></h1>
-
-<p><?php echo $l_title_explain ?></p>
-
-<form method="post" action="<?php echo "admin_permissions.$phpEx$SID&amp;mode=$mode"; ?>"><table class="bg" cellspacing="1" cellpadding="4" border="0" align="center">
-<?php
-
-// Mode specific markup
-switch ($mode)
-{
-	case 'forums':
-	case 'moderators':
-
-?>
-	<tr>
-		<th align="center"><?php echo $user->lang['LOOK_UP_FORUM']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">&nbsp;<select name="f"><?php echo make_forum_select(false, false, false); ?></select> &nbsp;<input type="submit" value="<?php echo $user->lang['LOOK_UP_FORUM']; ?>" class="mainoption" />&nbsp;</td>
-	</tr>
-<?php
-		
-		break;
-
-	case 'users':
-?>
-	<tr>
-		<th align="center"><?php echo $user->lang['Select_a_User']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center"><input type="text" class="post" name="username" maxlength="50" size="20" /> <input type="submit" name="submituser" value="<?php echo $user->lang['Look_up_user']; ?>" class="mainoption" /> <input type="submit" name="usersubmit" value="<?php echo $user->lang['FIND_USERNAME']; ?>" class="liteoption" onClick="window.open('<?php echo "../memberlist.$phpEx$SID&amp;mode=searchuser&amp;field=username"; ?>', '_phpbbsearch', 'HEIGHT=500,resizable=yes,scrollbars=yes,WIDTH=740');return false;" /><input type="hidden" name="type" value="user" /></td>
-	</tr>
-<?php
-		break;
-
-	case 'groups':
-		// Generate list of groups
-		$sql = "SELECT group_id, group_name    
-			FROM " . GROUPS_TABLE . " 
-			ORDER BY group_type DESC";
-		$result = $db->sql_query($sql);
-
-		$group_options = '';
-		if ($row = $db->sql_fetchrow($result))
-		{
-			do
-			{
-				$group_options .= (($group_options != '') ? ', ' : '') . '<option value="' . $row['group_id'] . '">' . $row['group_name'] . '</option>';
-			}
-			while ($row = $db->sql_fetchrow($result));
-		}
-		$db->sql_freeresult($result);
-
-?>
-	<tr>
-		<th align="center"><?php echo $user->lang['SELECT_A_GROUP']; ?></th>
-	</tr>
-	<tr>
-		<td class="row1" align="center">&nbsp;<select name="g"><?php echo $group_options; ?></select> &nbsp;<input type="submit" value="<?php echo $user->lang['LOOK_UP_GROUP']; ?>" class="mainoption" /><input type="hidden" name="type" value="group" />&nbsp;</td>
-	</tr>
-<?php
-		break;
-
 }
 
-?>
-</table></form>
-
-<?php
-
+// Output page footer
 page_footer();
 
 ?>
 \ No newline at end of file
author	Paul S. Owen <psotfx@users.sourceforge.net>	2003-04-12 17:07:25 +0000
committer	Paul S. Owen <psotfx@users.sourceforge.net>	2003-04-12 17:07:25 +0000
commit	32f0680b3060977bc9bee3c4df3a30a9648a43c9 (patch)
tree	3d7574fe99e4f9b10b70298120a26354f06ebf87 /phpBB/adm
parent	793182218a4e45fd6e28295e1f07e966922d2db1 (diff)
download	forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.gz forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.bz2 forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.tar.xz forums-32f0680b3060977bc9bee3c4df3a30a9648a43c9.zip