From 1a6e3812065237bcaac15bd5e433ac3f303d8200 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 3 Aug 2024 12:20:56 +0000 Subject: [PATCH] Issue 14312: fix uimport path / restore POST endpoints --- src/Module/Admin/Addons/Index.php | 6 ++++++ src/Module/Admin/Themes/Details.php | 6 ++++++ src/Module/Admin/Themes/Index.php | 6 ++++++ src/Module/Debug/ActivityPubConversion.php | 6 ++++++ src/Module/Debug/Babel.php | 6 ++++++ src/Module/Moderation/Item/Source.php | 6 ++++++ src/Module/Moderation/Reports.php | 6 ++++++ src/Module/Notifications/Introductions.php | 6 ++++++ src/Module/Notifications/Notifications.php | 6 ++++++ src/Module/Security/Logout.php | 5 +++++ static/routes.config.php | 2 +- view/templates/user/import.tpl | 2 +- 12 files changed, 61 insertions(+), 2 deletions(-) diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php index 0adf2b5108..71f11ac095 100644 --- a/src/Module/Admin/Addons/Index.php +++ b/src/Module/Admin/Addons/Index.php @@ -28,6 +28,12 @@ use Friendica\Module\BaseAdmin; class Index extends BaseAdmin { + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { parent::content(); diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php index af8043e86f..b8d74fd224 100644 --- a/src/Module/Admin/Themes/Details.php +++ b/src/Module/Admin/Themes/Details.php @@ -30,6 +30,12 @@ use Friendica\Util\Strings; class Details extends BaseAdmin { + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { parent::content(); diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index bebcdd1d41..a0d2c1283b 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -29,6 +29,12 @@ use Friendica\Util\Strings; class Index extends BaseAdmin { + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { parent::content(); diff --git a/src/Module/Debug/ActivityPubConversion.php b/src/Module/Debug/ActivityPubConversion.php index c6162eb2e7..010df11f1a 100644 --- a/src/Module/Debug/ActivityPubConversion.php +++ b/src/Module/Debug/ActivityPubConversion.php @@ -29,6 +29,12 @@ use Friendica\Util\JsonLD; class ActivityPubConversion extends BaseModule { + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { function visible_whitespace($s) diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php index a67d522961..c6478e9016 100644 --- a/src/Module/Debug/Babel.php +++ b/src/Module/Debug/Babel.php @@ -35,6 +35,12 @@ use Friendica\Util\XML; */ class Babel extends BaseModule { + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { function visible_whitespace($s) diff --git a/src/Module/Moderation/Item/Source.php b/src/Module/Moderation/Item/Source.php index f41ff5b7bf..f3641cb81c 100644 --- a/src/Module/Moderation/Item/Source.php +++ b/src/Module/Moderation/Item/Source.php @@ -45,6 +45,12 @@ class Source extends BaseModeration $this->config = $config; } + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { parent::content(); diff --git a/src/Module/Moderation/Reports.php b/src/Module/Moderation/Reports.php index 02c665471f..450285d65f 100644 --- a/src/Module/Moderation/Reports.php +++ b/src/Module/Moderation/Reports.php @@ -48,6 +48,12 @@ class Reports extends BaseModeration $this->database = $database; } + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { parent::content(); diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 882a19c7e4..d8028831e8 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -77,6 +77,12 @@ class Introductions extends BaseNotifications ]; } + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { Nav::setSelected('introductions'); diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php index 8181a76354..9ba0156e68 100644 --- a/src/Module/Notifications/Notifications.php +++ b/src/Module/Notifications/Notifications.php @@ -96,6 +96,12 @@ class Notifications extends BaseNotifications ]; } + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->content($request); + } + protected function content(array $request = []): string { Nav::setSelected('notifications'); diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php index 9ec0fa677d..dc8babb233 100644 --- a/src/Module/Security/Logout.php +++ b/src/Module/Security/Logout.php @@ -56,6 +56,11 @@ class Logout extends BaseModule $this->session = $session; } + protected function post(array $request = []) + { + // @todo check if POST is really used here + $this->rawContent($request); + } /** * Process logout requests diff --git a/static/routes.config.php b/static/routes.config.php index 77d29e661d..ee3f571829 100644 --- a/static/routes.config.php +++ b/static/routes.config.php @@ -446,7 +446,7 @@ return [ '/filed' => [Module\Search\Filed::class, [R::GET]], '/filer[/{id:\d+}]' => [Module\Filer\SaveTag::class, [R::GET]], '/filerm/{id:\d+}' => [Module\Filer\RemoveTag::class, [R::GET, R::POST]], - '/follow_confirm' => [Module\FollowConfirm::class, [R::GET, R::POST]], + '/follow_confirm' => [Module\FollowConfirm::class, [R::POST]], '/followers/{nickname}' => [Module\ActivityPub\Followers::class, [R::GET]], '/following/{nickname}' => [Module\ActivityPub\Following::class, [R::GET]], '/friendica[/{format:json}]' => [Module\Friendica::class, [R::GET]], diff --git a/view/templates/user/import.tpl b/view/templates/user/import.tpl index e33152c4bb..afba0bc9b6 100644 --- a/view/templates/user/import.tpl +++ b/view/templates/user/import.tpl @@ -1,4 +1,4 @@ -
+

{{$import.title}}

{{$import.intro}}

{{$import.instruct}}