From c7c63c27fc8fb45ce5f8a47ac61d44463d31647d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 11 Mar 2008 12:09:19 +0000
Subject: [PATCH] Removed Lib prefix from the require_once sentence that loads
_include.php.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@382 44740490-163a-0410-bde0-09ae8108e29a
---
www/admin/memcachestat.php | 2 +-
www/admin/metadata-converter.php | 2 +-
www/admin/metadata.php | 2 +-
www/admin/phpinfo.php | 2 +-
www/admin/test.php | 2 +-
www/aselect/handler.php | 2 +-
www/auth/login-admin.php | 2 +-
www/auth/login-auto.php | 2 +-
www/auth/login-feide.php | 2 +-
www/auth/login-ldapmulti.php | 2 +-
www/auth/login-radius.php | 2 +-
www/auth/login.php | 2 +-
www/example-simple/hostnames.php | 2 +-
www/example-simple/saml2-example.php | 2 +-
www/example-simple/shib13-example.php | 2 +-
www/index.php | 2 +-
www/noconsent.php | 2 +-
www/openid/provider/server.php | 2 +-
www/saml2/idp/SSOService.php | 2 +-
www/saml2/idp/SingleLogoutService.php | 2 +-
www/saml2/idp/initSLO.php | 2 +-
www/saml2/idp/metadata.php | 2 +-
www/saml2/sp/AssertionConsumerService.php | 2 +-
www/saml2/sp/SingleLogoutService.php | 2 +-
www/saml2/sp/idpdisco.php | 2 +-
www/saml2/sp/initSLO.php | 2 +-
www/saml2/sp/initSSO.php | 2 +-
www/saml2/sp/metadata.php | 2 +-
www/shib13/idp/SSOService.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
www/shib13/sp/AssertionConsumerService.php | 2 +-
www/shib13/sp/idpdisco.php | 2 +-
www/shib13/sp/initSSO.php | 2 +-
www/shib13/sp/metadata.php | 2 +-
34 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/www/admin/memcachestat.php b/www/admin/memcachestat.php
index 28daaa1db..0260049cb 100644
--- a/www/admin/memcachestat.php
+++ b/www/admin/memcachestat.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/MemcacheStore.php');
diff --git a/www/admin/metadata-converter.php b/www/admin/metadata-converter.php
index ff882012e..cbda96fd6 100644
--- a/www/admin/metadata-converter.php
+++ b/www/admin/metadata-converter.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/SAMLParser.php');
diff --git a/www/admin/metadata.php b/www/admin/metadata.php
index a1ec74fd9..671fa5ae6 100644
--- a/www/admin/metadata.php
+++ b/www/admin/metadata.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/admin/phpinfo.php b/www/admin/phpinfo.php
index 622e8eb50..c62d8a617 100644
--- a/www/admin/phpinfo.php
+++ b/www/admin/phpinfo.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/admin/test.php b/www/admin/test.php
index 65348d702..2ec35b98c 100644
--- a/www/admin/test.php
+++ b/www/admin/test.php
@@ -28,7 +28,7 @@
* This page will print out "OK" on success or "ERROR: <message>" on failure.
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/aselect/handler.php b/www/aselect/handler.php
index 06fc8f7ee..c843fbac1 100644
--- a/www/aselect/handler.php
+++ b/www/aselect/handler.php
@@ -53,7 +53,7 @@
* - dynamic bridging after IDP discovery across all protocols (core feature)
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'xmlseclibs.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Logger.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/auth/login-admin.php b/www/auth/login-admin.php
index 88471aa47..9fa3dce36 100644
--- a/www/auth/login-admin.php
+++ b/www/auth/login-admin.php
@@ -1,7 +1,7 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-auto.php b/www/auth/login-auto.php
index 3255bd225..212dee6af 100644
--- a/www/auth/login-auto.php
+++ b/www/auth/login-auto.php
@@ -17,7 +17,7 @@
* options.
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-feide.php b/www/auth/login-feide.php
index b556fa867..863539ca3 100644
--- a/www/auth/login-feide.php
+++ b/www/auth/login-feide.php
@@ -18,7 +18,7 @@
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-ldapmulti.php b/www/auth/login-ldapmulti.php
index 65189cd24..a423c55b4 100644
--- a/www/auth/login-ldapmulti.php
+++ b/www/auth/login-ldapmulti.php
@@ -1,7 +1,7 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login-radius.php b/www/auth/login-radius.php
index f23b38d5d..8d179f8bb 100644
--- a/www/auth/login-radius.php
+++ b/www/auth/login-radius.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/auth/login.php b/www/auth/login.php
index 69a50992e..c0e7790ac 100644
--- a/www/auth/login.php
+++ b/www/auth/login.php
@@ -1,7 +1,7 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
+require_once('../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/example-simple/hostnames.php b/www/example-simple/hostnames.php
index 5e4aaf3ed..55458ed23 100644
--- a/www/example-simple/hostnames.php
+++ b/www/example-simple/hostnames.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index 52e27cbcf..b2d032c02 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -4,7 +4,7 @@
* The _include script sets simpleSAMLphp libraries in the PHP PATH, as well as
* initialize the simpleSAMLphp config class with the correct path.
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
/**
* We need to load a few classes from simpleSAMLphp. These are available because
diff --git a/www/example-simple/shib13-example.php b/www/example-simple/shib13-example.php
index 30afd8a8e..a87da040d 100644
--- a/www/example-simple/shib13-example.php
+++ b/www/example-simple/shib13-example.php
@@ -4,7 +4,7 @@
* The _include script sets simpleSAMLphp libraries in the PHP PATH, as well as
* initialize the simpleSAMLphp config class with the correct path.
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../_include.php');
+require_once('../_include.php');
/**
* We need to load a few classes from simpleSAMLphp. These are available because
diff --git a/www/index.php b/www/index.php
index 731b24259..52a6954e6 100644
--- a/www/index.php
+++ b/www/index.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '_include.php');
+require_once('_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/noconsent.php b/www/noconsent.php
index a10cf3ff7..a2337dbc9 100644
--- a/www/noconsent.php
+++ b/www/noconsent.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '_include.php');
+require_once('_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/XHTML/Template.php');
diff --git a/www/openid/provider/server.php b/www/openid/provider/server.php
index 4bddef197..b3c563c71 100644
--- a/www/openid/provider/server.php
+++ b/www/openid/provider/server.php
@@ -4,7 +4,7 @@
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
// Include simpleSAMLphp libraries
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/saml2/idp/SSOService.php b/www/saml2/idp/SSOService.php
index 3296d0f52..24123aae6 100644
--- a/www/saml2/idp/SSOService.php
+++ b/www/saml2/idp/SSOService.php
@@ -9,7 +9,7 @@
* @version $Id$
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Consent/Consent.php');
diff --git a/www/saml2/idp/SingleLogoutService.php b/www/saml2/idp/SingleLogoutService.php
index ddf7a3d1b..2a69cc5f9 100644
--- a/www/saml2/idp/SingleLogoutService.php
+++ b/www/saml2/idp/SingleLogoutService.php
@@ -12,7 +12,7 @@
// TODO: Show error message, when shibboleth sp is logged in.
// TODO: Propagate HTTP-REDIRECT SLO on SAML 2.0 bridge.
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/idp/initSLO.php b/www/saml2/idp/initSLO.php
index e3eec8d4b..95dbdc4d8 100644
--- a/www/saml2/idp/initSLO.php
+++ b/www/saml2/idp/initSLO.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/idp/metadata.php b/www/saml2/idp/metadata.php
index 4faaae62e..9fcda4e2d 100644
--- a/www/saml2/idp/metadata.php
+++ b/www/saml2/idp/metadata.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index 376f5b26a..e4786e58a 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index 647c89043..a5b230b3e 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/saml2/sp/idpdisco.php b/www/saml2/sp/idpdisco.php
index dd753c879..c4f72506d 100644
--- a/www/saml2/sp/idpdisco.php
+++ b/www/saml2/sp/idpdisco.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/initSLO.php b/www/saml2/sp/initSLO.php
index cbbaa2874..fc7246628 100644
--- a/www/saml2/sp/initSLO.php
+++ b/www/saml2/sp/initSLO.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Logger.php');
diff --git a/www/saml2/sp/initSSO.php b/www/saml2/sp/initSSO.php
index 7219e4e1c..e2825be06 100644
--- a/www/saml2/sp/initSSO.php
+++ b/www/saml2/sp/initSSO.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 0a7939913..2efc97f73 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/idp/SSOService.php b/www/shib13/idp/SSOService.php
index 9372e070a..2eb81ecee 100644
--- a/www/shib13/idp/SSOService.php
+++ b/www/shib13/idp/SSOService.php
@@ -9,7 +9,7 @@
* @version $Id$
*/
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../../www/_include.php');
+require_once('../../../www/_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 72cd4e995..9c7cf1c2b 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
diff --git a/www/shib13/sp/AssertionConsumerService.php b/www/shib13/sp/AssertionConsumerService.php
index feb70c0bc..c789efd18 100644
--- a/www/shib13/sp/AssertionConsumerService.php
+++ b/www/shib13/sp/AssertionConsumerService.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Configuration.php');
diff --git a/www/shib13/sp/idpdisco.php b/www/shib13/sp/idpdisco.php
index 7c9a32fce..c30ee7c20 100644
--- a/www/shib13/sp/idpdisco.php
+++ b/www/shib13/sp/idpdisco.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/shib13/sp/initSSO.php b/www/shib13/sp/initSSO.php
index 8ac65ece0..9b71e61ad 100644
--- a/www/shib13/sp/initSSO.php
+++ b/www/shib13/sp/initSSO.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index 4810280ae..463a4d382 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -1,6 +1,6 @@
<?php
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../_include.php');
+require_once('../../_include.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
--
GitLab