From 12f723b9f2ad556c9f23f6392b74f9f467a5fef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 16 Jun 2009 09:23:14 +0000
Subject: [PATCH] Fix bug with order of elements in entitydescriptor
(aggregator)
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1522 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Metadata/SAMLBuilder.php | 8 +++++---
modules/aggregator/www/index.php | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index a41031764..80de944f9 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -149,7 +149,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
- private function addOrganizationInfo($metadata) {
+ public function addOrganizationInfo($metadata) {
if (array_key_exists('name', $metadata)) {
$org = $this->createElement('Organization');
@@ -225,6 +225,8 @@ class SimpleSAML_Metadata_SAMLBuilder {
default:
SimpleSAML_Logger::warning('Unable to generate metadata for unknown type \'' . $set . '\'.');
}
+
+ // $this->addOrganizationInfo($metadata);
}
/**
@@ -320,7 +322,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->entityDescriptor->appendChild($e);
- $this->addOrganizationInfo($metadata);
+
if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
foreach($metadata['contacts'] AS $contact) {
@@ -392,7 +394,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
$this->entityDescriptor->appendChild($e);
- $this->addOrganizationInfo($metadata);
+
if (array_key_exists('contacts', $metadata) && is_array($metadata['contacts']) ) {
foreach($metadata['contacts'] AS $contact) {
diff --git a/modules/aggregator/www/index.php b/modules/aggregator/www/index.php
index 08f7439b8..aa1e88eab 100644
--- a/modules/aggregator/www/index.php
+++ b/modules/aggregator/www/index.php
@@ -112,10 +112,13 @@ foreach ($entities as $entity => $sets) {
} else {
$tmp = new SimpleSAML_Metadata_SAMLBuilder($entity,
$aggregatorConfig->getValue('maxCache', NULL), $aggregatorConfig->getValue('maxDuration', NULL));
-
+
+ $orgmeta = NULL;
foreach ($sets as $set => $metadata) {
$tmp->addMetadata($set, $metadata);
+ $orgmeta = $metadata;
}
+ $tmp->addOrganizationInfo($orgmeta);
$entityDescriptor = $tmp->getEntityDescriptor();
}
--
GitLab