Move business logic from controller to service

4 files changed, 9 insertions, 9 deletions

diff --git a/app/Http/Controllers/GedcomFileController.php b/app/Http/Controllers/GedcomFileController.php
index f5a9edfea5..71655100c9 100644
--- a/app/Http/Controllers/GedcomFileController.php
+++ b/app/Http/Controllers/GedcomFileController.php
@@ -83,7 +83,7 @@ class GedcomFileController extends AbstractBaseController
             if ($import_offset === $import_total) {
                 $tree->setPreference('imported', '1');
 
-                $html = view('admin/import-complete');
+                $html = view('admin/import-complete', ['tree' => $tree]);
 
                 return response($html);
             }
@@ -217,6 +217,7 @@ class GedcomFileController extends AbstractBaseController
             return $this->viewResponse('admin/import-progress', [
                 'errors'   => $errors,
                 'progress' => $progress,
+                'tree'     => $tree,
             ]);
         } catch (Exception $ex) {
             DB::connection()->rollBack();
diff --git a/resources/views/admin/import-progress.phtml b/resources/views/admin/import-progress.phtml
index 71ad88a447..49dd3e52a9 100644
--- a/resources/views/admin/import-progress.phtml
+++ b/resources/views/admin/import-progress.phtml
@@ -16,7 +16,7 @@
 <?php if ($errors === ''): ?>
     <script>
         $("#import<?= e($tree->id()) ?>")
-            .load("<?= route('import', ['ged' => $tree->name()]) ?>", {});
+            .load("<?= route('import', ['tree' => $tree->name()]) ?>", {});
     </script>
 <?php else: ?>
     <div class="alert alert-danger">
@@ -30,7 +30,7 @@
     <script>
         $("#error-button-<?= $tree->id() ?>").click(function () {
             $("#import<?= e($tree->id()) ?>")
-                .load("<?= route('import', ['ged' => $tree->name()]) ?>", {});
+                .load("<?= route('import', ['tree' => $tree->name()]) ?>", {});
         });
     </script>
 <?php endif ?>
diff --git a/resources/views/admin/trees-import.phtml b/resources/views/admin/trees-import.phtml
index 592af39e46..b794433615 100644
--- a/resources/views/admin/trees-import.phtml
+++ b/resources/views/admin/trees-import.phtml
@@ -9,8 +9,7 @@
     <?= /* I18N: %s is the name of a family tree */ I18N::translate('This will delete all the genealogy data from “%s” and replace it with data from a GEDCOM file.', e($tree->title())) ?>
 </div>
 
-<form method="post" action="<?= e(route('admin-trees-import-action')) ?>" class="form form-horizontal" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?= e(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')) ?>');">
-    <input type="hidden" name="ged" value="<?= $tree->name() ?>">
+<form method="post" action="<?= e(route('admin-trees-import-action', ['tree' => $tree->name()])) ?>" class="form form-horizontal" enctype="multipart/form-data" onsubmit="return checkGedcomImportForm('<?= e(I18N::translate('You have selected a GEDCOM file with a different name. Is this correct?')) ?>');">
     <input type="hidden" id="gedcom_filename" value="<?= e($default_gedcom_file) ?>">
     <?= csrf_field() ?>
 
diff --git a/routes/web.php b/routes/web.php
index 6376f43e95..7e7fbdb3a9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -152,7 +152,7 @@ $router->attach('', '/admin', static function (Map $router) {
     $router->get('unused-media-thumbnail', '/unused-media-thumbnail', 'MediaFileController::unusedMediaThumbnail');
     $router->get('broadcast', '/broadcast', 'MessageController::broadcastPage');
     $router->post('broadcast-action', '/broadcast', 'MessageController::broadcastAction');
-    $router->post('delete-user', '/delete-user/{user_id}', DeleteUser::class);
+    $router->post('delete-user', '/users/delete/{user_id}', DeleteUser::class);
     $router->get(CreateTreePage::class, '/trees/create', CreateTreePage::class);
     $router->post(CreateTreeAction::class, '/trees/create', CreateTreeAction::class);
     $router->post(DeleteTreeAction::class, '/trees/delete/{tree}', DeleteTreeAction::class);
@@ -175,8 +175,8 @@ $router->attach('', '', static function (Map $router) {
     $router->get('admin-trees-export', '/admin-trees-export', 'AdminTreesController::export');
     $router->get('admin-trees-download', '/admin-trees-download', 'AdminTreesController::exportClient');
     $router->post('admin-trees-export-action', '/admin-trees-export', 'AdminTreesController::exportServer');
-    $router->get('admin-trees-import', '/admin-trees-import', 'AdminTreesController::importForm');
-    $router->post('admin-trees-import-action', '/admin-trees-import', 'AdminTreesController::importAction');
+    $router->get('admin-trees-import', '/tree/{tree}/import', 'AdminTreesController::importForm');
+    $router->post('admin-trees-import-action', '/tree/{tree}/import', 'AdminTreesController::importAction');
     $router->get('admin-trees-places', '/admin-trees-places', 'AdminTreesController::places');
     $router->post('admin-trees-places-action', '/admin-trees-places', 'AdminTreesController::placesAction');
     $router->get('admin-trees-preferences', '/admin-trees-preferences', 'AdminTreesController::preferences');
@@ -187,7 +187,7 @@ $router->attach('', '', static function (Map $router) {
     $router->get('tree-page-default-edit', '/tree-page-default-edit', 'HomePageController::treePageDefaultEdit');
     $router->post('tree-page-default-update', '/tree-page-default-update', 'HomePageController::treePageDefaultUpdate');
     $router->get('tree-page-edit', '/tree-page-edit', 'HomePageController::treePageEdit');
-    $router->post('import', '/import', 'GedcomFileController::import');
+    $router->post('import', '/tree/{tree}/load', 'GedcomFileController::import');
     $router->post('tree-page-update', '/tree-page-update', 'HomePageController::treePageUpdate');
     $router->get('merge-records', '/merge-records', 'AdminController::mergeRecords');
     $router->post('merge-records-update', '/merge-records', 'AdminController::mergeRecordsAction');