[Beeframework-svn] SF.net SVN: beeframework:[76] trunk/framework/Bee/Utils/Env.php

[<m_p...@us...>]

Revision: 76
          http://sourceforge.net/p/beeframework/code/76
Author:   m_plomer
Date:     2013-09-01 23:18:53 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
- Env: added PATH_INFO query param for mod_rewrite with FastcGI

Modified Paths:
--------------
    trunk/framework/Bee/Utils/Env.php

Modified: trunk/framework/Bee/Utils/Env.php
===================================================================
--- trunk/framework/Bee/Utils/Env.php	2013-09-01 21:29:45 UTC (rev 75)
+++ trunk/framework/Bee/Utils/Env.php	2013-09-01 23:18:53 UTC (rev 76)
@@ -26,6 +26,8 @@
 	const PATH_INFO = 'PATH_INFO';
 	const ORIG_PATH_INFO = 'ORIG_PATH_INFO';
 
+	const PATH_INFO_REWRITE_QUERY_PARAM = 'BEE_PATH_INFO_REWRITE';
+
 	public static $USER_AGENTS = array('msie', 'firefox', 'safari', 'webkit', 'opera', 'netscape', 'konqueror', 'gecko');
 
 	private static $pathInfo;
@@ -210,21 +212,18 @@
 
 		if (is_null(self::$pathInfo)) {
 			$pathInfo = array_key_exists(self::PATH_INFO, $_SERVER) ? $_SERVER[self::PATH_INFO] : null;
-			if (Bee_Utils_Strings::hasText($pathInfo)) {
-				self::$pathInfo = $pathInfo;
-
-			} else {
+			if (!Bee_Utils_Strings::hasText($pathInfo) && array_key_exists(self::PATH_INFO_REWRITE_QUERY_PARAM, $_GET)) {
+				$pathInfo = '/' . $_GET['BEE_PATH_INFO_REWRITE'];
+			}
+			if (!Bee_Utils_Strings::hasText($pathInfo)) {
 				$pathInfo = array_key_exists(self::ORIG_PATH_INFO, $_SERVER) ? $_SERVER[self::ORIG_PATH_INFO] : null;
 				if (Bee_Utils_Strings::hasText($pathInfo)) {
-					if ($pathInfo == $_SERVER['ORIG_SCRIPT_NAME']) {
-						return '';
+					if ($pathInfo == $_SERVER['ORIG_SCRIPT_NAME'] || $_SERVER['SCRIPT_NAME']) {
+						$pathInfo = '';
 					}
-					if ($pathInfo == $_SERVER['SCRIPT_NAME']) {
-						return '';
-					}
-					self::$pathInfo = $pathInfo;
 				}
 			}
+			self::$pathInfo = $pathInfo;
 		}
 		return self::$pathInfo;
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.