From 11bcf282bfd6f513355fef34d7dd1ce52d53c298 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 20 Jul 2009 21:18:07 -0600 Subject: [PATCH] Fix PATH_INFO determination for base directories on lighttpd --- framework/Util/lib/Horde/Util.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/Util/lib/Horde/Util.php b/framework/Util/lib/Horde/Util.php index 930f6974a..2fa53a94d 100644 --- a/framework/Util/lib/Horde/Util.php +++ b/framework/Util/lib/Horde/Util.php @@ -945,11 +945,12 @@ class Horde_Util */ static public function getPathInfo() { - if (isset($_SERVER['PATH_INFO']) && strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') === false) { + if (isset($_SERVER['PATH_INFO']) && + (strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') === false)) { return $_SERVER['PATH_INFO']; } elseif (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['SCRIPT_NAME'])) { - $search = array($_SERVER['SCRIPT_NAME']); + $search = array((basename($_SERVER['SCRIPT_NAME']) == 'index.php') ? dirname($_SERVER['SCRIPT_NAME']) . '/' : $_SERVER['SCRIPT_NAME']); $replace = array(''); if (!empty($_SERVER['QUERY_STRING'])) { $search[] = '?' . $_SERVER['QUERY_STRING']; -- 2.11.0