Revision: 2035 Author: olavmrk Date: Fri Dec 4 03:16:24 2009 Log: Fix metadata format on generated simpleSAMLphp metadata.
Merged into 1.5 branch from r2006. http://code.google.com/p/simplesamlphp/source/detail?r=2035 Modified: /branches/simplesamlphp-1.5/modules/saml/www/sp/metadata.php /branches/simplesamlphp-1.5/www/saml2/idp/metadata.php /branches/simplesamlphp-1.5/www/saml2/sp/metadata.php ======================================= --- /branches/simplesamlphp-1.5/modules/saml/www/sp/metadata.php Tue Oct 6 02:35:25 2009 +++ /branches/simplesamlphp-1.5/modules/saml/www/sp/metadata.php Fri Dec 4 03:16:24 2009 @@ -62,7 +62,7 @@ $t->data['header'] = 'saml20-sp'; $t->data['metadata'] = htmlspecialchars($xml); - $t->data['metadataflat'] = var_export($entityId, TRUE) . ' => ' . var_export($metaArray20, TRUE) . ','; + $t->data['metadataflat'] = '$metadata[' . var_export($entityId, TRUE) . '] = ' . var_export($metaArray20, TRUE) . ';'; $t->data['metaurl'] = $source->getMetadataURL(); $t->data['idpsend'] = array(); ======================================= --- /branches/simplesamlphp-1.5/www/saml2/idp/metadata.php Fri Aug 14 04:07:44 2009 +++ /branches/simplesamlphp-1.5/www/saml2/idp/metadata.php Fri Dec 4 03:16:24 2009 @@ -64,7 +64,7 @@ } - $metaflat = var_export($idpentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ','; + $metaflat = '$metadata[' . var_export($idpentityid, TRUE) . '] = ' . var_export($metaArray, TRUE) . ';'; $metaArray['certData'] = $certInfo['certData']; $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($idpentityid); ======================================= --- /branches/simplesamlphp-1.5/www/saml2/sp/metadata.php Tue Oct 20 02:14:40 2009 +++ /branches/simplesamlphp-1.5/www/saml2/sp/metadata.php Fri Dec 4 03:16:24 2009 @@ -47,7 +47,7 @@ $metaArray['certData'] = $certInfo['certData']; } - $metaflat = var_export($spentityid, TRUE) . ' => ' . var_export($metaArray, TRUE) . ','; + $metaflat = '$metadata[' . var_export($spentityid, TRUE) . '] = ' . var_export($metaArray, TRUE) . ';'; $metaBuilder = new SimpleSAML_Metadata_SAMLBuilder($spentityid); $metaBuilder->addMetadataSP20($metaArray); -- 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.
