Merge pull request #216 from sgrossberndt/master

joey-bolts · web-flow · commit ef733bec72ba · 2023-09-12T16:53:36.000+02:00
[BUGFIX] Avoid PHP warning for request of eID=FalSecuredownloadFileTreeState
diff --git a/Classes/Controller/FileTreeStateController.php b/Classes/Controller/FileTreeStateController.php
@@ -62,12 +62,12 @@ public function __construct(Context $context, LeafStateService $leafStateService
      */
     public function saveLeafState(ServerRequestInterface $request): ResponseInterface
     {
-        $folder = $request->getParsedBody()['folder'] ?? $request->getQueryParams()['folder'];
+        $folder = $request->getParsedBody()['folder'] ?? $request->getQueryParams()['folder'] ?? null;
         if (empty($folder)) {
             return (new Response())->withStatus(404);
         }
 
-        $open = (bool)($request->getParsedBody()['open'] ?? $request->getQueryParams()['open']);
+        $open = (bool)($request->getParsedBody()['open'] ?? $request->getQueryParams()['open'] ?? false);
         $userAspect = $this->context->getAspect('beechit.user');
         $this->leafStateService->saveLeafStateForUser($userAspect->get('user'), $folder, $open);
 

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,12 @@ public function __construct(Context $context, LeafStateService $leafStateService`
`62`	`62`	`*/`
`63`	`63`	`public function saveLeafState(ServerRequestInterface $request): ResponseInterface`
`64`	`64`	`{`
`65`		`- $folder = $request->getParsedBody()['folder'] ?? $request->getQueryParams()['folder'];`
	`65`	`+ $folder = $request->getParsedBody()['folder'] ?? $request->getQueryParams()['folder'] ?? null;`
`66`	`66`	`if (empty($folder)) {`
`67`	`67`	`return (new Response())->withStatus(404);`
`68`	`68`	`}`
`69`	`69`
`70`		`- $open = (bool)($request->getParsedBody()['open'] ?? $request->getQueryParams()['open']);`
	`70`	`+ $open = (bool)($request->getParsedBody()['open'] ?? $request->getQueryParams()['open'] ?? false);`
`71`	`71`	`$userAspect = $this->context->getAspect('beechit.user');`
`72`	`72`	`$this->leafStateService->saveLeafStateForUser($userAspect->get('user'), $folder, $open);`
`73`	`73`