Improved URI segmentation

Rike-cz · Rike-cz · commit 70469cfd15e4 · 2025-03-05T19:47:35.000+01:00
diff --git a/controllers/Settings.php b/controllers/Settings.php
@@ -177,7 +177,8 @@ public function update_onBackupStorage()
      */
     private function getSegmentsFromRequest(): array
     {
-        $segments = explode('/', trim(str_after(Request::getUri(), Backend::url()), '/'));
+        $requestPath = parse_url(Request::getUri(), PHP_URL_PATH);
+        $segments = explode('/', trim(str_after($requestPath, config('backend.uri')), '/'));
         return array_pad($segments, 3, null);
     }
 
diff --git a/updates/version.yaml b/updates/version.yaml
@@ -21,4 +21,6 @@
 1.4.0:
     - Scheduler workaround because of disabled proc_open
 1.5.0:
-    - Added chinese lang (thanks @ZhiweiWu0425)
+    - Added chinese lang (thanks @ZhiweiWu0425)
+1.5.1:
+    - Improved URI segmentation

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,8 @@ public function update_onBackupStorage()`
`177`	`177`	`*/`
`178`	`178`	`private function getSegmentsFromRequest(): array`
`179`	`179`	`{`
`180`		`- $segments = explode('/', trim(str_after(Request::getUri(), Backend::url()), '/'));`
	`180`	`+ $requestPath = parse_url(Request::getUri(), PHP_URL_PATH);`
	`181`	`+ $segments = explode('/', trim(str_after($requestPath, config('backend.uri')), '/'));`
`181`	`182`	`return array_pad($segments, 3, null);`
`182`	`183`	`}`
`183`	`184`