From 928e58c1e22af8a3ba882da28aeecda04343ece3 Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 9 Jul 2010 06:54:51 +0000
Subject: [PATCH] Remove SimpleSAML_Utilities::getScriptName().
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2391 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Utilities.php | 20 +++++++-------------
www/example-simple/hostnames.php | 1 -
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/lib/SimpleSAML/Utilities.php b/lib/SimpleSAML/Utilities.php
index ef2845c05..e326d2f40 100644
--- a/lib/SimpleSAML/Utilities.php
+++ b/lib/SimpleSAML/Utilities.php
@@ -104,21 +104,15 @@ class SimpleSAML_Utilities {
public static function selfURLNoQuery() {
$selfURLhost = self::selfURLhost();
- return $selfURLhost . self::getScriptName();
-
- }
-
- public static function getScriptName() {
- $scriptname = $_SERVER['SCRIPT_NAME'];
- if (preg_match('|^/.*?(/.*)$|', $_SERVER['SCRIPT_NAME'], $matches)) {
- #$scriptname = $matches[1];
+ $selfURLhost .= $_SERVER['SCRIPT_NAME'];
+ if (isset($_SERVER['PATH_INFO'])) {
+ $selfURLhost .= $_SERVER['PATH_INFO'];
}
- if (array_key_exists('PATH_INFO', $_SERVER)) $scriptname .= $_SERVER['PATH_INFO'];
-
- return $scriptname;
- }
-
+ return $selfURLhost;
+ }
+
+
/**
* Will return sp.example.org/foo
*/
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 8b9194452..7cdcbdd1b 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -24,7 +24,6 @@ $attributes['SERVER_PORT'] = array($_SERVER['SERVER_PORT']);
$attributes['Utilities_getSelfHost()'] = array(SimpleSAML_Utilities::getSelfHost());
$attributes['Utilities_selfURLhost()'] = array(SimpleSAML_Utilities::selfURLhost());
$attributes['Utilities_selfURLNoQuery()'] = array(SimpleSAML_Utilities::selfURLNoQuery());
-$attributes['Utilities_getScriptName()'] = array(SimpleSAML_Utilities::getScriptName());
$attributes['Utilities_getSelfHostWithPath()'] = array(SimpleSAML_Utilities::getSelfHostWithPath());
$attributes['Utilities_getFirstPathElement()'] = array(SimpleSAML_Utilities::getFirstPathElement());
$attributes['Utilities_selfURL()'] = array(SimpleSAML_Utilities::selfURL());
--
GitLab