Skip to content
Snippets Groups Projects
Commit 12f723b9 authored by Andreas Åkre Solberg's avatar Andreas Åkre Solberg
Browse files

Fix bug with order of elements in entitydescriptor (aggregator)

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1522 44740490-163a-0410-bde0-09ae8108e29a
parent e1f25feb
No related branches found
No related tags found
No related merge requests found
...@@ -149,7 +149,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -149,7 +149,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
private function addOrganizationInfo($metadata) { public function addOrganizationInfo($metadata) {
if (array_key_exists('name', $metadata)) { if (array_key_exists('name', $metadata)) {
$org = $this->createElement('Organization'); $org = $this->createElement('Organization');
...@@ -225,6 +225,8 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -225,6 +225,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
default: default:
SimpleSAML_Logger::warning('Unable to generate metadata for unknown type \'' . $set . '\'.'); SimpleSAML_Logger::warning('Unable to generate metadata for unknown type \'' . $set . '\'.');
} }
// $this->addOrganizationInfo($metadata);
} }
/** /**
...@@ -320,7 +322,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -320,7 +322,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->entityDescriptor->appendChild($e); $this->entityDescriptor->appendChild($e);
$this->addOrganizationInfo($metadata);
if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) { if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
foreach($metadata['contacts'] AS $contact) { foreach($metadata['contacts'] AS $contact) {
...@@ -392,7 +394,7 @@ class SimpleSAML_Metadata_SAMLBuilder { ...@@ -392,7 +394,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->entityDescriptor->appendChild($e); $this->entityDescriptor->appendChild($e);
$this->addOrganizationInfo($metadata);
if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) { if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
foreach($metadata['contacts'] AS $contact) { foreach($metadata['contacts'] AS $contact) {
......
...@@ -112,10 +112,13 @@ foreach ($entities as $entity => $sets) { ...@@ -112,10 +112,13 @@ foreach ($entities as $entity => $sets) {
} else { } else {
$tmp = new SimpleSAML_Metadata_SAMLBuilder($entity, $tmp = new SimpleSAML_Metadata_SAMLBuilder($entity,
$aggregatorConfig->getValue('maxCache', NULL), $aggregatorConfig->getValue('maxDuration', NULL)); $aggregatorConfig->getValue('maxCache', NULL), $aggregatorConfig->getValue('maxDuration', NULL));
$orgmeta = NULL;
foreach ($sets as $set => $metadata) { foreach ($sets as $set => $metadata) {
$tmp->addMetadata($set, $metadata); $tmp->addMetadata($set, $metadata);
$orgmeta = $metadata;
} }
$tmp->addOrganizationInfo($orgmeta);
$entityDescriptor = $tmp->getEntityDescriptor(); $entityDescriptor = $tmp->getEntityDescriptor();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment