From 1da8b395dccd81cdfa5b123c9cb9190a501c6c8b Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 28 Aug 2009 07:47:22 +0000
Subject: [PATCH] Fix up frontpage URLs.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1724 44740490-163a-0410-bde0-09ae8108e29a
---
modules/core/www/frontpage_auth.php | 4 ++--
modules/core/www/frontpage_config.php | 6 +++---
modules/core/www/frontpage_federation.php | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/core/www/frontpage_auth.php b/modules/core/www/frontpage_auth.php
index 0620fc21f..37d07180f 100644
--- a/modules/core/www/frontpage_auth.php
+++ b/modules/core/www/frontpage_auth.php
@@ -31,12 +31,12 @@ $links_auth[] = array(
if ($config->getValue('enable.saml20-sp') === true)
$links_auth[] = array(
- 'href' => 'example-simple/saml2-example.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/saml2-example.php',
'text' => '{core:frontpage:link_saml2example}');
if ($config->getValue('enable.shib13-sp') === true)
$links_auth[] = array(
- 'href' => 'example-simple/shib13-example.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/shib13-example.php',
'text' => '{core:frontpage:link_shib13example}');
diff --git a/modules/core/www/frontpage_config.php b/modules/core/www/frontpage_config.php
index faaf2f8fb..7bd4b0462 100644
--- a/modules/core/www/frontpage_config.php
+++ b/modules/core/www/frontpage_config.php
@@ -34,17 +34,17 @@ $links_federation = array();
$links_config[] = array(
- 'href' => 'example-simple/hostnames.php?dummy=1',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'example-simple/hostnames.php?dummy=1',
'text' => '{core:frontpage:link_diagnostics}'
);
$links_config[] = array(
- 'href' => 'admin/phpinfo.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/phpinfo.php',
'text' => '{core:frontpage:link_phpinfo}'
);
$links_config[] = array(
- 'href' => 'admin/config.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/config.php',
'text' => '{core:frontpage:link_configcheck}',
);
diff --git a/modules/core/www/frontpage_federation.php b/modules/core/www/frontpage_federation.php
index fd4194aaf..c681625fa 100644
--- a/modules/core/www/frontpage_federation.php
+++ b/modules/core/www/frontpage_federation.php
@@ -46,7 +46,7 @@ if ($publishURL !== NULL) {
foreach($metadataSources as $name => $url) {
if(!$config->getBoolean('enable.' . $name, FALSE)) continue;
- $url = SimpleSAML_Utilities::resolveURL($url);
+ $url = SimpleSAML_Utilities::getBaseURL() . $url;
$linkTarget = SimpleSAML_Utilities::addURLparameter($publishURL, array('url' => $url));
$links_federation[] = array(
'href' => $linkTarget,
@@ -57,12 +57,12 @@ if ($publishURL !== NULL) {
$links_federation[] = array(
- 'href' => 'admin/metadata.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/metadata.php',
'text' => '{core:frontpage:link_meta_overview}'
);
$links_federation[] = array(
- 'href' => 'admin/metadata-converter.php',
+ 'href' => SimpleSAML_Utilities::getBaseURL() . 'admin/metadata-converter.php',
'text' => '{core:frontpage:link_xmlconvert}',
);
--
GitLab