Revision: 1982
Author: olavmrk
Date: Thu Nov 12 06:42:52 2009
Log: SAML2_AuthnRequest: Move Scoping-element to after NameIDPolicy as per
spec.
http://code.google.com/p/simplesamlphp/source/detail?r=1982
Modified:
/trunk/lib/SAML2/AuthnRequest.php
=======================================
--- /trunk/lib/SAML2/AuthnRequest.php Tue Sep 22 03:11:38 2009
+++ /trunk/lib/SAML2/AuthnRequest.php Thu Nov 12 06:42:52 2009
@@ -270,18 +270,6 @@
if ($this->protocolBinding !== NULL) {
$root->setAttribute('ProtocolBinding',
$this->protocolBinding);
}
-
- if (count($this->IDPList) > 0) {
- $scoping =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'Scoping');
- $idplist =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'IDPList');
- foreach ($this->IDPList as $provider) {
- $idpEntry =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'IDPEntry');
- $idpEntry->setAttribute('ProviderID',
$provider);
- $idplist->appendChild($idpEntry);
- }
- $scoping->appendChild($idplist);
- $root->appendChild($scoping);
- }
if (!empty($this->nameIdPolicy)) {
$nameIdPolicy =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'NameIDPolicy');
@@ -296,6 +284,18 @@
}
$root->appendChild($nameIdPolicy);
}
+
+ if (count($this->IDPList) > 0) {
+ $scoping =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'Scoping');
+ $idplist =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'IDPList');
+ foreach ($this->IDPList as $provider) {
+ $idpEntry =
$this->document->createElementNS(SAML2_Const::NS_SAMLP, 'IDPEntry');
+ $idpEntry->setAttribute('ProviderID',
$provider);
+ $idplist->appendChild($idpEntry);
+ }
+ $scoping->appendChild($idplist);
+ $root->appendChild($scoping);
+ }
return $root;
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"simpleSAMLphp commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/simplesamlphp-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
