| @@ -8,77 +8,47 @@ | ||
| 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 | 17 | |
| 18 | -global $userAccessManager, $wpdb; | |
| 19 | -$uamUserGroups | |
| 20 | - = &$userAccessManager->getAccessHandler()->getUserGroups(); | |
| 18 | +global $oUserAccessManager, $wpdb; | |
| 19 | +$aUamUserGroups = $oUserAccessManager->getAccessHandler()->getUserGroups(); | |
| 20 | + | |
| 21 | +$sObjectType = 'user'; | |
| 21 | 22 | |
| 22 | 23 | if (isset($_GET['user_id'])) { |
| 23 | - $objectId = $_GET['user_id']; | |
| 24 | - $editUserData = get_userdata($objectId); | |
| 24 | + $iObjectId = $_GET['user_id']; | |
| 25 | + $oEditUserData = get_userdata($iObjectId); | |
| 25 | 26 | |
| 26 | - $userGroupsForObject | |
| 27 | - = &$userAccessManager->getAccessHandler()->getUserGroupsForUser($objectId); | |
| 27 | + $aUserGroupsForObject = $oUserAccessManager->getAccessHandler()->getUserGroupsForObject( | |
| 28 | + $sObjectType, | |
| 29 | + $iObjectId | |
| 30 | + ); | |
| 28 | 31 | } else { |
| 29 | - $userGroupsForObject = array(); | |
| 32 | + $aUserGroupsForObject = array(); | |
| 30 | 33 | } |
| 31 | 34 | |
| 32 | 35 | ?> |
| 33 | -<h3><?php echo TXT_GROUPS; ?></h3> | |
| 36 | +<h3><?php echo TXT_UAM_GROUPS; ?></h3> | |
| 34 | 37 | <table class="form-table"> |
| 35 | 38 | <tbody> |
| 36 | 39 | <tr> |
| 37 | 40 | <th> |
| 38 | - <label for="usergroups"><?php echo TXT_SET_UP_USERGROUPS; ?></label> | |
| 41 | + <label for="usergroups"><?php echo TXT_UAM_SET_UP_USERGROUPS; ?></label> | |
| 39 | 42 | </th> |
| 40 | 43 | <td> |
| 41 | - <ul> | |
| 42 | 44 | <?php |
| 43 | -if (empty($editUserData->{$wpdb->prefix . "capabilities"}['administrator'])) { | |
| 44 | - if (isset($uamUserGroups)) { | |
| 45 | - foreach ($uamUserGroups as $uamUserGroup) { | |
| 46 | - ?> | |
| 47 | - <li> | |
| 48 | - <label for="uam_usergroup-<?php echo $uamUserGroup->getId(); ?>" lass="selectit"> | |
| 49 | - <input type="checkbox" id="uam_usergroup-<?php echo $uamUserGroup->getId(); ?>" | |
| 50 | - <?php | |
| 51 | - if (array_key_exists($uamUserGroup->getId(), $userGroupsForObject)) { | |
| 52 | - echo 'checked="checked"'; | |
| 53 | - } | |
| 54 | - if (isset($userGroupsForObject[$uamUserGroup->getId()]->setRecursive)) { | |
| 55 | - echo 'disabled=""'; | |
| 56 | - } | |
| 57 | - ?> | |
| 58 | - value="<?php echo $uamUserGroup->getId(); ?>" name="usergroups[]" /> | |
| 59 | - <?php echo $uamUserGroup->getGroupName(); ?> | |
| 60 | - </label> | |
| 61 | - <a class="uam_group_info_link">(<?php echo TXT_INFO; ?>)</a> | |
| 62 | - | |
| 63 | - <?php | |
| 64 | - include 'groupInfo.php'; | |
| 65 | - ?> | |
| 66 | - </li> | |
| 67 | - <?php | |
| 68 | - } | |
| 69 | - } else { | |
| 70 | - ?> | |
| 71 | - <li> | |
| 72 | - <a href='admin.php?page=uam_usergroup'><?php echo TXT_CREATE_GROUP_FIRST; ?></a> | |
| 73 | - </li> | |
| 74 | - <?php | |
| 75 | - } | |
| 45 | +if (!$oUserAccessManager->getAccessHandler()->userIsAdmin($iObjectId)) { | |
| 46 | + include 'groupSelectionForm.php'; | |
| 76 | 47 | } else { |
| 77 | - echo TXT_ADMIN_HINT; | |
| 48 | + echo TXT_UAM_ADMIN_HINT; | |
| 78 | 49 | } |
| 79 | 50 | ?> |
| 80 | - </ul> | |
| 81 | 51 | </td> |
| 82 | 52 | </tr> |
| 83 | 53 | </tbody> |
| 84 | 54 | </table> |
