Testing & refactoring in progress

rotexsoft · Nov 16, 2023 · 1e905d2 · 1e905d2
1 parent 8199b4b
commit 1e905d2
Showing 1 changed file with 16 additions and 3 deletions.
diff --git a/src/controllers/BaseController.php b/src/controllers/BaseController.php
@@ -229,9 +229,22 @@ public function __construct(
             } elseif (str_contains($uri_path, $this->getAppBasePath())) {
 
                 $recomputed_uri = 
-                    str_starts_with($this->getAppBasePath(), '/')
-                    ? $req->getUri()->withPath("{$this->getAppBasePath()}/{$this->controller_name_from_uri}/{$this->action_name_from_uri}")
-                    : $req->getUri()->withPath("/{$this->getAppBasePath()}/{$this->controller_name_from_uri}/{$this->action_name_from_uri}");
+                    (
+                        $this->controller_name_from_uri !== ''
+                        && $this->action_name_from_uri !== ''
+                    )
+                    ? 
+                    (
+                        str_starts_with($this->getAppBasePath(), '/')
+                        ? $req->getUri()->withPath("{$this->getAppBasePath()}/{$this->controller_name_from_uri}/{$this->action_name_from_uri}")
+                        : $req->getUri()->withPath("/{$this->getAppBasePath()}/{$this->controller_name_from_uri}/{$this->action_name_from_uri}")
+                    )
+                    :
+                    (
+                        str_starts_with($this->getAppBasePath(), '/')
+                        ? $req->getUri()->withPath("{$this->getAppBasePath()}/{$this->controller_name_from_uri}")
+                        : $req->getUri()->withPath("/{$this->getAppBasePath()}/{$this->controller_name_from_uri}")
+                    );
             }
 
             $this->current_uri_computed = sMVC_UriToString($recomputed_uri);