| @@ -8,32 +8,30 @@ | ||
| 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 | -$objectId = $id; | |
| 19 | -global $userAccessManager; | |
| 18 | +global $oUserAccessManager; | |
| 20 | 19 | |
| 21 | -$uamUserGroups | |
| 22 | - = $userAccessManager->getAccessHandler()->getUsergroupsForUser($objectId); | |
| 23 | -$userGroupsForObject = &$uamUserGroups; | |
| 20 | +$aUamUserGroups = $oUserAccessManager->getAccessHandler()->getUsergroupsForObject($sObjectType, $iObjectId); | |
| 21 | +$aUserGroupsForObject = $aUamUserGroups; | |
| 24 | 22 | |
| 25 | -if ($uamUserGroups != Array()) { | |
| 23 | +if ($aUamUserGroups != Array()) { | |
| 26 | 24 | ?> |
| 27 | - <ul> | |
| 25 | + <ul> | |
| 28 | 26 | <?php |
| 29 | - foreach ($uamUserGroups as $uamUserGroup) { | |
| 27 | + foreach ($aUamUserGroups as $oUamUserGroup) { | |
| 30 | 28 | ?> |
| 31 | - <li> | |
| 32 | - <a class="uam_group_info_link"> | |
| 33 | - <?php echo $uamUserGroup->getGroupName(); ?> | |
| 34 | - </a> | |
| 35 | - <?php | |
| 29 | + <li> | |
| 30 | + <a class="uam_group_info_link"> | |
| 31 | + <?php echo htmlentities($oUamUserGroup->getGroupName()); ?> | |
| 32 | + </a> | |
| 33 | + <?php | |
| 36 | 34 | include 'groupInfo.php'; |
| 37 | 35 | ?> |
| 38 | 36 | </li> |
| 39 | 37 | <?php |
| @@ -38,17 +36,15 @@ | ||
| 38 | 36 | </li> |
| 39 | 37 | <?php |
| 40 | 38 | } |
| 41 | 39 | ?> |
| 42 | - </ul> | |
| 40 | + </ul> | |
| 43 | 41 | <?php |
| 44 | 42 | } else { |
| 45 | 43 | global $wpdb; |
| 46 | 44 | |
| 47 | - $userData = get_userdata($id); | |
| 48 | - | |
| 49 | - if (empty($userData->{$wpdb->prefix . "capabilities"}['administrator'])) { | |
| 50 | - echo TXT_NONE; | |
| 45 | + if (!$oUserAccessManager->getAccessHandler()->userIsAdmin($iObjectId)) { | |
| 46 | + echo TXT_UAM_NONE; | |
| 51 | 47 | } else { |
| 52 | - echo TXT_ADMIN_HINT; | |
| 48 | + echo TXT_UAM_ADMIN_HINT; | |
| 53 | 49 | } |
| 54 | 50 | } |