deal with in-docroot installs and custom rewrites properly

fuel · Jul 14, 2013 · a1ac30d · a1ac30d
1 parent e8c7ac2
commit a1ac30d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/base.php b/base.php
@@ -363,3 +363,27 @@ function http_build_url($url, $parts = array(), $flags = HTTP_URL_REPLACE, &$new
 		;
 	}
 }
+
+if ( ! function_exists('get_common_path'))
+{
+	function get_common_path($paths)
+	{
+		$lastOffset = 1;
+		$common = '/';
+		while (($index = strpos($paths[0], '/', $lastOffset)) !== false)
+		{
+			$dirLen = $index - $lastOffset + 1;	// include /
+			$dir = substr($paths[0], $lastOffset, $dirLen);
+			foreach ($paths as $path)
+			{
+				if (substr($path, $lastOffset, $dirLen) != $dir)
+				{
+					return $common;
+				}
+			}
+			$common .= $dir;
+			$lastOffset = $index + 1;
+		}
+		return $common;
+	}
+}
diff --git a/classes/fuel.php b/classes/fuel.php
@@ -264,7 +264,8 @@ protected static function generate_base_url()
 		}
 		if (\Input::server('script_name'))
 		{
-			$base_url .= str_replace('\\', '/', dirname(\Input::server('script_name')));
+			$common = get_common_path(array(\Input::server('request_uri'), \Input::server('script_name')));
+			$base_url .= $common;
 		}
 
 		// Add a slash if it is missing and return it

diff --git a/classes/input.php b/classes/input.php
@@ -134,7 +134,7 @@ public static function uri()
 			// Fall back to parsing the REQUEST URI
 			if (isset($_SERVER['REQUEST_URI']))
 			{
-				$uri = $_SERVER['REQUEST_URI'];
+				$uri = strpos($_SERVER['SCRIPT_NAME'], $_SERVER['REQUEST_URI']) !== 0 ? $_SERVER['REQUEST_URI'] : '';
 			}
 			else
 			{