From 5936c1e23ba256c26098f9e8173c0c26f73829b2 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 9 Jul 2010 06:55:00 +0000
Subject: [PATCH] Remove SimpleSAML_Utilities::getRequestURI().
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2392 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 15 +++++----------
www/example-simple/hostnames.php | 1 -
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index e326d2f40..5cd223ff8 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -140,21 +140,16 @@ class SimpleSAML_Utilities {
public static function selfURL() {
$selfURLhost = self::selfURLhost();
- return $selfURLhost . self::getRequestURI();
- }
-
- public static function getRequestURI() {
-
- $requesturi = $_SERVER['REQUEST_URI'];
- if ($requesturi[0] !== '/') {
+ $requestURI = $_SERVER['REQUEST_URI'];
+ if ($requestURI[0] !== '/') {
/* We probably have an url on the form: http://server/. */
- if (preg_match('#^https?://[^/]*(/.*)#i', $requesturi, $matches)) {
- $requesturi = $matches[1];
+ if (preg_match('#^https?://[^/]*(/.*)#i', $requestURI, $matches)) {
+ $requestURI = $matches[1];
}
}
- return $requesturi;
+ return $selfURLhost . $requestURI;
}
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 7cdcbdd1b..655f1cb2b 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -27,7 +27,6 @@ $attributes['Utilities_selfURLNoQuery()'] = array(SimpleSAML_Utilities::selfURLN
$attributes['Utilities_getSelfHostWithPath()'] = array(SimpleSAML_Utilities::getSelfHostWithPath());
$attributes['Utilities_getFirstPathElement()'] = array(SimpleSAML_Utilities::getFirstPathElement());
$attributes['Utilities_selfURL()'] = array(SimpleSAML_Utilities::selfURL());
-$attributes['Utilities_getRequestURI()'] = array(SimpleSAML_Utilities::getRequestURI());
--
GitLab