mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-06 14:17:27 +02:00
Code Issues Projects Releases Wiki Activity

fix get_self_url() misbehaving in plugins/

Browse Source
This commit is contained in:
Andrew Dolgov 2024-11-04 13:59:02 +03:00
parent d8718b7574
commit 42ebdb027e
No known key found for this signature in database
GPG Key ID: 1A56B4FA25D4AF2A
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Config.php
View File

@ -483,7 +483,7 @@ class Config {
$self_url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH); $self_url_path = $proto . '://' . $_SERVER["HTTP_HOST"] . parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH);
$self_url_path = preg_replace("/(\/api\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path); $self_url_path = preg_replace("/(\/api\/{1,})?(\w+\.php)?(\?.*$)?$/", "", $self_url_path);
$self_url_path = preg_replace("/(\/plugins(.local))\/.{1,}$/", "", $self_url_path); $self_url_path = preg_replace("/(\/plugins(.local)?)\/.{1,}$/", "", $self_url_path);
return rtrim($self_url_path, "/"); return rtrim($self_url_path, "/");
} }

12
tests/ConfigTest.php
View File

@ -128,6 +128,18 @@ final class SelfUrlPathTest extends TestCase {
); );
} }
public function test_self_url_k(): void {
$_SERVER = [];
$_SERVER["HTTP_HOST"] = "example.com";
$_SERVER["REQUEST_URI"] = "/tt-rss/plugins/example/api/longpath/test.php/reader/api/0/stream/items/ids?n=1000&output=json&s=user/-/state/com.google/starred";
$this->assertEquals(
'http://example.com/tt-rss',
Config::get_self_url(true)
);
}
public function test_get_self_dir(): void { public function test_get_self_dir(): void {
$this->assertEquals( $this->assertEquals(
dirname(__DIR__), # we're in (app)/tests/ dirname(__DIR__), # we're in (app)/tests/