eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

address review by making $args an array

Browse source 
Signed-off-by: Simon L <szaimen@e.mail.de>
This commit is contained in:
Simon L 2023-01-02 15:46:58 +01:00
parent 8089ab83cf
commit f272979c43
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
php/public/index.php
View file

@ -67,7 +67,7 @@ $app->post('/api/auth/logout', AIO\Controller\LoginController::class . ':Logout'
$app->post('/api/configuration', \AIO\Controller\ConfigurationController::class . ':SetConfig'); $app->post('/api/configuration', \AIO\Controller\ConfigurationController::class . ':SetConfig');
// Views // Views
$app->get('/containers', function (Request $request, Response $response, mixed $args) use ($container) { $app->get('/containers', function (Request $request, Response $response, array $args) use ($container) {
$view = Twig::fromRequest($request); $view = Twig::fromRequest($request);
/** @var \AIO\Data\ConfigurationManager $configurationManager */ /** @var \AIO\Data\ConfigurationManager $configurationManager */
$configurationManager = $container->get(\AIO\Data\ConfigurationManager::class); $configurationManager = $container->get(\AIO\Data\ConfigurationManager::class);
@ -112,7 +112,7 @@ $app->get('/containers', function (Request $request, Response $response, mixed $
'additional_backup_directories' => $configurationManager->GetAdditionalBackupDirectoriesString(), 'additional_backup_directories' => $configurationManager->GetAdditionalBackupDirectoriesString(),
]); ]);
})->setName('profile'); })->setName('profile');
$app->get('/login', function (Request $request, Response $response, mixed $args) use ($container) { $app->get('/login', function (Request $request, Response $response, array $args) use ($container) {
$view = Twig::fromRequest($request); $view = Twig::fromRequest($request);
/** @var \AIO\Docker\DockerActionManager $dockerActionManger */ /** @var \AIO\Docker\DockerActionManager $dockerActionManger */
$dockerActionManger = $container->get(\AIO\Docker\DockerActionManager::class); $dockerActionManger = $container->get(\AIO\Docker\DockerActionManager::class);
@ -120,7 +120,7 @@ $app->get('/login', function (Request $request, Response $response, mixed $args)
'is_login_allowed' => $dockerActionManger->isLoginAllowed(), 'is_login_allowed' => $dockerActionManger->isLoginAllowed(),
]); ]);
}); });
$app->get('/setup', function (Request $request, Response $response, mixed $args) use ($container) { $app->get('/setup', function (Request $request, Response $response, array $args) use ($container) {
$view = Twig::fromRequest($request); $view = Twig::fromRequest($request);
/** @var \AIO\Data\Setup $setup */ /** @var \AIO\Data\Setup $setup */
$setup = $container->get(\AIO\Data\Setup::class); $setup = $container->get(\AIO\Data\Setup::class);
@ -142,7 +142,7 @@ $app->get('/setup', function (Request $request, Response $response, mixed $args)
}); });
// Auth Redirector // Auth Redirector
$app->get('/', function (\Psr\Http\Message\RequestInterface $request, Response $response, mixed $args) use ($container) { $app->get('/', function (\Psr\Http\Message\RequestInterface $request, Response $response, array $args) use ($container) {
$authManager = $container->get(\AIO\Auth\AuthManager::class); $authManager = $container->get(\AIO\Auth\AuthManager::class);
/** @var \AIO\Data\Setup $setup */ /** @var \AIO\Data\Setup $setup */

2
php/src/Controller/ConfigurationController.php
View file

@ -19,7 +19,7 @@ class ConfigurationController
$this->configurationManager = $configurationManager; $this->configurationManager = $configurationManager;
} }
public function SetConfig(Request $request, Response $response, mixed $args) : Response { public function SetConfig(Request $request, Response $response, array $args) : Response {
try { try {
if (isset($request->getParsedBody()['domain'])) { if (isset($request->getParsedBody()['domain'])) {
$domain = $request->getParsedBody()['domain'] ?? ''; $domain = $request->getParsedBody()['domain'] ?? '';

16
php/src/Controller/DockerController.php
View file

@ -49,7 +49,7 @@ class DockerController
$this->dockerActionManager->ConnectContainerToNetwork($container); $this->dockerActionManager->ConnectContainerToNetwork($container);
} }
public function GetLogs(Request $request, Response $response, mixed $args) : Response public function GetLogs(Request $request, Response $response, array $args) : Response
{ {
$id = $request->getQueryParams()['id']; $id = $request->getQueryParams()['id'];
if (str_starts_with($id, 'nextcloud-aio-')) { if (str_starts_with($id, 'nextcloud-aio-')) {
@ -67,7 +67,7 @@ class DockerController
->withHeader('Content-Disposition', 'inline'); ->withHeader('Content-Disposition', 'inline');
} }
public function StartBackupContainerBackup(Request $request, Response $response, mixed $args) : Response { public function StartBackupContainerBackup(Request $request, Response $response, array $args) : Response {
$this->startBackup(); $this->startBackup();
return $response->withStatus(201)->withHeader('Location', '/'); return $response->withStatus(201)->withHeader('Location', '/');
} }
@ -84,7 +84,7 @@ class DockerController
$this->PerformRecursiveContainerStart($id); $this->PerformRecursiveContainerStart($id);
} }
public function StartBackupContainerCheck(Request $request, Response $response, mixed $args) : Response { public function StartBackupContainerCheck(Request $request, Response $response, array $args) : Response {
$this->checkBackup(); $this->checkBackup();
return $response->withStatus(201)->withHeader('Location', '/'); return $response->withStatus(201)->withHeader('Location', '/');
} }
@ -98,7 +98,7 @@ class DockerController
$this->PerformRecursiveContainerStart($id); $this->PerformRecursiveContainerStart($id);
} }
public function StartBackupContainerRestore(Request $request, Response $response, mixed $args) : Response { public function StartBackupContainerRestore(Request $request, Response $response, array $args) : Response {
$config = $this->configurationManager->GetConfig(); $config = $this->configurationManager->GetConfig();
$config['backup-mode'] = 'restore'; $config['backup-mode'] = 'restore';
$config['selected-restore-time'] = $request->getParsedBody()['selected_restore_time'] ?? ''; $config['selected-restore-time'] = $request->getParsedBody()['selected_restore_time'] ?? '';
@ -113,7 +113,7 @@ class DockerController
return $response->withStatus(201)->withHeader('Location', '/'); return $response->withStatus(201)->withHeader('Location', '/');
} }
public function StartBackupContainerTest(Request $request, Response $response, mixed $args) : Response { public function StartBackupContainerTest(Request $request, Response $response, array $args) : Response {
$config = $this->configurationManager->GetConfig(); $config = $this->configurationManager->GetConfig();
$config['backup-mode'] = 'test'; $config['backup-mode'] = 'test';
$config['instance_restore_attempt'] = 0; $config['instance_restore_attempt'] = 0;
@ -128,7 +128,7 @@ class DockerController
return $response->withStatus(201)->withHeader('Location', '/'); return $response->withStatus(201)->withHeader('Location', '/');
} }
public function StartContainer(Request $request, Response $response, mixed $args) : Response public function StartContainer(Request $request, Response $response, array $args) : Response
{ {
$uri = $request->getUri(); $uri = $request->getUri();
$host = $uri->getHost(); $host = $uri->getHost();
@ -165,7 +165,7 @@ class DockerController
$this->PerformRecursiveContainerStart($id, $pullContainer); $this->PerformRecursiveContainerStart($id, $pullContainer);
} }
public function StartWatchtowerContainer(Request $request, Response $response, mixed $args) : Response { public function StartWatchtowerContainer(Request $request, Response $response, array $args) : Response {
$this->startWatchtower(); $this->startWatchtower();
return $response->withStatus(201)->withHeader('Location', '/'); return $response->withStatus(201)->withHeader('Location', '/');
} }
@ -188,7 +188,7 @@ class DockerController
$this->dockerActionManager->StopContainer($container); $this->dockerActionManager->StopContainer($container);
} }
public function StopContainer(Request $request, Response $response, mixed $args) : Response public function StopContainer(Request $request, Response $response, array $args) : Response
{ {
$id = self::TOP_CONTAINER; $id = self::TOP_CONTAINER;
$this->PerformRecursiveContainerStop($id); $this->PerformRecursiveContainerStop($id);

6
php/src/Controller/LoginController.php
View file

@ -19,7 +19,7 @@ class LoginController
$this->dockerActionManager = $dockerActionManager; $this->dockerActionManager = $dockerActionManager;
} }
public function TryLogin(Request $request, Response $response, mixed $args) : Response { public function TryLogin(Request $request, Response $response, array $args) : Response {
if (!$this->dockerActionManager->isLoginAllowed()) { if (!$this->dockerActionManager->isLoginAllowed()) {
return $response->withHeader('Location', '/')->withStatus(302); return $response->withHeader('Location', '/')->withStatus(302);
} }
@ -32,7 +32,7 @@ class LoginController
return $response->withHeader('Location', '/')->withStatus(302); return $response->withHeader('Location', '/')->withStatus(302);
} }
public function GetTryLogin(Request $request, Response $response, mixed $args) : Response { public function GetTryLogin(Request $request, Response $response, array $args) : Response {
$token = $request->getQueryParams()['token'] ?? ''; $token = $request->getQueryParams()['token'] ?? '';
if($this->authManager->CheckToken($token)) { if($this->authManager->CheckToken($token)) {
$this->authManager->SetAuthState(true); $this->authManager->SetAuthState(true);
@ -42,7 +42,7 @@ class LoginController
return $response->withHeader('Location', '/')->withStatus(302); return $response->withHeader('Location', '/')->withStatus(302);
} }
public function Logout(Request $request, Response $response, mixed $args) : Response public function Logout(Request $request, Response $response, array $args) : Response
{ {
$this->authManager->SetAuthState(false); $this->authManager->SetAuthState(false);
return $response return $response