From 47e1cb1f9fec3221425fcbceecffcb0ce6d86e3a Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Tue, 3 Aug 2010 09:34:30 +0000
Subject: [PATCH] admin/metadata-converter.php: Remove custom exception
handler.
The exception handler calls fatalError with an invalid error code. We
may as well rely on the unknown exception handler in that case.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2469 44740490-163a-0410-bde0-09ae8108e29a
---
www/admin/metadata-converter.php | 88 +++++++++++++++-----------------
1 file changed, 40 insertions(+), 48 deletions(-)
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index 18cd89c4b..a674979e5 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -2,70 +2,62 @@
require_once('../_include.php');
-try {
+$config = SimpleSAML_Configuration::getInstance();
- $config = SimpleSAML_Configuration::getInstance();
+if(array_key_exists('xmldata', $_POST)) {
+ $xmldata = $_POST['xmldata'];
- if(array_key_exists('xmldata', $_POST)) {
- $xmldata = $_POST['xmldata'];
+ SimpleSAML_Utilities::validateXMLDocument($xmldata, 'saml-meta');
+ $entities = SimpleSAML_Metadata_SAMLParser::parseDescriptorsString($xmldata);
- SimpleSAML_Utilities::validateXMLDocument($xmldata, 'saml-meta');
- $entities = SimpleSAML_Metadata_SAMLParser::parseDescriptorsString($xmldata);
+ /* Get all metadata for the entities. */
+ foreach($entities as &$entity) {
+ $entity = array(
+ 'shib13-sp-remote' => $entity->getMetadata1xSP(),
+ 'shib13-idp-remote' => $entity->getMetadata1xIdP(),
+ 'saml20-sp-remote' => $entity->getMetadata20SP(),
+ 'saml20-idp-remote' => $entity->getMetadata20IdP(),
+ );
- /* Get all metadata for the entities. */
- foreach($entities as &$entity) {
- $entity = array(
- 'shib13-sp-remote' => $entity->getMetadata1xSP(),
- 'shib13-idp-remote' => $entity->getMetadata1xIdP(),
- 'saml20-sp-remote' => $entity->getMetadata20SP(),
- 'saml20-idp-remote' => $entity->getMetadata20IdP(),
- );
-
- }
-
- /* Transpose from $entities[entityid][type] to $output[type][entityid]. */
- $output = SimpleSAML_Utilities::transposeArray($entities);
-
- /* Merge all metadata of each type to a single string which should be
- * added to the corresponding file.
- */
- foreach($output as $type => &$entities) {
+ }
- $text = '';
+ /* Transpose from $entities[entityid][type] to $output[type][entityid]. */
+ $output = SimpleSAML_Utilities::transposeArray($entities);
- foreach($entities as $entityId => $entityMetadata) {
+ /* Merge all metadata of each type to a single string which should be
+ * added to the corresponding file.
+ */
+ foreach($output as $type => &$entities) {
- if($entityMetadata === NULL) {
- continue;
- }
+ $text = '';
- /* Remove the entityDescriptor element because it is unused, and only
- * makes the output harder to read.
- */
- unset($entityMetadata['entityDescriptor']);
+ foreach($entities as $entityId => $entityMetadata) {
- $text .= '$metadata[' . var_export($entityId, TRUE) . '] = ' .
- var_export($entityMetadata, TRUE) . ";\n";
+ if($entityMetadata === NULL) {
+ continue;
}
- $entities = $text;
+ /* Remove the entityDescriptor element because it is unused, and only
+ * makes the output harder to read.
+ */
+ unset($entityMetadata['entityDescriptor']);
+
+ $text .= '$metadata[' . var_export($entityId, TRUE) . '] = ' .
+ var_export($entityMetadata, TRUE) . ";\n";
}
- } else {
- $xmldata = '';
- $output = array();
+ $entities = $text;
}
+} else {
+ $xmldata = '';
+ $output = array();
+}
- $template = new SimpleSAML_XHTML_Template($config, 'metadata-converter.php', 'admin');
-
- $template->data['xmldata'] = $xmldata;
- $template->data['output'] = $output;
- $template->show();
+$template = new SimpleSAML_XHTML_Template($config, 'metadata-converter.php', 'admin');
-} catch(Exception $exception) {
- SimpleSAML_Utilities::fatalError('', 'METADATA_PARSER', $exception);
-}
+$template->data['xmldata'] = $xmldata;
+$template->data['output'] = $output;
-?>
\ No newline at end of file
+$template->show();
--
GitLab