From 5450fb0fc15e1b4ab3807c0a2c3613a9d60f768d Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Thu, 12 Jun 2008 13:28:28 +0000
Subject: [PATCH] WS-Fed: Remove unnecessary backwards compatibility.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@648 44740490-163a-0410-bde0-09ae8108e29a
---
www/wsfed/sp/AssertionConsumerService.php | 9 ---------
www/wsfed/sp/prp.php | 3 ---
2 files changed, 12 deletions(-)
delete mode 100644 www/wsfed/sp/AssertionConsumerService.php
diff --git a/www/wsfed/sp/AssertionConsumerService.php b/www/wsfed/sp/AssertionConsumerService.php
deleted file mode 100644
index fc5206e37..000000000
--- a/www/wsfed/sp/AssertionConsumerService.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-/* This file is included for backwards-compatibility. Any references to this file should be replaced
- * by the prp.php-file instead.
- */
-
-require_once('prp.php');
-
-?>
\ No newline at end of file
diff --git a/www/wsfed/sp/prp.php b/www/wsfed/sp/prp.php
index 47de11b27..6bafe03b7 100644
--- a/www/wsfed/sp/prp.php
+++ b/www/wsfed/sp/prp.php
@@ -76,9 +76,6 @@ try {
/* Find the certificate used by the IdP. */
if(array_key_exists('certificate', $idpMetadata)) {
$certFile = $config->getPathvalue('certdir') . $idpMetadata['certificate'];
- } elseif(array_key_exists('cert', $idpMetadata)) {
- /* For backwards compatibility. */
- $certFile = $config->getBaseDir() . $idpMetadata['cert'];
} else {
throw new Exception('Missing \'certificate\' metadata option in the \'wsfed-idp-remote\' metadata' .
' for the IdP \'' . $idpEntityId . '\'.');
--
GitLab