From 612d1fccbc91e9dd878cbc9fcc7314feae9db917 Mon Sep 17 00:00:00 2001
From: Jaime Perez <jaime.perez@uninett.no>
Date: Tue, 30 Sep 2014 17:58:41 +0200
Subject: [PATCH] Start using the helper function getContact() prior to all
calls to addContact().
---
lib/SimpleSAML/Metadata/SAMLBuilder.php | 4 ++--
modules/adfs/www/idp/metadata.php | 5 +++--
www/shib13/idp/metadata.php | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/SAMLBuilder.php b/lib/SimpleSAML/Metadata/SAMLBuilder.php
index 455300160..f684d82bd 100644
--- a/lib/SimpleSAML/Metadata/SAMLBuilder.php
+++ b/lib/SimpleSAML/Metadata/SAMLBuilder.php
@@ -465,7 +465,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
foreach ($metadata->getArray('contacts', array()) as $contact) {
if (array_key_exists('contactType', $contact) && array_key_exists('emailAddress', $contact)) {
- $this->addContact($contact['contactType'], $contact);
+ $this->addContact($contact['contactType'], SimpleSAML_Utils_Config_Metadata::getContact($contact));
}
}
@@ -511,7 +511,7 @@ class SimpleSAML_Metadata_SAMLBuilder {
foreach ($metadata->getArray('contacts', array()) as $contact) {
if (array_key_exists('contactType', $contact) && array_key_exists('emailAddress', $contact)) {
- $this->addContact($contact['contactType'], $contact);
+ $this->addContact($contact['contactType'], SimpleSAML_Utils_Config_Metadata::getContact($contact));
}
}
diff --git a/modules/adfs/www/idp/metadata.php b/modules/adfs/www/idp/metadata.php
index f1a191a41..8dcd6bab8 100644
--- a/modules/adfs/www/idp/metadata.php
+++ b/modules/adfs/www/idp/metadata.php
@@ -112,10 +112,11 @@ try {
$metaBuilder->addOrganizationInfo($metaArray);
$technicalContactEmail = $config->getString('technicalcontact_email', NULL);
if ($technicalContactEmail && $technicalContactEmail !== 'na@example.org') {
- $metaBuilder->addContact('technical', array(
+ $metaBuilder->addContact('technical', SimpleSAML_Utils_Config_Metadata::getContact(array(
'emailAddress' => $technicalContactEmail,
'name' => $config->getString('technicalcontact_name', NULL),
- ));
+ 'contactType' => 'technical',
+ )));
}
$output_xhtml = array_key_exists('output', $_GET) && $_GET['output'] == 'xhtml';
$metaxml = $metaBuilder->getEntityDescriptorText($output_xhtml);
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 40bf49619..e04345e20 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -69,10 +69,11 @@ try {
$metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($idpentityid);
$metaBuilder->addMetadataIdP11($metaArray);
$metaBuilder->addOrganizationInfo($metaArray);
- $metaBuilder->addContact('technical', array(
+ $metaBuilder->addContact('technical', SimpleSAML_Utils_Config_Metadata::getContact(array(
'emailAddress' => $config->getString('technicalcontact_email', NULL),
'name' => $config->getString('technicalcontact_name', NULL),
- ));
+ 'contactType' => 'technical',
+ )));
$metaxml = $metaBuilder->getEntityDescriptorText();
/* Sign the metadata if enabled. */
--
GitLab