fix basedir detection for rewritten paths

diff --git a/src/phorkie/Tools.php b/src/phorkie/Tools.php
index 7819cda77efb956bf6cf35ae58a20c9398c12a23..e97c5464f5ce789bd17230f8eeb3b5008800af97 100644 (file)
--- a/src/phorkie/Tools.php
+++ b/src/phorkie/Tools.php
@@ -86,6 +86,13 @@ class Tools
             return $scriptName . '/';
         }
 
+        if (isset($_GET['id'])) {
+            $idp = strpos($requestUri, '/' . $_GET['id'] . '/');
+            if ($idp !== false) {
+                return substr($requestUri, 0, $idp) . '/';
+            }
+        }
+
         if (substr($requestUri, -4) != '.php') {
             $requestUri .= '.php';
         }

diff --git a/tests/phorkie/ToolsTest.php b/tests/phorkie/ToolsTest.php
index 021797d2ef53d1b6815023baec075c01455cfe7c..d8df8f42d89e5f5533c767c45791d655ba8a2177 100644 (file)
--- a/tests/phorkie/ToolsTest.php
+++ b/tests/phorkie/ToolsTest.php
@@ -3,6 +3,11 @@ namespace phorkie;
 
 class ToolsTest extends \PHPUnit_Framework_TestCase
 {
+    public function setUp()
+    {
+        $_GET[] = array();
+    }
+
     public function testDetectBaseUrlPhar()
     {
         $_SERVER['REQUEST_URI'] = '/phar/phorkie-0.4.0.phar/list.php';
@@ -34,6 +39,22 @@ class ToolsTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('/foo/', Tools::detectBaseUrl());
     }
 
+    public function testDetectBaseUrlEdit()
+    {
+        $_GET['id'] = 82;
+        $_SERVER['REQUEST_URI'] = '/82/edit';
+        $_SERVER['SCRIPT_NAME'] = '/edit.php';
+        $this->assertEquals('/', Tools::detectBaseUrl());
+    }
+
+    public function testDetectBaseUrlEditSubdir()
+    {
+        $_GET['id'] = 82;
+        $_SERVER['REQUEST_URI'] = '/foo/82/edit';
+        $_SERVER['SCRIPT_NAME'] = '/edit.php';
+        $this->assertEquals('/foo/', Tools::detectBaseUrl());
+    }
+
     public function testFoldPathParentSingle()
     {
         $this->assertEquals(