Browse Source

Fixed a warning in SecurityClass.inc

In SecurityClass.inc it is possible to get the warnings:
warning: Invalid argument supplied for foreach() in /var/www/sites/all/modules/fedora_repository/SecurityClass.inc on line 84.
warning: Invalid argument supplied for foreach() in /var/www/sites/all/modules/fedora_repository/SecurityClass.inc on line 89.

These happen when the XACML policy doesn't contain any roles or users.
pull/66/head
jonathangreen 13 years ago
parent
commit
cedc2f6dd4
  1. 12
      SecurityClass.inc

12
SecurityClass.inc

@ -81,11 +81,15 @@ class SecurityClass {
$roles = $xml->xpath('//default:SubjectAttributeDesignator[@AttributeId="fedoraRole"]/../default:Apply/default:AttributeValue'); $roles = $xml->xpath('//default:SubjectAttributeDesignator[@AttributeId="fedoraRole"]/../default:Apply/default:AttributeValue');
$users = $xml->xpath('//default:SubjectAttributeDesignator[@AttributeId="urn:fedora:names:fedora:2.1:subject:loginId"]/../default:Apply/default:AttributeValue'); $users = $xml->xpath('//default:SubjectAttributeDesignator[@AttributeId="urn:fedora:names:fedora:2.1:subject:loginId"]/../default:Apply/default:AttributeValue');
foreach($roles as $role) { if($roles) {
$allowedRoles[] = (string)$role; foreach($roles as $role) {
$allowedRoles[] = (string)$role;
}
} }
foreach($users as $user) { if($users) {
$allowedUsers[] = (string)$user; foreach($users as $user) {
$allowedUsers[] = (string)$user;
}
} }
$usersAndRoles['users'] = $allowedUsers; $usersAndRoles['users'] = $allowedUsers;

Loading…
Cancel
Save