Issue 14312: fix uimport path / restore POST endpoints

diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index 0adf2b5108202d2780028e6e3e5383f9d3a3d4d0..71f11ac09500c1be0a9a919654dab0a5e57a236e 100644 (file)
--- 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 af8043e86fc55b6420c90fece25ad04111f73898..b8d74fd224ec86aaf975dc5e86df8316889cfe0b 100644 (file)
--- 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 bebcdd1d417715138d81ef0416dc790efa6e3241..a0d2c1283bd28a6412721e952bcb306a37bbcc01 100644 (file)
--- 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 c6162eb2e7684335c75408725d52f7c19b408b4f..010df11f1ab09313676db67f0db38ae35e2399ff 100644 (file)
--- 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 a67d5229616896a14c71a2aa5dcfc5764ef3e80f..c6478e90167303c0b4bac3aa013c899bc0aef9e7 100644 (file)
--- 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 f41ff5b7bf0b890e5f2a69c622f434932cc39845..f3641cb81c09e5423eff2b94025c1f8418df9933 100644 (file)
--- 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 02c665471f6f478b9a5565bcb6be70100822ecc6..450285d65ff8bcafd7fc3c0a2a64f53a2065864d 100644 (file)
--- 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 882a19c7e4df05719e91ce4b98042736a0f4ae4d..d8028831e8527a1de978c6992b224c5bc0c4c70e 100644 (file)
--- 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 8181a76354139ceb1cb80da7558ccc8d19fe9c40..9ba0156e68a4f12bff3dd454e05896c1b177c52e 100644 (file)
--- 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 9ec0fa677d1066f2dacc93df4bd96b4e33060980..dc8babb233e5574530e4a065f5f3ad136fe959e5 100644 (file)
--- 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 77d29e661da9ca27b00bd36d815d1ac62b4ca3f6..ee3f571829e21aa66054de584d636209c9442760 100644 (file)
--- 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 e33152c4bb36b0866f2bf50864cd3b46dad2f567..afba0bc9b6d8ae017bde93fc37036559611d9cab 100644 (file)
--- a/view/templates/user/import.tpl
+++ b/view/templates/user/import.tpl
@@ -1,4 +1,4 @@
-<form action="uimport" method="post" id="uimport-form" enctype="multipart/form-data">
+<form action="user/import" method="post" id="uimport-form" enctype="multipart/form-data">
        <h2>{{$import.title}}</h2>
        <p>{{$import.intro}}</p>
        <p>{{$import.instruct}}</p>