diff options
| -rw-r--r-- | lib/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php | 3 | ||||
| -rw-r--r-- | lib/SimpleSAML/Module.php | 3 | ||||
| -rw-r--r-- | lib/SimpleSAML/Utilities.php | 5 | ||||
| -rw-r--r-- | 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 64f4624..51a4aa3 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 f626bbd..3ae590d 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 98a2a10..64ba72d 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 a75a4b4..05e7cb4 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) { |