From 14a8660e6afb371b16ea6338f57c1c9662ddd1fe Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Fri, 6 Jun 2008 06:58:57 +0000
Subject: [PATCH] Replace the $SIMPLESAML_INCPREFIX variable with a objects
which prints a warning if it is accessed.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@612 44740490-163a-0410-bde0-09ae8108e29a
---
www/_include.php | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/www/_include.php b/www/_include.php
index 6b1c60f70..90f15ef48 100644
--- a/www/_include.php
+++ b/www/_include.php
@@ -33,11 +33,25 @@ ini_set('include_path', $path);
/**
- * If you have troubles with the ini_set method above, in example because you run on a hosted
- * web hotel where this method is not allowed to call, comment out the three lines above, and instead
- * uncomment this line:
+ * Class which should print a warning every time a reference to $SIMPLESAML_INCPREFIX is made.
*/
-//$SIMPLESAML_INCPREFIX = $path_extra . '/';
+class SimpleSAML_IncPrefixWarn {
+
+ /**
+ * Print a warning, as a call to this function means that $SIMPLESAML_INCPREFIX is referenced.
+ *
+ * @return A blank string.
+ */
+ function __toString() {
+ $backtrace = debug_backtrace();
+ $where = $backtrace[0]['file'] . ':' . $backtrace[0]['line'];
+ error_log('Deprecated $SIMPLESAML_INCPREFIX still in use at ' . $where .
+ '. The simpleSAMLphp library now uses an autoloader.');
+ return '';
+ }
+}
+/* Set the $SIMPLESAML_INCPREFIX to a reference to the class. */
+$SIMPLESAML_INCPREFIX = new SimpleSAML_IncPrefixWarn();
$configdir = dirname(dirname(__FILE__)) . '/config';
--
GitLab