← All changes | tpl/adminGroup.php +233 -227 1.0 → 1.2.6.9 View file →

		@@ -8,9 +8,9 @@
8	8	*
9	9	* @category UserAccessManager
10	10	* @package UserAccessManager
11	11	* @author Alexander Schneider <alexanderschneider85@googlemail.com>
12		- * @copyright 2008-2010 Alexander Schneider
	12	+ * @copyright 2008-2013 Alexander Schneider
13	13	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2
14	14	* @version SVN: $Id$
15	15	* @link http://wordpress.org/extend/plugins/user-access-manager/
16	16	*/
		@@ -17,219 +17,223 @@
17	17
18	18	/**
19	19	* Inserts or update a user group.
20	20	*
21		- * @param integer $userGroupId The id of the user group.
	21	+ * @param integer $iUserGroupId The _iId of the user group.
22	22	*
23	23	* @return null
24	24	*/
25		-function insertUpdateGroup($userGroupId)
	25	+function insertUpdateGroup($iUserGroupId)
26	26	{
27		- global $userAccessManager;
	27	+ global $oUserAccessManager;
28	28
29		- if ($userGroupId != null) {
30		- $uamUserGroup
31		- = &$userAccessManager->getAccessHandler()->getUserGroups($userGroupId);
	29	+ if (empty($_POST) || !wp_verify_nonce($_POST['uamInsertUpdateGroupNonce'], 'uamInsertUpdateGroup')) {
	30	+ wp_die(TXT_UAM_NONCE_FAILURE);
	31	+ }
	32	+
	33	+ if ($iUserGroupId != null) {
	34	+ $oUamUserGroup = $oUserAccessManager->getAccessHandler()->getUserGroups($iUserGroupId);
32	35	} else {
33		- $uamUserGroup
34		- = new UamUserGroup($userAccessManager->getAccessHandler(), null);
	36	+ $oUamUserGroup = new UamUserGroup($oUserAccessManager->getAccessHandler(), null);
35	37	}
36	38
37		- $uamUserGroup->setGroupName($_POST['userGroupName']);
38		- $uamUserGroup->setGroupDesc($_POST['userGroupDescription']);
39		- $uamUserGroup->setReadAccess($_POST['readAccess']);
40		- $uamUserGroup->setWriteAccess($_POST['writeAccess']);
41		- $uamUserGroup->setIpRange($_POST['ipRange']);
	39	+ $oUamUserGroup->setGroupName($_POST['userGroupName']);
	40	+ $oUamUserGroup->setGroupDesc($_POST['userGroupDescription']);
	41	+ $oUamUserGroup->setReadAccess($_POST['readAccess']);
	42	+ $oUamUserGroup->setWriteAccess($_POST['writeAccess']);
	43	+ $oUamUserGroup->setIpRange($_POST['ipRange']);
42	44
43	45	if (isset($_POST['roles'])) {
44		- $roles = $_POST['roles'];
	46	+ $aRoles = $_POST['roles'];
45	47	} else {
46		- $roles = null;
	48	+ $aRoles = null;
47	49	}
48	50
49		- $uamUserGroup->unsetRoles(true);
	51	+ $oUamUserGroup->unsetObjects('role', true);
50	52
51		- if ($roles) {
52		- foreach ($roles as $role) {
53		- $uamUserGroup->addRole($role);
	53	+ if ($aRoles && is_array($aRoles)) {
	54	+ foreach ($aRoles as $sRole) {
	55	+ $oUamUserGroup->addObject('role', htmlentities($sRole));
54	56	}
55	57	}
	58	+
	59	+ $oUamUserGroup->save();
56	60
57		- $uamUserGroup->save();
58		-
59		- $userAccessManager->getAccessHandler()->addUserGroup($uamUserGroup);
	61	+ $oUserAccessManager->getAccessHandler()->addUserGroup($oUamUserGroup);
60	62	}
61	63
62	64	/**
63		- * Prints the group formular.
	65	+ * Prints the group form.
64	66	*
65		- * @param integer $groupId The given group id.
	67	+ * @param integer $sGroupId The given group _iId.
66	68	*
67	69	* @return null
68	70	*/
69		-function getPrintEditGroup($groupId = null)
	71	+function getPrintEditGroup($sGroupId = null)
70	72	{
71		- global $userAccessManager;
72		- $uamUserGroup = &$userAccessManager->getAccessHandler()->getUserGroups($groupId);
	73	+ global $oUserAccessManager;
	74	+ $oUamUserGroup = $oUserAccessManager->getAccessHandler()->getUserGroups($sGroupId);
73	75	?>
74		- <form method="post" action="<?php
75		- echo reset(
76		- explode("?", $_SERVER["REQUEST_URI"])
77		- ) . "?page=" . $_GET['page'];
78		- ?>">
79		- <?php
80		- if (isset($groupId)) {
	76	+ <form method="post" action="<?php
	77	+ $aUri = explode("?", $_SERVER["REQUEST_URI"]);
	78	+ $sUri = reset($aUri);
	79	+ echo htmlspecialchars($sUri) . "?page=" . $_GET['page'];
	80	+ ?>">
	81	+ <?php
	82	+ wp_nonce_field('uamInsertUpdateGroup', 'uamInsertUpdateGroupNonce');
	83	+
	84	+ if (isset($sGroupId)) {
81	85	?>
82		- <input type="hidden" value="updateGroup" name="action" />
83		- <input type="hidden" value="<?php echo $groupId; ?>" name="userGroupId" />
84		- <?php
	86	+ <input type="hidden" value="updateGroup" name="action" />
	87	+ <input type="hidden" value="<?php echo $sGroupId; ?>" name="userGroupId" />
	88	+ <?php
85	89	} else {
86	90	?>
87		- <input type="hidden" value="addGroup" name="action" />
	91	+ <input type="hidden" value="addGroup" name="action" />
88	92	<?php
89	93	}
90	94	?>
91		- <table class="form-table">
92		- <tbody>
93		- <tr class="form-field form-required">
94		- <th valign="top" scope="row"><?php echo TXT_GROUP_NAME; ?></th>
95		- <td>
96		- <input type="text" size="40" value="<?php
97		- if (isset($groupId)) {
98		- echo $uamUserGroup->getGroupName();
	95	+ <table class="form-table">
	96	+ <tbody>
	97	+ <tr class="form-field form-required">
	98	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_NAME; ?></th>
	99	+ <td>
	100	+ <input type="text" size="40" value="<?php
	101	+ if (isset($sGroupId)) {
	102	+ echo htmlentities($oUamUserGroup->getGroupName());
99	103	}
100	104	?>" id="userGroupName" name="userGroupName" /><br />
101		- <?php echo TXT_GROUP_NAME_DESC; ?>
102		- </td>
103		- </tr>
104		- <tr class="form-field form-required">
105		- <th valign="top" scope="row"><?php echo TXT_GROUP_DESC; ?></th>
106		- <td>
107		- <input type="text" size="40" value="<?php
108		- if (isset($groupId)) {
109		- echo $uamUserGroup->getGroupDesc();
	105	+ <?php echo TXT_UAM_GROUP_NAME_DESC; ?>
	106	+ </td>
	107	+ </tr>
	108	+ <tr class="form-field form-required">
	109	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_DESC; ?></th>
	110	+ <td>
	111	+ <input type="text" size="40" value="<?php
	112	+ if (isset($sGroupId)) {
	113	+ echo htmlentities($oUamUserGroup->getGroupDesc());
110	114	}
111	115	?>" id="userGroupDescription" name="userGroupDescription" /><br />
112		- <?php echo TXT_GROUP_DESC_DESC; ?>
113		- </td>
114		- </tr>
115		- <tr class="form-field form-required">
116		- <th valign="top" scope="row"><?php echo TXT_GROUP_IP_RANGE; ?></th>
117		- <td><input type="text" size="40" value="<?php
118		- if (isset($groupId)) {
119		- echo $uamUserGroup->getIpRange('string');
	116	+ <?php echo TXT_UAM_GROUP_DESC_DESC; ?>
	117	+ </td>
	118	+ </tr>
	119	+ <tr class="form-field form-required">
	120	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_IP_RANGE; ?></th>
	121	+ <td><input type="text" size="40" value="<?php
	122	+ if (isset($sGroupId)) {
	123	+ echo htmlentities($oUamUserGroup->getIpRange('string'));
120	124	}
121	125	?>" id="ipRange" name="ipRange" /><br />
122		- <?php echo TXT_GROUP_IP_RANGE_DESC; ?>
123		- </td>
	126	+ <?php echo TXT_UAM_GROUP_IP_RANGE_DESC; ?>
	127	+ </td>
124	128	</tr>
125	129	<tr class="form-field form-required">
126		- <th valign="top" scope="row"><?php echo TXT_GROUP_READ_ACCESS; ?></th>
127		- <td>
128		- <select name="readAccess">
129		- <option value="group"
130		- <?php
131		- if (isset($groupId)) {
132		- if ($uamUserGroup->getReadAccess() == "group") {
	130	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_READ_ACCESS; ?></th>
	131	+ <td>
	132	+ <select name="readAccess">
	133	+ <option value="group"
	134	+ <?php
	135	+ if (isset($sGroupId)) {
	136	+ if ($oUamUserGroup->getReadAccess() == "group") {
133	137	echo 'selected="selected"';
134	138	}
135	139	}
136	140	?>
137		- >
138		- <?php echo TXT_ONLY_GROUP_USERS ?>
139		- </option>
140		- <option value="all"
141		- <?php
142		- if (isset($groupId)) {
143		- if ($uamUserGroup->getReadAccess() == "all") {
	141	+ >
	142	+ <?php echo TXT_UAM_ONLY_GROUP_USERS ?>
	143	+ </option>
	144	+ <option value="all"
	145	+ <?php
	146	+ if (isset($sGroupId)) {
	147	+ if ($oUamUserGroup->getReadAccess() == "all") {
144	148	echo 'selected="selected"';
145	149	}
146	150	}
147	151	?>
148		- >
149		- <?php echo TXT_ALL ?>
150		- </option>
151		- </select><br />
152		- <?php echo TXT_GROUP_READ_ACCESS_DESC; ?>
153		- </td>
154		- </tr>
155		- <tr class="form-field form-required">
156		- <th valign="top" scope="row"><?php echo TXT_GROUP_WRITE_ACCESS; ?></th>
157		- <td>
158		- <select name="writeAccess">
159		- <option value="group"
160		- <?php
161		- if (isset($groupId)) {
162		- if ($uamUserGroup->getWriteAccess() == "group") {
	152	+ >
	153	+ <?php echo TXT_UAM_ALL ?>
	154	+ </option>
	155	+ </select><br />
	156	+ <?php echo TXT_UAM_GROUP_READ_ACCESS_DESC; ?>
	157	+ </td>
	158	+ </tr>
	159	+ <tr class="form-field form-required">
	160	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_WRITE_ACCESS; ?></th>
	161	+ <td>
	162	+ <select name="writeAccess">
	163	+ <option value="group"
	164	+ <?php
	165	+ if (isset($sGroupId)) {
	166	+ if ($oUamUserGroup->getWriteAccess() == "group") {
163	167	echo 'selected="selected"';
164	168	}
165	169	}
166	170	?>
167		- >
168		- <?php echo TXT_ONLY_GROUP_USERS ?>
169		- </option>
170		- <option value="all"
171		- <?php
172		- if (isset($groupId)) {
173		- if ($uamUserGroup->getWriteAccess() == "all") {
	171	+ >
	172	+ <?php echo TXT_UAM_ONLY_GROUP_USERS ?>
	173	+ </option>
	174	+ <option value="all"
	175	+ <?php
	176	+ if (isset($sGroupId)) {
	177	+ if ($oUamUserGroup->getWriteAccess() == "all") {
174	178	echo 'selected="selected"';
175	179	}
176	180	}
177	181	?>
178		- >
179		- <?php echo TXT_ALL ?>
180		- </option>
181		- </select><br />
182		- <?php echo TXT_GROUP_WRITE_ACCESS_DESC; ?>
183		- </td>
184		- </tr>
185		- <tr>
186		- <th valign="top" scope="row"><?php echo TXT_GROUP_ROLE; ?></th>
187		- <td>
188		- <ul class='uam_role'>
189		- <?php
	182	+ >
	183	+ <?php echo TXT_UAM_ALL ?>
	184	+ </option>
	185	+ </select><br />
	186	+ <?php echo TXT_UAM_GROUP_WRITE_ACCESS_DESC; ?>
	187	+ </td>
	188	+ </tr>
	189	+ <tr>
	190	+ <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_ROLE; ?></th>
	191	+ <td>
	192	+ <ul class='uam_role'>
	193	+ <?php
190	194	global $wp_roles;
191	195
192		- if (isset($groupId)) {
193		- $groupRoles = $uamUserGroup->getRoles();
	196	+ if (isset($sGroupId)) {
	197	+ $aGroupRoles = $oUamUserGroup->getObjectsFromType('role');
194	198	}
195	199
196	200	foreach ($wp_roles->role_names as $role => $name) {
197	201	if ($role != "administrator") {
198	202	?>
199		- <li class="selectit">
200		- <input id="role-<?php echo $role; ?>" type="checkbox"
201		- <?php
202		-
203		- if (isset($groupRoles[$role])) {
	203	+ <li class="selectit">
	204	+ <input id="role-<?php echo $role; ?>" type="checkbox"
	205	+ <?php
	206	+
	207	+ if (isset($aGroupRoles[$role])) {
204	208	echo 'checked="checked"';
205	209	}
206	210	?>
207		-
208		- value="<?php echo $role; ?> " name="roles[]" />
209		- <label for="role-<?php echo $role; ?>">
210		- <?php echo $role; ?>
211		- </label>
212		- </li>
213		- <?php
	211	+
	212	+ value="<?php echo $role; ?> " name="roles[]" />
	213	+ <label for="role-<?php echo $role; ?>">
	214	+ <?php echo $role; ?>
	215	+ </label>
	216	+ </li>
	217	+ <?php
214	218	}
215	219	}
216	220	?>
217		- </ul>
218		- </td>
219		- </tr>
220		- </tbody>
221		- </table>
222		- <p class="submit">
223		- <input type="submit" value="<?php
224		- if (isset($groupId)) {
225		- echo TXT_UPDATE_GROUP;
	221	+ </ul>
	222	+ </td>
	223	+ </tr>
	224	+ </tbody>
	225	+ </table>
	226	+ <p class="submit">
	227	+ <input type="submit" value="<?php
	228	+ if (isset($sGroupId)) {
	229	+ echo TXT_UAM_UPDATE_GROUP;
226	230	} else {
227		- echo TXT_ADD_GROUP;
	231	+ echo TXT_UAM_ADD_GROUP;
228	232	}
229	233	?>" name="submit" class="button" />
230		- </p>
231		- </form>
	234	+ </p>
	235	+ </form>
232	236	<?php
233	237	}
234	238
235	239	if (isset($_GET['action'])) {
		@@ -250,20 +254,23 @@
250	254	$postAction = null;
251	255	}
252	256
253	257	if ($postAction == 'delgroup') {
254		- if (isset($_POST['delete'])) {
255		- $delIds = $_POST['delete'];
	258	+ if (empty($_POST)
	259	+ || !wp_verify_nonce($_POST['uamDeleteGroupNonce'], 'uamDeleteGroup')
	260	+ ) {
	261	+ wp_die(TXT_UAM_NONCE_FAILURE);
256	262	}
257		- if (isset($delIds)) {
258		- global $userAccessManager;
	263	+
	264	+ if (isset($_POST['delete']) && is_array($_POST['delete'])) {
	265	+ global $oUserAccessManager;
259	266
260		- foreach ($delIds as $delId) {
261		- $userAccessManager->getAccessHandler()->deleteUserGroup($delId);
	267	+ foreach ($_POST['delete'] as $delId) {
	268	+ $oUserAccessManager->getAccessHandler()->deleteUserGroup($delId);
262	269	}
263	270	?>
264	271	<div class="updated">
265		- <p><strong><?php echo TXT_DEL_GROUP; ?></strong></p>
	272	+ <p><strong><?php echo TXT_UAM_DEL_GROUP; ?></strong></p>
266	273	</div>
267	274	<?php
268	275	}
269	276	}
		@@ -279,15 +286,15 @@
279	286
280	287	if ($postAction == 'addGroup') {
281	288	?>
282	289	<div class="updated">
283		- <p><strong><?php echo TXT_GROUP_ADDED; ?></strong></p>
	290	+ <p><strong><?php echo TXT_UAM_GROUP_ADDED; ?></strong></p>
284	291	</div>
285	292	<?php
286	293	} elseif ($postAction == 'updateGroup') {
287	294	?>
288	295	<div class="updated">
289		- <p><strong><?php echo TXT_ACCESS_GROUP_EDIT_SUC; ?></strong></p>
	296	+ <p><strong><?php echo TXT_UAM_ACCESS_GROUP_EDIT_SUC; ?></strong></p>
290	297	</div>
291	298	<?php
292	299	}
293	300	} elseif (($postAction == 'updateGroup' || $postAction == 'addGroup')
		@@ -293,9 +300,9 @@
293	300	} elseif (($postAction == 'updateGroup' || $postAction == 'addGroup')
294	301	&& empty($_POST['userGroupName'])) {
295	302	?>
296	303	<div class="error">
297		- <p><strong><?php echo TXT_GROUP_NAME_ERROR; ?></strong></p>
	304	+ <p><strong><?php echo TXT_UAM_GROUP_NAME_ERROR; ?></strong></p>
298	305	</div>
299	306	<?php
300	307	}
301	308
		@@ -301,127 +308,126 @@
301	308
302	309	if (!$editGroup) {
303	310	?>
304	311	<div class="wrap">
305		- <form method="post" action="<?php echo $_SERVER["REQUEST_URI"]; ?>">
306		- <input type="hidden" value="delgroup" name="action" />
307		- <h2><?php echo TXT_MANAGE_GROUP; ?></h2>
	312	+ <form method="post" action="<?php echo htmlspecialchars($_SERVER["REQUEST_URI"]); ?>">
	313	+ <?php wp_nonce_field('uamDeleteGroup', 'uamDeleteGroupNonce'); ?>
	314	+ <input type="hidden" value="delgroup" name="action" />
	315	+ <h2><?php echo TXT_UAM_MANAGE_GROUP; ?></h2>
308	316	<div class="tablenav">
309	317	<div class="alignleft">
310		- <input type="submit" class="button-secondary delete" name="deleteit" value="<?php echo TXT_DELETE; ?>" />
	318	+ <input type="submit" class="button-secondary delete" name="deleteit" value="<?php echo TXT_UAM_DELETE; ?>" />
311	319	</div>
312		- <br class="clear" />
	320	+ <br class="clear" />
313	321	</div>
314	322	<br class="clear" />
315	323	<table class="widefat">
316		- <thead>
317		- <tr class="thead">
318		- <th scope="col"></th>
319		- <th scope="col"><?php echo TXT_NAME; ?></th>
320		- <th scope="col"><?php echo TXT_DESCRIPTION; ?></th>
321		- <th scope="col"><?php echo TXT_READ_ACCESS; ?></th>
322		- <th scope="col"><?php echo TXT_WRITE_ACCESS; ?></th>
323		- <th scope="col"><?php echo TXT_GROUP_ROLE; ?></th>
324		- <th scope="col"><?php echo TXT_IP_RANGE; ?></th>
325		- </tr>
326		- </thead>
327		- <tbody>
	324	+ <thead>
	325	+ <tr class="thead">
	326	+ <th scope="col"></th>
	327	+ <th scope="col"><?php echo TXT_UAM_NAME; ?></th>
	328	+ <th scope="col"><?php echo TXT_UAM_DESCRIPTION; ?></th>
	329	+ <th scope="col"><?php echo TXT_UAM_READ_ACCESS; ?></th>
	330	+ <th scope="col"><?php echo TXT_UAM_WRITE_ACCESS; ?></th>
	331	+ <th scope="col"><?php echo TXT_UAM_GROUP_ROLE; ?></th>
	332	+ <th scope="col"><?php echo TXT_UAM_IP_RANGE; ?></th>
	333	+ </tr>
	334	+ </thead>
	335	+ <tbody>
328	336	<?php
329		- if (isset($_GET['page'])) {
330		- $curAdminPage = $_GET['page'];
331		- }
	337	+ $sCurAdminPage = isset($_GET['page']) ? $_GET['page'] : '';
332	338
333		- global $userAccessManager;
334		- $uamUserGroups = &$userAccessManager->getAccessHandler()->getUserGroups();
	339	+ global $oUserAccessManager;
	340	+ $aUamUserGroups = $oUserAccessManager->getAccessHandler()->getUserGroups();
335	341
336		- if (isset($uamUserGroups)) {
337		- foreach ($uamUserGroups as $uamUserGroup) {
	342	+ if (isset($aUamUserGroups)) {
	343	+ foreach ($aUamUserGroups as $oUamUserGroup) {
338	344	?>
339		- <tr class="alternate" id="group-<?php echo $uamUserGroup->getId(); ?>">
340		- <th class="check-column" scope="row">
341		- <input type="checkbox" value="<?php echo $uamUserGroup->getId(); ?>" name="delete[]" />
342		- </th>
343		- <td>
344		- <strong>
345		- <a href="?page=<?php echo $curAdminPage; ?>&amp;action=editGroup&amp;id=<?php echo $uamUserGroup->getId(); ?>">
346		- <?php echo $uamUserGroup->getGroupName(); ?>
347		- </a>
348		- </strong>
349		- </td>
350		- <td><?php echo $uamUserGroup->getGroupDesc() ?></td>
351		- <td>
	345	+ <tr class="alternate" id="group-<?php echo $oUamUserGroup->getId(); ?>">
	346	+ <th class="check-column" scope="row">
	347	+ <input type="checkbox" value="<?php echo $oUamUserGroup->getId(); ?>" name="delete[]" />
	348	+ </th>
	349	+ <td>
	350	+ <strong>
	351	+ <a href="?page=<?php echo $sCurAdminPage; ?>&amp;action=editGroup&amp;id=<?php echo $oUamUserGroup->getId(); ?>">
	352	+ <?php echo htmlentities($oUamUserGroup->getGroupName()); ?>
	353	+ </a>
	354	+ </strong>
	355	+ </td>
	356	+ <td><?php echo htmlentities($oUamUserGroup->getGroupDesc()) ?></td>
	357	+ <td>
352	358	<?php
353		- if ($uamUserGroup->getReadAccess() == "all") {
354		- echo TXT_ALL;
355		- } elseif ($uamUserGroup->getReadAccess() == "group") {
356		- echo TXT_ONLY_GROUP_USERS;
	359	+ if ($oUamUserGroup->getReadAccess() == "all") {
	360	+ echo TXT_UAM_ALL;
	361	+ } elseif ($oUamUserGroup->getReadAccess() == "group") {
	362	+ echo TXT_UAM_ONLY_GROUP_USERS;
357	363	}
358	364	?>
359	365	</td>
360		- <td>
361		- <?php
362		- if ($uamUserGroup->getWriteAccess() == "all") {
363		- echo TXT_ALL;
364		- } elseif ($uamUserGroup->getWriteAccess() == "group") {
365		- echo TXT_ONLY_GROUP_USERS;
	366	+ <td>
	367	+ <?php
	368	+ if ($oUamUserGroup->getWriteAccess() == "all") {
	369	+ echo TXT_UAM_ALL;
	370	+ } elseif ($oUamUserGroup->getWriteAccess() == "group") {
	371	+ echo TXT_UAM_ONLY_GROUP_USERS;
366	372	}
367	373	?>
368		- </td>
369		- <td>
370		- <?php
371		- if ($uamUserGroup->getRoles()) {
	374	+ </td>
	375	+ <td>
	376	+ <?php
	377	+ if ($oUamUserGroup->getObjectsFromType('role')) {
372	378	?>
373		- <ul>
	379	+ <ul>
374	380	<?php
375		- foreach ($uamUserGroup->getRoles() as $role) {
	381	+ foreach ($oUamUserGroup->getObjectsFromType('role') as $sKey => $sRole) {
376	382	?>
377		- <li>
	383	+ <li>
378	384	<?php
379		- echo $role['role_name'];
	385	+ echo $sKey;
380	386	?>
381		- </li>
	387	+ </li>
382	388	<?php
383	389	}
384	390	?>
385		- </ul>
	391	+ </ul>
386	392	<?php
387	393	} else {
388		- echo TXT_NONE;
	394	+ echo TXT_UAM_NONE;
389	395	}
390	396	?>
391		- </td>
392		- <td>
393		- <?php
394		- if ($uamUserGroup->getIpRange()) {
	397	+ </td>
	398	+ <td>
	399	+ <?php
	400	+ if ($oUamUserGroup->getIpRange()) {
395	401	?>
396		- <ul>
	402	+ <ul>
397	403	<?php
398		- foreach ($uamUserGroup->getIpRange() as $ipRange) {
	404	+ foreach ($oUamUserGroup->getIpRange() as $sIpRange) {
399	405	?>
400		- <li>
	406	+ <li>
401	407	<?php
402		- echo $ipRange;
	408	+ echo htmlentities($sIpRange);
403	409	?>
404		- </li>
	410	+ </li>
405	411	<?php
406	412	}
407	413	?>
408		- </ul>
	414	+ </ul>
409	415	<?php
410	416	} else {
411		- echo TXT_NONE;
	417	+ echo TXT_UAM_NONE;
412	418	}
413	419	?>
414		- </td>
415		- </tr>
416		- <?php
	420	+ </td>
	421	+ </tr>
	422	+ <?php
417	423	}
418	424	}
419	425	?>
420		- </tbody>
	426	+ </tbody>
421	427	</table>
422	428	</form>
423		- </div>
	429	+ </div>
424	430	<?php
425	431	}
426	432	?>
427	433	<div class="wrap">
		@@ -429,14 +435,14 @@
429	435	<?php
430	436
431	437
432	438	if ($editGroup) {
433		- echo TXT_EDIT_GROUP;
	439	+ echo TXT_UAM_EDIT_GROUP;
434	440	} else {
435		- echo TXT_ADD_GROUP;
	441	+ echo TXT_UAM_ADD_GROUP;
436	442	}
437	443	?>
438		- </h2>
	444	+ </h2>
439	445	<?php
440	446	if ($editGroup) {
441	447	$groupId = $_GET['id'];
442	448	getPrintEditGroup($groupId);