← All changes | tpl/userProfileEditForm.php +15 -7 1.0 → 1.1.1 View file →

		@@ -15,17 +15,20 @@
15	15	* @link http://wordpress.org/extend/plugins/user-access-manager/
16	16	*/
17	17
18	18	global $userAccessManager, $wpdb;
19		-$uamUserGroups
20		- = &$userAccessManager->getAccessHandler()->getUserGroups();
	19	+$uamUserGroups = &$userAccessManager->getAccessHandler()->getUserGroups();
	20	+
	21	+$objectType = 'user';
21	22
22	23	if (isset($_GET['user_id'])) {
23	24	$objectId = $_GET['user_id'];
24	25	$editUserData = get_userdata($objectId);
25	26
26		- $userGroupsForObject
27		- = &$userAccessManager->getAccessHandler()->getUserGroupsForUser($objectId);
	27	+ $userGroupsForObject = &$userAccessManager->getAccessHandler()->getUserGroupsForObject(
	28	+ $objectType,
	29	+ $objectId
	30	+ );
28	31	} else {
29	32	$userGroupsForObject = array();
30	33	}
31	34
		@@ -39,9 +42,9 @@
39	42	</th>
40	43	<td>
41	44	<ul>
42	45	<?php
43		-if (empty($editUserData->{$wpdb->prefix . "capabilities"}['administrator'])) {
	46	+if (!$userAccessManager->getAccessHandler()->userIsAdmin($objectId)) {
44	47	if (isset($uamUserGroups)) {
45	48	foreach ($uamUserGroups as $uamUserGroup) {
46	49	?>
47	50	<li>
		@@ -50,14 +53,19 @@
50	53	<?php
51	54	if (array_key_exists($uamUserGroup->getId(), $userGroupsForObject)) {
52	55	echo 'checked="checked"';
53	56	}
54		- if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive)) {
	57	+ if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectType][$objectId])) {
55	58	echo 'disabled=""';
56	59	}
57	60	?>
58		- value="<?php echo $uamUserGroup->getId(); ?>" name="usergroups[]" />
	61	+ value="<?php echo $uamUserGroup->getId(); ?>" name="uam_usergroups[]" />
59	62	<?php echo $uamUserGroup->getGroupName(); ?>
	63	+ <?php
	64	+ if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectType][$objectId])) {
	65	+ echo ' [LR]';
	66	+ }
	67	+ ?>
60	68	</label>
61	69	<a class="uam_group_info_link">(<?php echo TXT_INFO; ?>)</a>
62	70
63	71	<?php