From d225ba4f44b4cff126fc0455a435ba9e1ef3f09f Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 5 Sep 2010 22:13:29 +0200 Subject: [PATCH] added workaround for missing CGI PATH_INFO envvar --- .../{GroupController.php => AggregatorController.php} | 0 backend/lib/{Util => Model}/Definition.php | 0 backend/lib/Router.php | 7 +++++-- 3 files changed, 5 insertions(+), 2 deletions(-) rename backend/lib/Controller/{GroupController.php => AggregatorController.php} (100%) rename backend/lib/{Util => Model}/Definition.php (100%) diff --git a/backend/lib/Controller/GroupController.php b/backend/lib/Controller/AggregatorController.php similarity index 100% rename from backend/lib/Controller/GroupController.php rename to backend/lib/Controller/AggregatorController.php diff --git a/backend/lib/Util/Definition.php b/backend/lib/Model/Definition.php similarity index 100% rename from backend/lib/Util/Definition.php rename to backend/lib/Model/Definition.php diff --git a/backend/lib/Router.php b/backend/lib/Router.php index 202c487..8a80c2c 100644 --- a/backend/lib/Router.php +++ b/backend/lib/Router.php @@ -84,7 +84,7 @@ class Router { } } else { - throw new \Exception('no PATH_INFO found'); + throw new \Exception('no CGI PATH_INFO envvar found'); } } @@ -100,6 +100,9 @@ class Router { elseif (isset($_SERVER['ORIG_PATH_INFO'])) { return $_SERVER['ORIG_PATH_INFO']; } + elseif (strlen($_SERVER['PHP_SELF']) > strlen($_SERVER['SCRIPT_NAME'])) { + return substr($_SERVER['PHP_SELF'], strlen($_SERVER['SCRIPT_NAME'])); + } else { return FALSE; } @@ -114,4 +117,4 @@ class Router { public function getAction() { return $this->action; } } -?> \ No newline at end of file +?>