← All changes | tpl/adminGroup.php +10 -9 1.0 → 1.1.1 View file →

		@@ -27,9 +27,9 @@
27	27	global $userAccessManager;
28	28
29	29	if ($userGroupId != null) {
30	30	$uamUserGroup
31		- = &$userAccessManager->getAccessHandler()->getUserGroups($userGroupId);
	31	+ = $userAccessManager->getAccessHandler()->getUserGroups($userGroupId);
32	32	} else {
33	33	$uamUserGroup
34	34	= new UamUserGroup($userAccessManager->getAccessHandler(), null);
35	35	}
		@@ -45,13 +45,13 @@
45	45	} else {
46	46	$roles = null;
47	47	}
48	48
49		- $uamUserGroup->unsetRoles(true);
	49	+ $uamUserGroup->unsetObjects('role', true);
50	50
51	51	if ($roles) {
52	52	foreach ($roles as $role) {
53		- $uamUserGroup->addRole($role);
	53	+ $uamUserGroup->addObject('role', $role);
54	54	}
55	55	}
56	56
57	57	$uamUserGroup->save();
		@@ -68,9 +68,9 @@
68	68	*/
69	69	function getPrintEditGroup($groupId = null)
70	70	{
71	71	global $userAccessManager;
72		- $uamUserGroup = &$userAccessManager->getAccessHandler()->getUserGroups($groupId);
	72	+ $uamUserGroup = $userAccessManager->getAccessHandler()->getUserGroups($groupId);
73	73	?>
74	74	<form method="post" action="<?php
75	75	echo reset(
76	76	explode("?", $_SERVER["REQUEST_URI"])
		@@ -189,9 +189,9 @@
189	189	<?php
190	190	global $wp_roles;
191	191
192	192	if (isset($groupId)) {
193		- $groupRoles = $uamUserGroup->getRoles();
	193	+ $groupRoles = $uamUserGroup->getObjectsFromType('role');
194	194	}
195	195
196	196	foreach ($wp_roles->role_names as $role => $name) {
197	197	if ($role != "administrator") {
		@@ -253,8 +253,9 @@
253	253	if ($postAction == 'delgroup') {
254	254	if (isset($_POST['delete'])) {
255	255	$delIds = $_POST['delete'];
256	256	}
	257	+
257	258	if (isset($delIds)) {
258	259	global $userAccessManager;
259	260
260	261	foreach ($delIds as $delId) {
		@@ -330,9 +331,9 @@
330	331	$curAdminPage = $_GET['page'];
331	332	}
332	333
333	334	global $userAccessManager;
334		- $uamUserGroups = &$userAccessManager->getAccessHandler()->getUserGroups();
	335	+ $uamUserGroups = $userAccessManager->getAccessHandler()->getUserGroups();
335	336
336	337	if (isset($uamUserGroups)) {
337	338	foreach ($uamUserGroups as $uamUserGroup) {
338	339	?>
		@@ -367,17 +368,17 @@
367	368	?>
368	369	</td>
369	370	<td>
370	371	<?php
371		- if ($uamUserGroup->getRoles()) {
	372	+ if ($uamUserGroup->getObjectsFromType('role')) {
372	373	?>
373	374	<ul>
374	375	<?php
375		- foreach ($uamUserGroup->getRoles() as $role) {
	376	+ foreach ($uamUserGroup->getObjectsFromType('role') as $key => $role) {
376	377	?>
377	378	<li>
378	379	<?php
379		- echo $role['role_name'];
	380	+ echo $key;
380	381	?>
381	382	</li>
382	383	<?php
383	384	}