Merge pull request #14340 from annando/issue-14312

Issue 14312: fix uimport path / restore POST endpoints

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();

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();

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();

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)

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)

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();

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();

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');

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');

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

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]],

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>