| @@ -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,71 +17,74 @@ | ||
| 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) { | |
| 54 | + foreach ($aRoles as $sRole) { | |
| 55 | + $oUamUserGroup->addObject('role', $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']; | |
| 76 | + <form method="post" action="<?php | |
| 77 | + $aUri = explode("?", $_SERVER["REQUEST_URI"]); | |
| 78 | + echo reset($aUri) . "?page=" . $_GET['page']; | |
| 78 | 79 | ?>"> |
| 79 | 80 | <?php |
| 80 | - if (isset($groupId)) { | |
| 81 | + wp_nonce_field('uamInsertUpdateGroup', 'uamInsertUpdateGroupNonce'); | |
| 82 | + | |
| 83 | + if (isset($sGroupId)) { | |
| 81 | 84 | ?> |
| 82 | 85 | <input type="hidden" value="updateGroup" name="action" /> |
| 83 | - <input type="hidden" value="<?php echo $groupId; ?>" name="userGroupId" /> | |
| 86 | + <input type="hidden" value="<?php echo $sGroupId; ?>" name="userGroupId" /> | |
| 84 | 87 | <?php |
| 85 | 88 | } else { |
| 86 | 89 | ?> |
| 87 | 90 | <input type="hidden" value="addGroup" name="action" /> |
| @@ -90,108 +93,108 @@ | ||
| 90 | 93 | ?> |
| 91 | 94 | <table class="form-table"> |
| 92 | 95 | <tbody> |
| 93 | 96 | <tr class="form-field form-required"> |
| 94 | - <th valign="top" scope="row"><?php echo TXT_GROUP_NAME; ?></th> | |
| 97 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_NAME; ?></th> | |
| 95 | 98 | <td> |
| 96 | 99 | <input type="text" size="40" value="<?php |
| 97 | - if (isset($groupId)) { | |
| 98 | - echo $uamUserGroup->getGroupName(); | |
| 100 | + if (isset($sGroupId)) { | |
| 101 | + echo $oUamUserGroup->getGroupName(); | |
| 99 | 102 | } |
| 100 | 103 | ?>" id="userGroupName" name="userGroupName" /><br /> |
| 101 | - <?php echo TXT_GROUP_NAME_DESC; ?> | |
| 104 | + <?php echo TXT_UAM_GROUP_NAME_DESC; ?> | |
| 102 | 105 | </td> |
| 103 | 106 | </tr> |
| 104 | 107 | <tr class="form-field form-required"> |
| 105 | - <th valign="top" scope="row"><?php echo TXT_GROUP_DESC; ?></th> | |
| 108 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_DESC; ?></th> | |
| 106 | 109 | <td> |
| 107 | 110 | <input type="text" size="40" value="<?php |
| 108 | - if (isset($groupId)) { | |
| 109 | - echo $uamUserGroup->getGroupDesc(); | |
| 111 | + if (isset($sGroupId)) { | |
| 112 | + echo $oUamUserGroup->getGroupDesc(); | |
| 110 | 113 | } |
| 111 | 114 | ?>" id="userGroupDescription" name="userGroupDescription" /><br /> |
| 112 | - <?php echo TXT_GROUP_DESC_DESC; ?> | |
| 115 | + <?php echo TXT_UAM_GROUP_DESC_DESC; ?> | |
| 113 | 116 | </td> |
| 114 | 117 | </tr> |
| 115 | 118 | <tr class="form-field form-required"> |
| 116 | - <th valign="top" scope="row"><?php echo TXT_GROUP_IP_RANGE; ?></th> | |
| 119 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_IP_RANGE; ?></th> | |
| 117 | 120 | <td><input type="text" size="40" value="<?php |
| 118 | - if (isset($groupId)) { | |
| 119 | - echo $uamUserGroup->getIpRange('string'); | |
| 121 | + if (isset($sGroupId)) { | |
| 122 | + echo $oUamUserGroup->getIpRange('string'); | |
| 120 | 123 | } |
| 121 | 124 | ?>" id="ipRange" name="ipRange" /><br /> |
| 122 | - <?php echo TXT_GROUP_IP_RANGE_DESC; ?> | |
| 125 | + <?php echo TXT_UAM_GROUP_IP_RANGE_DESC; ?> | |
| 123 | 126 | </td> |
| 124 | 127 | </tr> |
| 125 | 128 | <tr class="form-field form-required"> |
| 126 | - <th valign="top" scope="row"><?php echo TXT_GROUP_READ_ACCESS; ?></th> | |
| 129 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_READ_ACCESS; ?></th> | |
| 127 | 130 | <td> |
| 128 | 131 | <select name="readAccess"> |
| 129 | 132 | <option value="group" |
| 130 | 133 | <?php |
| 131 | - if (isset($groupId)) { | |
| 132 | - if ($uamUserGroup->getReadAccess() == "group") { | |
| 134 | + if (isset($sGroupId)) { | |
| 135 | + if ($oUamUserGroup->getReadAccess() == "group") { | |
| 133 | 136 | echo 'selected="selected"'; |
| 134 | 137 | } |
| 135 | 138 | } |
| 136 | 139 | ?> |
| 137 | 140 | > |
| 138 | - <?php echo TXT_ONLY_GROUP_USERS ?> | |
| 141 | + <?php echo TXT_UAM_ONLY_GROUP_USERS ?> | |
| 139 | 142 | </option> |
| 140 | 143 | <option value="all" |
| 141 | 144 | <?php |
| 142 | - if (isset($groupId)) { | |
| 143 | - if ($uamUserGroup->getReadAccess() == "all") { | |
| 145 | + if (isset($sGroupId)) { | |
| 146 | + if ($oUamUserGroup->getReadAccess() == "all") { | |
| 144 | 147 | echo 'selected="selected"'; |
| 145 | 148 | } |
| 146 | 149 | } |
| 147 | 150 | ?> |
| 148 | 151 | > |
| 149 | - <?php echo TXT_ALL ?> | |
| 152 | + <?php echo TXT_UAM_ALL ?> | |
| 150 | 153 | </option> |
| 151 | 154 | </select><br /> |
| 152 | - <?php echo TXT_GROUP_READ_ACCESS_DESC; ?> | |
| 155 | + <?php echo TXT_UAM_GROUP_READ_ACCESS_DESC; ?> | |
| 153 | 156 | </td> |
| 154 | 157 | </tr> |
| 155 | 158 | <tr class="form-field form-required"> |
| 156 | - <th valign="top" scope="row"><?php echo TXT_GROUP_WRITE_ACCESS; ?></th> | |
| 159 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_WRITE_ACCESS; ?></th> | |
| 157 | 160 | <td> |
| 158 | 161 | <select name="writeAccess"> |
| 159 | 162 | <option value="group" |
| 160 | 163 | <?php |
| 161 | - if (isset($groupId)) { | |
| 162 | - if ($uamUserGroup->getWriteAccess() == "group") { | |
| 164 | + if (isset($sGroupId)) { | |
| 165 | + if ($oUamUserGroup->getWriteAccess() == "group") { | |
| 163 | 166 | echo 'selected="selected"'; |
| 164 | 167 | } |
| 165 | 168 | } |
| 166 | 169 | ?> |
| 167 | 170 | > |
| 168 | - <?php echo TXT_ONLY_GROUP_USERS ?> | |
| 171 | + <?php echo TXT_UAM_ONLY_GROUP_USERS ?> | |
| 169 | 172 | </option> |
| 170 | 173 | <option value="all" |
| 171 | 174 | <?php |
| 172 | - if (isset($groupId)) { | |
| 173 | - if ($uamUserGroup->getWriteAccess() == "all") { | |
| 175 | + if (isset($sGroupId)) { | |
| 176 | + if ($oUamUserGroup->getWriteAccess() == "all") { | |
| 174 | 177 | echo 'selected="selected"'; |
| 175 | 178 | } |
| 176 | 179 | } |
| 177 | 180 | ?> |
| 178 | 181 | > |
| 179 | - <?php echo TXT_ALL ?> | |
| 182 | + <?php echo TXT_UAM_ALL ?> | |
| 180 | 183 | </option> |
| 181 | 184 | </select><br /> |
| 182 | - <?php echo TXT_GROUP_WRITE_ACCESS_DESC; ?> | |
| 185 | + <?php echo TXT_UAM_GROUP_WRITE_ACCESS_DESC; ?> | |
| 183 | 186 | </td> |
| 184 | 187 | </tr> |
| 185 | 188 | <tr> |
| 186 | - <th valign="top" scope="row"><?php echo TXT_GROUP_ROLE; ?></th> | |
| 189 | + <th valign="top" scope="row"><?php echo TXT_UAM_GROUP_ROLE; ?></th> | |
| 187 | 190 | <td> |
| 188 | 191 | <ul class='uam_role'> |
| 189 | 192 | <?php |
| 190 | 193 | global $wp_roles; |
| 191 | 194 | |
| 192 | - if (isset($groupId)) { | |
| 193 | - $groupRoles = $uamUserGroup->getRoles(); | |
| 195 | + if (isset($sGroupId)) { | |
| 196 | + $aGroupRoles = $oUamUserGroup->getObjectsFromType('role'); | |
| 194 | 197 | } |
| 195 | 198 | |
| 196 | 199 | foreach ($wp_roles->role_names as $role => $name) { |
| 197 | 200 | if ($role != "administrator") { |
| @@ -199,9 +202,9 @@ | ||
| 199 | 202 | <li class="selectit"> |
| 200 | 203 | <input id="role-<?php echo $role; ?>" type="checkbox" |
| 201 | 204 | <?php |
| 202 | 205 | |
| 203 | - if (isset($groupRoles[$role])) { | |
| 206 | + if (isset($aGroupRoles[$role])) { | |
| 204 | 207 | echo 'checked="checked"'; |
| 205 | 208 | } |
| 206 | 209 | ?> |
| 207 | 210 | |
| @@ -220,12 +223,12 @@ | ||
| 220 | 223 | </tbody> |
| 221 | 224 | </table> |
| 222 | 225 | <p class="submit"> |
| 223 | 226 | <input type="submit" value="<?php |
| 224 | - if (isset($groupId)) { | |
| 225 | - echo TXT_UPDATE_GROUP; | |
| 227 | + if (isset($sGroupId)) { | |
| 228 | + echo TXT_UAM_UPDATE_GROUP; | |
| 226 | 229 | } else { |
| 227 | - echo TXT_ADD_GROUP; | |
| 230 | + echo TXT_UAM_ADD_GROUP; | |
| 228 | 231 | } |
| 229 | 232 | ?>" name="submit" class="button" /> |
| 230 | 233 | </p> |
| 231 | 234 | </form> |
| @@ -250,20 +253,27 @@ | ||
| 250 | 253 | $postAction = null; |
| 251 | 254 | } |
| 252 | 255 | |
| 253 | 256 | if ($postAction == 'delgroup') { |
| 257 | + if (empty($_POST) | |
| 258 | + || !wp_verify_nonce($_POST['uamDeleteGroupNonce'], 'uamDeleteGroup') | |
| 259 | + ) { | |
| 260 | + wp_die(TXT_UAM_NONCE_FAILURE); | |
| 261 | + } | |
| 262 | + | |
| 254 | 263 | if (isset($_POST['delete'])) { |
| 255 | 264 | $delIds = $_POST['delete']; |
| 256 | 265 | } |
| 266 | + | |
| 257 | 267 | if (isset($delIds)) { |
| 258 | - global $userAccessManager; | |
| 268 | + global $oUserAccessManager; | |
| 259 | 269 | |
| 260 | 270 | foreach ($delIds as $delId) { |
| 261 | - $userAccessManager->getAccessHandler()->deleteUserGroup($delId); | |
| 271 | + $oUserAccessManager->getAccessHandler()->deleteUserGroup($delId); | |
| 262 | 272 | } |
| 263 | 273 | ?> |
| 264 | 274 | <div class="updated"> |
| 265 | - <p><strong><?php echo TXT_DEL_GROUP; ?></strong></p> | |
| 275 | + <p><strong><?php echo TXT_UAM_DEL_GROUP; ?></strong></p> | |
| 266 | 276 | </div> |
| 267 | 277 | <?php |
| 268 | 278 | } |
| 269 | 279 | } |
| @@ -279,15 +289,15 @@ | ||
| 279 | 289 | |
| 280 | 290 | if ($postAction == 'addGroup') { |
| 281 | 291 | ?> |
| 282 | 292 | <div class="updated"> |
| 283 | - <p><strong><?php echo TXT_GROUP_ADDED; ?></strong></p> | |
| 293 | + <p><strong><?php echo TXT_UAM_GROUP_ADDED; ?></strong></p> | |
| 284 | 294 | </div> |
| 285 | 295 | <?php |
| 286 | 296 | } elseif ($postAction == 'updateGroup') { |
| 287 | 297 | ?> |
| 288 | 298 | <div class="updated"> |
| 289 | - <p><strong><?php echo TXT_ACCESS_GROUP_EDIT_SUC; ?></strong></p> | |
| 299 | + <p><strong><?php echo TXT_UAM_ACCESS_GROUP_EDIT_SUC; ?></strong></p> | |
| 290 | 300 | </div> |
| 291 | 301 | <?php |
| 292 | 302 | } |
| 293 | 303 | } elseif (($postAction == 'updateGroup' || $postAction == 'addGroup') |
| @@ -293,9 +303,9 @@ | ||
| 293 | 303 | } elseif (($postAction == 'updateGroup' || $postAction == 'addGroup') |
| 294 | 304 | && empty($_POST['userGroupName'])) { |
| 295 | 305 | ?> |
| 296 | 306 | <div class="error"> |
| 297 | - <p><strong><?php echo TXT_GROUP_NAME_ERROR; ?></strong></p> | |
| 307 | + <p><strong><?php echo TXT_UAM_GROUP_NAME_ERROR; ?></strong></p> | |
| 298 | 308 | </div> |
| 299 | 309 | <?php |
| 300 | 310 | } |
| 301 | 311 | |
| @@ -302,13 +312,14 @@ | ||
| 302 | 312 | if (!$editGroup) { |
| 303 | 313 | ?> |
| 304 | 314 | <div class="wrap"> |
| 305 | 315 | <form method="post" action="<?php echo $_SERVER["REQUEST_URI"]; ?>"> |
| 316 | + <?php wp_nonce_field('uamDeleteGroup', 'uamDeleteGroupNonce'); ?> | |
| 306 | 317 | <input type="hidden" value="delgroup" name="action" /> |
| 307 | - <h2><?php echo TXT_MANAGE_GROUP; ?></h2> | |
| 318 | + <h2><?php echo TXT_UAM_MANAGE_GROUP; ?></h2> | |
| 308 | 319 | <div class="tablenav"> |
| 309 | 320 | <div class="alignleft"> |
| 310 | - <input type="submit" class="button-secondary delete" name="deleteit" value="<?php echo TXT_DELETE; ?>" /> | |
| 321 | + <input type="submit" class="button-secondary delete" name="deleteit" value="<?php echo TXT_UAM_DELETE; ?>" /> | |
| 311 | 322 | </div> |
| 312 | 323 | <br class="clear" /> |
| 313 | 324 | </div> |
| 314 | 325 | <br class="clear" /> |
| @@ -315,69 +326,67 @@ | ||
| 315 | 326 | <table class="widefat"> |
| 316 | 327 | <thead> |
| 317 | 328 | <tr class="thead"> |
| 318 | 329 | <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> | |
| 330 | + <th scope="col"><?php echo TXT_UAM_NAME; ?></th> | |
| 331 | + <th scope="col"><?php echo TXT_UAM_DESCRIPTION; ?></th> | |
| 332 | + <th scope="col"><?php echo TXT_UAM_READ_ACCESS; ?></th> | |
| 333 | + <th scope="col"><?php echo TXT_UAM_WRITE_ACCESS; ?></th> | |
| 334 | + <th scope="col"><?php echo TXT_UAM_GROUP_ROLE; ?></th> | |
| 335 | + <th scope="col"><?php echo TXT_UAM_IP_RANGE; ?></th> | |
| 325 | 336 | </tr> |
| 326 | 337 | </thead> |
| 327 | 338 | <tbody> |
| 328 | 339 | <?php |
| 329 | - if (isset($_GET['page'])) { | |
| 330 | - $curAdminPage = $_GET['page']; | |
| 331 | - } | |
| 340 | + $sCurAdminPage = isset($_GET['page']) ? $_GET['page'] : ''; | |
| 332 | 341 | |
| 333 | - global $userAccessManager; | |
| 334 | - $uamUserGroups = &$userAccessManager->getAccessHandler()->getUserGroups(); | |
| 342 | + global $oUserAccessManager; | |
| 343 | + $aUamUserGroups = $oUserAccessManager->getAccessHandler()->getUserGroups(); | |
| 335 | 344 | |
| 336 | - if (isset($uamUserGroups)) { | |
| 337 | - foreach ($uamUserGroups as $uamUserGroup) { | |
| 345 | + if (isset($aUamUserGroups)) { | |
| 346 | + foreach ($aUamUserGroups as $oUamUserGroup) { | |
| 338 | 347 | ?> |
| 339 | - <tr class="alternate" id="group-<?php echo $uamUserGroup->getId(); ?>"> | |
| 348 | + <tr class="alternate" id="group-<?php echo $oUamUserGroup->getId(); ?>"> | |
| 340 | 349 | <th class="check-column" scope="row"> |
| 341 | - <input type="checkbox" value="<?php echo $uamUserGroup->getId(); ?>" name="delete[]" /> | |
| 350 | + <input type="checkbox" value="<?php echo $oUamUserGroup->getId(); ?>" name="delete[]" /> | |
| 342 | 351 | </th> |
| 343 | 352 | <td> |
| 344 | 353 | <strong> |
| 345 | - <a href="?page=<?php echo $curAdminPage; ?>&action=editGroup&id=<?php echo $uamUserGroup->getId(); ?>"> | |
| 346 | - <?php echo $uamUserGroup->getGroupName(); ?> | |
| 354 | + <a href="?page=<?php echo $sCurAdminPage; ?>&action=editGroup&id=<?php echo $oUamUserGroup->getId(); ?>"> | |
| 355 | + <?php echo $oUamUserGroup->getGroupName(); ?> | |
| 347 | 356 | </a> |
| 348 | 357 | </strong> |
| 349 | 358 | </td> |
| 350 | - <td><?php echo $uamUserGroup->getGroupDesc() ?></td> | |
| 359 | + <td><?php echo $oUamUserGroup->getGroupDesc() ?></td> | |
| 351 | 360 | <td> |
| 352 | 361 | <?php |
| 353 | - if ($uamUserGroup->getReadAccess() == "all") { | |
| 354 | - echo TXT_ALL; | |
| 355 | - } elseif ($uamUserGroup->getReadAccess() == "group") { | |
| 356 | - echo TXT_ONLY_GROUP_USERS; | |
| 362 | + if ($oUamUserGroup->getReadAccess() == "all") { | |
| 363 | + echo TXT_UAM_ALL; | |
| 364 | + } elseif ($oUamUserGroup->getReadAccess() == "group") { | |
| 365 | + echo TXT_UAM_ONLY_GROUP_USERS; | |
| 357 | 366 | } |
| 358 | 367 | ?> |
| 359 | 368 | </td> |
| 360 | 369 | <td> |
| 361 | 370 | <?php |
| 362 | - if ($uamUserGroup->getWriteAccess() == "all") { | |
| 363 | - echo TXT_ALL; | |
| 364 | - } elseif ($uamUserGroup->getWriteAccess() == "group") { | |
| 365 | - echo TXT_ONLY_GROUP_USERS; | |
| 371 | + if ($oUamUserGroup->getWriteAccess() == "all") { | |
| 372 | + echo TXT_UAM_ALL; | |
| 373 | + } elseif ($oUamUserGroup->getWriteAccess() == "group") { | |
| 374 | + echo TXT_UAM_ONLY_GROUP_USERS; | |
| 366 | 375 | } |
| 367 | 376 | ?> |
| 368 | 377 | </td> |
| 369 | 378 | <td> |
| 370 | 379 | <?php |
| 371 | - if ($uamUserGroup->getRoles()) { | |
| 380 | + if ($oUamUserGroup->getObjectsFromType('role')) { | |
| 372 | 381 | ?> |
| 373 | 382 | <ul> |
| 374 | 383 | <?php |
| 375 | - foreach ($uamUserGroup->getRoles() as $role) { | |
| 384 | + foreach ($oUamUserGroup->getObjectsFromType('role') as $sKey => $sRole) { | |
| 376 | 385 | ?> |
| 377 | 386 | <li> |
| 378 | 387 | <?php |
| 379 | - echo $role['role_name']; | |
| 388 | + echo $sKey; | |
| 380 | 389 | ?> |
| 381 | 390 | </li> |
| 382 | 391 | <?php |
| 383 | 392 | } |
| @@ -384,23 +393,23 @@ | ||
| 384 | 393 | ?> |
| 385 | 394 | </ul> |
| 386 | 395 | <?php |
| 387 | 396 | } else { |
| 388 | - echo TXT_NONE; | |
| 397 | + echo TXT_UAM_NONE; | |
| 389 | 398 | } |
| 390 | 399 | ?> |
| 391 | 400 | </td> |
| 392 | 401 | <td> |
| 393 | 402 | <?php |
| 394 | - if ($uamUserGroup->getIpRange()) { | |
| 403 | + if ($oUamUserGroup->getIpRange()) { | |
| 395 | 404 | ?> |
| 396 | 405 | <ul> |
| 397 | 406 | <?php |
| 398 | - foreach ($uamUserGroup->getIpRange() as $ipRange) { | |
| 407 | + foreach ($oUamUserGroup->getIpRange() as $sIpRange) { | |
| 399 | 408 | ?> |
| 400 | 409 | <li> |
| 401 | 410 | <?php |
| 402 | - echo $ipRange; | |
| 411 | + echo $sIpRange; | |
| 403 | 412 | ?> |
| 404 | 413 | </li> |
| 405 | 414 | <?php |
| 406 | 415 | } |
| @@ -407,9 +416,9 @@ | ||
| 407 | 416 | ?> |
| 408 | 417 | </ul> |
| 409 | 418 | <?php |
| 410 | 419 | } else { |
| 411 | - echo TXT_NONE; | |
| 420 | + echo TXT_UAM_NONE; | |
| 412 | 421 | } |
| 413 | 422 | ?> |
| 414 | 423 | </td> |
| 415 | 424 | </tr> |
| @@ -429,11 +438,11 @@ | ||
| 429 | 438 | <?php |
| 430 | 439 | |
| 431 | 440 | |
| 432 | 441 | if ($editGroup) { |
| 433 | - echo TXT_EDIT_GROUP; | |
| 442 | + echo TXT_UAM_EDIT_GROUP; | |
| 434 | 443 | } else { |
| 435 | - echo TXT_ADD_GROUP; | |
| 444 | + echo TXT_UAM_ADD_GROUP; | |
| 436 | 445 | } |
| 437 | 446 | ?> |
| 438 | 447 | </h2> |
| 439 | 448 | <?php |
