Add name and description to generated metadata.

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1364 44740490-163a-0410-bde0-09ae8108e29a

www/saml2/idp/metadata.php

@@ -39,8 +39,6 @@ try {
 	$urlSLOr = $metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted', array('logouttype' => $logouttype));
 
 	$metaArray = array(
-		'name' => 'Type in a name for this entity',
-		'description' => 'and a proper description that would help users know when to select this IdP.',
 		'SingleSignOnService' => $metadata->getGenerated('SingleSignOnService', 'saml20-idp-hosted', array()),
 		'SingleLogoutService' => $metadata->getGenerated('SingleLogoutService', 'saml20-idp-hosted', array('logouttype' => $logouttype)),
 		'SingleLogoutServiceResponse'  => $metadata->getGenerated('SingleLogoutServiceResponse', 'saml20-idp-hosted', array('logouttype' => $logouttype)),
@@ -56,6 +54,15 @@ try {
 	} else {
 		$metaArray['NameIDFormat'] = 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
 	}
+	if (array_key_exists('name', $idpmeta)) {
+		$metaArray['name'] = $idpmeta['name'];
+	}
+	if (array_key_exists('description', $idpmeta)) {
+		$metaArray['description'] = $idpmeta['description'];
+	}
+	if (array_key_exists('url', $idpmeta)) {
+		$metaArray['url'] = $idpmeta['url'];
+	}
 
 
 	$metaflat = var_export($idpentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';

www/saml2/sp/metadata.php

@@ -36,7 +36,15 @@ try {
 	} else {
 		$metaArray['NameIDFormat'] = 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
 	}
-
+	if (array_key_exists('name', $spmeta)) {
+		$metaArray['name'] = $spmeta['name'];
+	}
+	if (array_key_exists('description', $spmeta)) {
+		$metaArray['description'] = $spmeta['description'];
+	}
+	if (array_key_exists('url', $spmeta)) {
+		$metaArray['url'] = $spmeta['url'];
+	}
 
 	$certInfo = SimpleSAML_Utilities::loadPublicKey($spmeta);
 	if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {

www/shib13/idp/metadata.php

@@ -33,8 +33,6 @@ try {
 	}
 
 	$metaArray = array(
-		'name' => 'Type in a name for this entity',
-		'description' => 'and a proper description that would help users know when to select this IdP.',
 		'SingleSignOnService' => $metadata->getGenerated('SingleSignOnService', 'shib13-idp-hosted'),
 		'certFingerprint' => $certFingerprint,
 	);
@@ -44,6 +42,15 @@ try {
 	} else {
 		$metaArray['NameIDFormat'] = 'urn:mace:shibboleth:1.0:nameIdentifier';
 	}
+	if (array_key_exists('name', $idpmeta)) {
+		$metaArray['name'] = $idpmeta['name'];
+	}
+	if (array_key_exists('description', $idpmeta)) {
+		$metaArray['description'] = $idpmeta['description'];
+	}
+	if (array_key_exists('url', $idpmeta)) {
+		$metaArray['url'] = $idpmeta['url'];
+	}
 
 
 	$metaflat = var_export($idpentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';

www/shib13/sp/metadata.php

@@ -41,6 +41,15 @@ try {
 	} else {
 		$metaArray['NameIDFormat'] = 'urn:mace:shibboleth:1.0:nameIdentifier';
 	}
+	if (array_key_exists('name', $spmeta)) {
+		$metaArray['name'] = $spmeta['name'];
+	}
+	if (array_key_exists('description', $spmeta)) {
+		$metaArray['description'] = $spmeta['description'];
+	}
+	if (array_key_exists('url', $spmeta)) {
+		$metaArray['url'] = $spmeta['url'];
+	}
 
 
 	$metaflat = var_export($spentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ',';