← All changes | tpl/groupInfo.php +31 -90 1.0 → 1.1.1 View file →

		@@ -18,54 +18,27 @@
18	18	if (!function_exists('walkPath')) {
19	19	/**
20	20	* Retruns the html code for the recursive access.
21	21	*
22		- * @param mixed $object The object.
23		- * @param string $type The type of the object.
	22	+ * @param mixed $object The object.
	23	+ * @param string $objectType The type of the object.
24	24	*
25	25	* @return string
26	26	*/
27		- function walkPath($object, $type)
	27	+ function walkPath($object, $objectType)
28	28	{
29		- $out = '';
	29	+ $out = $object->name;
30	30
31		- if (is_object($object)) {
32		- if ($type == 'post') {
33		- $post = get_post($object->ID);
34		- $out = $post->post_title;
35		- } elseif ($type == 'category') {
36		- $category = get_category($object->cat_id);
37		- $out = $category->name;
38		- }
	31	+ if (isset($object->recursiveMember[$objectType])) {
	32	+ $out .= '<ul>';
39	33
40		-
41		- if (isset($object->recursiveMember['byPost'])) {
42		- $out .= '<ul>';
43		- foreach ($object->recursiveMember['byPost'] as $post) {
44		- $out .= '<li>';
45		- $out .= walkPath($post, 'post');
46		- $out .= '</li>';
47		- }
48		- $out .= '</ul>';
	34	+ foreach ($object->recursiveMember[$objectType] as $recursiveObject) {
	35	+ $out .= '<li>';
	36	+ $out .= walkPath($recursiveObject, $objectType);
	37	+ $out .= '</li>';
49	38	}
50	39
51		- if (isset($object->recursiveMember['byCategory'])) {
52		- $out .= '<ul>';
53		- foreach ($object->recursiveMember['byCategory'] as $category) {
54		- $out .= '<li>';
55		- $out .= walkPath($category, 'category');
56		- $out .= '</li>';
57		- }
58		- $out .= '</ul>';
59		- }
60		- } else {
61		- if ($type == 'post') {
62		- $post = get_post($object);
63		- $out = $post->post_title;
64		- } elseif ($type == 'category') {
65		- $category = get_category($object);
66		- $out = $category->name;
67		- }
	40	+ $out .= '</ul>';
68	41	}
69	42
70	43	return $out;
71	44	}
		@@ -72,60 +45,28 @@
72	45	}
73	46	?>
74	47	<div class="tooltip">
75	48	<ul class="uam_group_info">
76		-<?php
77		-if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byCategory'])) {
78		- ?>
79		- <li class="uam_group_info_head">
80		- <?php echo TXT_GROUP_MEMBERSHIP_BY_CATEGORIES; ?>:
81		- <ul>
82		- <?php
83		- foreach ($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byCategory'] as $category) {
84		- ?>
85		- <li class="recusiveTree"><?php echo walkPath($category, 'category'); ?></li>
	49	+<?php
	50	+global $userAccessManager;
	51	+
	52	+foreach ($userAccessManager->getAccessHandler()->getAllObjectTypes() as $curObjectType) {
	53	+ if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectType][$objectId][$curObjectType])) {
	54	+ ?>
	55	+ <li class="uam_group_info_head">
	56	+ <?php echo constant('TXT_GROUP_MEMBERSHIP_BY_'.strtoupper($curObjectType)); ?>:
	57	+ <ul>
86	58	<?php
87		- }
88		- ?>
89		- </ul>
90		- </li>
91		- <?php
92		-}
93		-?>
94		-<?php
95		-if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byPost'])) {
96		- ?>
97		- <li class="uam_group_info_head">
98		- <?php echo TXT_GROUP_MEMBERSHIP_BY_POSTS; ?>:
99		- <ul>
100		- <?php
101		- foreach ($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byPost'] as $post) {
	59	+ foreach ($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectType][$objectId][$curObjectType] as $object) {
	60	+ ?>
	61	+ <li class="recusiveTree"><?php echo walkPath($object, $curObjectType); ?></li>
	62	+ <?php
	63	+ }
102	64	?>
103		- <li class="recusiveTree"><?php echo walkPath($post, 'post'); ?></li>
104		- <?php
105		- }
106		- ?>
107		- </ul>
108		- </li>
109		- <?php
110		-}
111		-?>
112		-<?php
113		-if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byRole'])) {
114		- ?>
115		- <li class="uam_group_info_head">
116		- <?php echo TXT_GROUP_MEMBERSHIP_BY_ROLE; ?>:
117		- <ul>
118		- <?php
119		- foreach ($userGroupsForObject[$uamUserGroup->getId()]->setRecursive[$objectId]['byRole'] as $role) {
120		- ?>
121		- <li><?php echo $role; ?></li>
122		- <?php
	65	+ </ul>
	66	+ </li>
	67	+ <?php
123	68	}
124		- ?>
125		- </ul>
126		- </li>
127		- <?php
128	69	}
129	70	?>
130	71	<li class="uam_group_info_head"><?php echo TXT_GROUP_INFO; ?>:
131	72	<ul>
		@@ -148,13 +89,13 @@
148	89	?>
149	90	</li>
150	91	<li>
151	92	<?php echo TXT_GROUP_ROLE; ?>: <?php
152		-if ($uamUserGroup->getRoles()) {
	93	+if ($uamUserGroup->getObjectsFromType('role')) {
153	94	$out = '';
154	95
155		- foreach ($uamUserGroup->getRoles() as $role) {
156		- $out .= trim($role['role_name']).', ';
	96	+ foreach ($uamUserGroup->getObjectsFromType('role') as $key => $role) {
	97	+ $out .= trim($key).', ';
157	98	}
158	99
159	100	echo rtrim($out, ', ');
160	101	} else {