From 6f6ae34629637d7e4042e4282b44eb3ba8238aa2 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 9 Jul 2010 06:54:25 +0000
Subject: [PATCH] Replace uses of utilities::selfURLhost() followed by
config->getBaseURL with a call to utilities::getBaseURL().
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2389 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php | 3 +--
lib/SimpleSAML/Module.php | 3 +--
lib/SimpleSAML/Utilities.php | 5 ++---
www/saml2/sp/initSSO.php | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 64f462448..51a4aa3ff 100644
--- a/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -117,8 +117,7 @@ class SimpleSAML_Metadata_MetaDataStorageHandlerFlatFile extends SimpleSAML_Meta
private function generateDynamicHostedEntityID($set) {
/* Get the configuration. */
- $config = SimpleSAML_Configuration::getInstance();
- $baseurl = SimpleSAML_Utilities::selfURLhost() . '/' . $config->getBaseURL();
+ $baseurl = SimpleSAML_Utilities::getBaseURL();
if ($set === 'saml20-idp-hosted') {
return $baseurl . 'saml2/idp/metadata.php';
diff --git a/lib/SimpleSAML/Module.php b/lib/SimpleSAML/Module.php
index f626bbdd4..3ae590d50 100644
--- a/lib/SimpleSAML/Module.php
+++ b/lib/SimpleSAML/Module.php
@@ -143,8 +143,7 @@ class SimpleSAML_Module {
assert('is_string($resource)');
assert('$resource[0] !== "/"');
- $config = SimpleSAML_Configuration::getInstance();
- $url = SimpleSAML_Utilities::selfURLhost() . '/' . $config->getBaseURL() . 'module.php/' . $resource;
+ $url = SimpleSAML_Utilities::getBaseURL() . 'module.php/' . $resource;
if (!empty($parameters)) {
$url = SimpleSAML_Utilities::addURLparameter($url, $parameters);
}
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index 98a2a103e..64ba72d68 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -618,7 +618,7 @@ class SimpleSAML_Utilities {
/* Check if there is a valid technical contact email address. */
if($config->getString('technicalcontact_email', 'na@example.org') !== 'na@example.org') {
/* Enable error reporting. */
- $baseurl = SimpleSAML_Utilities::selfURLhost() . '/' . $config->getBaseURL();
+ $baseurl = SimpleSAML_Utilities::getBaseURL();
$t->data['errorReportAddress'] = $baseurl . 'errorreport.php';
}
@@ -1229,8 +1229,7 @@ class SimpleSAML_Utilities {
*/
public static function resolveURL($url, $base = NULL) {
if($base === NULL) {
- $config = SimpleSAML_Configuration::getInstance();
- $base = self::selfURLhost() . '/' . $config->getBaseURL();
+ $base = SimpleSAML_Utilities::getBaseURL();
}
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index a75a4b441..05e7cb40f 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -89,7 +89,7 @@ if ($idpentityid === NULL) {
} elseif($config->getString('idpdisco.url.saml20', NULL) !== NULL) {
$discourl = $config->getString('idpdisco.url.saml20');
} else {
- $discourl = SimpleSAML_Utilities::selfURLhost() . '/' . $config->getBaseURL() . 'saml2/sp/idpdisco.php';
+ $discourl = SimpleSAML_Utilities::getBaseURL() . 'saml2/sp/idpdisco.php';
}
if ($config->getBoolean('idpdisco.extDiscoveryStorage', NULL) != NULL) {
--
GitLab