Fixes

2 files changed, 10 insertions, 22 deletions

diff --git a/app/Http/Controllers/Admin/AnalyticsController.php b/app/Http/Controllers/Admin/AnalyticsController.php
index f60feed569..15e05765ef 100644
--- a/app/Http/Controllers/Admin/AnalyticsController.php
+++ b/app/Http/Controllers/Admin/AnalyticsController.php
@@ -52,7 +52,7 @@ class AnalyticsController extends AbstractAdminController
      */
     public function edit(Request $request): Response
     {
-        $module_name = $request->get('module');
+        $module_name = $request->get('module', '');
         $module      = Module::findByName($module_name);
 
         if ($module instanceof ModuleAnalyticsInterface) {
diff --git a/app/Http/Controllers/ReportEngineController.php b/app/Http/Controllers/ReportEngineController.php
index c995974995..5104cfdbf2 100644
--- a/app/Http/Controllers/ReportEngineController.php
+++ b/app/Http/Controllers/ReportEngineController.php
@@ -34,7 +34,6 @@ use Fisharebest\Webtrees\Report\ReportPdf;
 use Fisharebest\Webtrees\Source;
 use Fisharebest\Webtrees\Tree;
 use Fisharebest\Webtrees\User;
-use Fisharebest\Webtrees\Webtrees;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
@@ -181,16 +180,17 @@ class ReportEngineController extends AbstractBaseController
      *
      * @param Request $request
      * @param Tree    $tree
+     * @param User    $user
      *
      * @return Response
      */
-    public function reportRun(Request $request, Tree $tree): Response
+    public function reportRun(Request $request, Tree $tree, User $user): Response
     {
-        $report   = $request->get('report');
+        $report   = $request->get('report', '');
         $output   = $request->get('output');
-        $vars     = $request->get('vars');
-        $varnames = $request->get('varnames');
-        $type     = $request->get('type');
+        $vars     = $request->get('vars', []);
+        $varnames = $request->get('varnames', []);
+        $type     = $request->get('type', []);
 
         $module = Module::findByName($report);
 
@@ -198,18 +198,6 @@ class ReportEngineController extends AbstractBaseController
             throw new NotFoundHttpException('Report ' . $report . ' not found.');
         }
 
-        if (!is_array($vars)) {
-            $vars = [];
-        }
-
-        if (!is_array($varnames)) {
-            $varnames = [];
-        }
-
-        if (!is_array($type)) {
-            $type = [];
-        }
-
         //-- setup the arrays
         $newvars = [];
         foreach ($vars as $name => $var) {
@@ -221,7 +209,7 @@ class ReportEngineController extends AbstractBaseController
                         if ($record && $record->canShowName()) {
                             $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($tree));
                         } else {
-                            return $this->reportSetup($request, $tree);
+                            return $this->reportSetup($request, $tree, $user);
                         }
                         break;
                     case 'FAM':
@@ -229,7 +217,7 @@ class ReportEngineController extends AbstractBaseController
                         if ($record && $record->canShowName()) {
                             $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($tree));
                         } else {
-                            return $this->reportSetup($request, $tree);
+                            return $this->reportSetup($request, $tree, $user);
                         }
                         break;
                     case 'SOUR':
@@ -237,7 +225,7 @@ class ReportEngineController extends AbstractBaseController
                         if ($record && $record->canShowName()) {
                             $newvars[$name]['gedcom'] = $record->privatizeGedcom(Auth::accessLevel($tree));
                         } else {
-                            return $this->reportSetup($request, $tree);
+                            return $this->reportSetup($request, $tree, $user);
                         }
                         break;
                 }