saml: Always include artifact endpoints in generated metadata.

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

modules/saml/www/sp/metadata.php

@@ -47,21 +47,17 @@ $acs->Binding = 'urn:oasis:names:tc:SAML:1.0:profiles:browser-post';
 $acs->Location = SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId);
 $sp->AssertionConsumerService[] = $acs;
 
-if ($spconfig->getBoolean('saml20.binding.artifact.enable', FALSE)) {
-	$metaArray20['AssertionConsumerService'][] = array(
-		'index' => 2,
-		'Binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact',
-		'Location' => SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId),
-	);
-}
+$acs = new SAML2_XML_md_IndexedEndpointType();
+$acs->index = 2;
+$acs->Binding = 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact';
+$acs->Location = SimpleSAML_Module::getModuleURL('saml/sp/saml2-acs.php/' . $sourceId);
+$sp->AssertionConsumerService[] = $acs;
 
-if ($spconfig->getBoolean('saml11.binding.artifact.enable', FALSE)) {
-	$acs = new SAML2_XML_md_IndexedEndpointType();
-	$acs->index = 3;
-	$acs->Binding = 'urn:oasis:names:tc:SAML:1.0:profiles:artifact-01';
-	$acs->Location = SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId . '/artifact');
-	$sp->AssertionConsumerService[] = $acs;
-}
+$acs = new SAML2_XML_md_IndexedEndpointType();
+$acs->index = 3;
+$acs->Binding = 'urn:oasis:names:tc:SAML:1.0:profiles:artifact-01';
+$acs->Location = SimpleSAML_Module::getModuleURL('saml/sp/saml1-acs.php/' . $sourceId . '/artifact');
+$sp->AssertionConsumerService[] = $acs;
 
 $certInfo = SimpleSAML_Utilities::loadPublicKey($spconfig);
 if ($certInfo !== NULL && array_key_exists('certData', $certInfo)) {