diff options
Diffstat (limited to 'app/Http')
31 files changed, 736 insertions, 246 deletions
diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 33feff4971..045d03f7bf 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -27,9 +27,12 @@ use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Services\ModuleService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\Session; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; /** * Controller to allow the user to edit their account details. @@ -65,6 +68,8 @@ class AccountController extends AbstractBaseController public function edit(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree); diff --git a/app/Http/Controllers/Admin/LocationController.php b/app/Http/Controllers/Admin/LocationController.php index 7b0f2b0d81..eeb0af9047 100644 --- a/app/Http/Controllers/Admin/LocationController.php +++ b/app/Http/Controllers/Admin/LocationController.php @@ -25,10 +25,12 @@ use Fisharebest\Webtrees\Http\RequestHandlers\ControlPanel; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Services\GedcomService; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Database\QueryException; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\UploadedFileInterface; @@ -39,6 +41,7 @@ use function addcslashes; use function array_filter; use function array_pop; use function array_shift; +use function assert; use function count; use function explode; use function fclose; @@ -727,6 +730,7 @@ class LocationController extends AbstractAdminController public function importLocationsFromTree(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); // Get all the places from the places table ... $places = DB::table('places AS p0') diff --git a/app/Http/Controllers/Admin/UpgradeController.php b/app/Http/Controllers/Admin/UpgradeController.php index c1f50c2531..7222b78d9a 100644 --- a/app/Http/Controllers/Admin/UpgradeController.php +++ b/app/Http/Controllers/Admin/UpgradeController.php @@ -27,6 +27,7 @@ use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\Webtrees; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Support\Collection; +use InvalidArgumentException; use League\Flysystem\Adapter\Local; use League\Flysystem\Cached\CachedAdapter; use League\Flysystem\Cached\Storage\Memory; @@ -37,6 +38,7 @@ use Psr\Http\Message\ServerRequestInterface; use RuntimeException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Throwable; +use function assert; /** * Controller for upgrading to a new version of webtrees. diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index 4d14cd04ab..bde81f2151 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -48,6 +48,7 @@ use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use InvalidArgumentException; use League\Flysystem\Filesystem; use League\Flysystem\MountManager; use League\Flysystem\ZipArchive\ZipArchiveAdapter; @@ -61,6 +62,7 @@ use Throwable; use function addcslashes; use function app; +use function assert; use function fclose; use function fopen; use function is_dir; @@ -117,6 +119,7 @@ class AdminTreesController extends AbstractBaseController public function check(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); // We need to work with raw GEDCOM data, as we are looking for errors // which may prevent the GedcomRecord objects from working. @@ -1710,6 +1713,8 @@ class AdminTreesController extends AbstractBaseController public function setDefault(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + Site::setPreference('DEFAULT_GEDCOM', $tree->name()); /* I18N: %s is the name of a family tree */ @@ -1728,6 +1733,8 @@ class AdminTreesController extends AbstractBaseController public function synchronize(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $url = route('manage-trees', ['tree' => $tree->name()]); $gedcom_files = $this->gedcomFiles(WT_DATA_DIR); diff --git a/app/Http/Controllers/EditFamilyController.php b/app/Http/Controllers/EditFamilyController.php index 65912fb412..5c01737708 100644 --- a/app/Http/Controllers/EditFamilyController.php +++ b/app/Http/Controllers/EditFamilyController.php @@ -38,67 +38,6 @@ class EditFamilyController extends AbstractEditController * * @return ResponseInterface */ - public function reorderChildren(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getQueryParams()['xref']; - $family = Family::getInstance($xref, $tree); - - Auth::checkFamilyAccess($family, true); - - $title = $family->fullName() . ' — ' . I18N::translate('Re-order children'); - - return $this->viewResponse('edit/reorder-children', [ - 'title' => $title, - 'family' => $family, - ]); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderChildrenAction(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getParsedBody()['xref']; - $order = $request->getParsedBody()['order'] ?? []; - $family = Family::getInstance($xref, $tree); - - Auth::checkFamilyAccess($family, true); - - $dummy_facts = ['0 @' . $family->xref() . '@ FAM']; - $sort_facts = []; - $keep_facts = []; - - // Split facts into FAMS and other - foreach ($family->facts() as $fact) { - if ($fact->getTag() === 'CHIL') { - $sort_facts[$fact->id()] = $fact->gedcom(); - } else { - $keep_facts[] = $fact->gedcom(); - } - } - - // Sort the facts - uksort($sort_facts, static function ($x, $y) use ($order) { - return array_search($x, $order, true) - array_search($y, $order, true); - }); - - // Merge the facts - $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); - - $family->updateRecord($gedcom, false); - - return redirect($family->url()); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ public function addChild(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); diff --git a/app/Http/Controllers/EditGedcomRecordController.php b/app/Http/Controllers/EditGedcomRecordController.php index a2075900b5..fabf83fe05 100644 --- a/app/Http/Controllers/EditGedcomRecordController.php +++ b/app/Http/Controllers/EditGedcomRecordController.php @@ -28,9 +28,12 @@ use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Module\CensusAssistantModule; use Fisharebest\Webtrees\Services\ClipboardService; use Fisharebest\Webtrees\Services\ModuleService; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use function assert; /** * Controller for edit forms and responses. @@ -306,6 +309,8 @@ class EditGedcomRecordController extends AbstractEditController public function addFact(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $fact = $request->getQueryParams()['fact']; diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php index 2a87c60132..e708ac85a9 100644 --- a/app/Http/Controllers/EditIndividualController.php +++ b/app/Http/Controllers/EditIndividualController.php @@ -23,199 +23,20 @@ use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\GedcomCode\GedcomCodePedi; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use function assert; + /** * Controller for edit forms and responses. */ class EditIndividualController extends AbstractEditController { - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderMedia(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getQueryParams()['xref']; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $title = $individual->fullName() . ' — ' . I18N::translate('Re-order media'); - - return $this->viewResponse('edit/reorder-media', [ - 'title' => $title, - 'individual' => $individual, - ]); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderMediaAction(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getParsedBody()['xref']; - $order = $request->getParsedBody()['order'] ?? []; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; - $sort_facts = []; - $keep_facts = []; - - // Split facts into OBJE and other - foreach ($individual->facts() as $fact) { - if ($fact->getTag() === 'OBJE') { - $sort_facts[$fact->id()] = $fact->gedcom(); - } else { - $keep_facts[] = $fact->gedcom(); - } - } - - // Sort the facts - uksort($sort_facts, static function ($x, $y) use ($order) { - return array_search($x, $order, true) - array_search($y, $order, true); - }); - - // Merge the facts - $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); - - $individual->updateRecord($gedcom, false); - - return redirect($individual->url()); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderNames(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getQueryParams()['xref']; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $title = $individual->fullName() . ' — ' . I18N::translate('Re-order names'); - - return $this->viewResponse('edit/reorder-names', [ - 'title' => $title, - 'individual' => $individual, - ]); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderNamesAction(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getParsedBody()['xref']; - $order = $request->getParsedBody()['order'] ?? []; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; - $sort_facts = []; - $keep_facts = []; - - // Split facts into NAME and other - foreach ($individual->facts() as $fact) { - if ($fact->getTag() === 'NAME') { - $sort_facts[$fact->id()] = $fact->gedcom(); - } else { - $keep_facts[] = $fact->gedcom(); - } - } - - // Sort the facts - uksort($sort_facts, static function ($x, $y) use ($order) { - return array_search($x, $order, true) - array_search($y, $order, true); - }); - - // Merge the facts - $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); - - $individual->updateRecord($gedcom, false); - - return redirect($individual->url()); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderSpouses(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getQueryParams()['xref']; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $title = $individual->fullName() . ' — ' . I18N::translate('Re-order families'); - - return $this->viewResponse('edit/reorder-spouses', [ - 'title' => $title, - 'individual' => $individual, - ]); - } - - /** - * @param ServerRequestInterface $request - * - * @return ResponseInterface - */ - public function reorderSpousesAction(ServerRequestInterface $request): ResponseInterface - { - $tree = $request->getAttribute('tree'); - $xref = $request->getParsedBody()['xref']; - $order = $request->getParsedBody()['order'] ?? []; - $individual = Individual::getInstance($xref, $tree); - - Auth::checkIndividualAccess($individual, true); - - $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; - $sort_facts = []; - $keep_facts = []; - - // Split facts into FAMS and other - foreach ($individual->facts() as $fact) { - if ($fact->getTag() === 'FAMS') { - $sort_facts[$fact->id()] = $fact->gedcom(); - } else { - $keep_facts[] = $fact->gedcom(); - } - } - - // Sort the facts - uksort($sort_facts, static function ($x, $y) use ($order) { - return array_search($x, $order, true) - array_search($y, $order, true); - }); - - // Merge the facts - $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); - - $individual->updateRecord($gedcom, false); - - return redirect($individual->url()); - } - - /** + /** * Add a child to an existing individual (creating a one-parent family). * * @param ServerRequestInterface $request @@ -413,6 +234,8 @@ class EditIndividualController extends AbstractEditController public function addSpouse(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $individual = Individual::getInstance($xref, $tree); @@ -518,6 +341,7 @@ class EditIndividualController extends AbstractEditController public function addUnlinked(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); return $this->viewResponse('edit/new-individual', [ 'next_action' => 'add-unlinked-individual-action', @@ -612,6 +436,8 @@ class EditIndividualController extends AbstractEditController public function editNameAction(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getParsedBody()['xref']; $individual = Individual::getInstance($xref, $tree); @@ -632,6 +458,8 @@ class EditIndividualController extends AbstractEditController public function addName(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $individual = Individual::getInstance($xref, $tree); @@ -660,6 +488,8 @@ class EditIndividualController extends AbstractEditController public function addNameAction(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getParsedBody()['xref']; $individual = Individual::getInstance($xref, $tree); @@ -679,6 +509,8 @@ class EditIndividualController extends AbstractEditController public function linkChildToFamily(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $individual = Individual::getInstance($xref, $tree); @@ -747,6 +579,8 @@ class EditIndividualController extends AbstractEditController public function linkSpouseToIndividual(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $individual = Individual::getInstance($xref, $tree); diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php index 576acb8c1d..81f64d9a9e 100644 --- a/app/Http/Controllers/EditMediaController.php +++ b/app/Http/Controllers/EditMediaController.php @@ -40,6 +40,7 @@ use Psr\Http\Message\UploadedFileInterface; use RuntimeException; use Symfony\Component\HttpFoundation\File\UploadedFile; +use function assert; use function pathinfo; use function strpos; @@ -280,6 +281,7 @@ class EditMediaController extends AbstractEditController public function createMediaObject(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); return response(view('modals/create-media-object', [ 'max_upload_size' => $this->maxUploadFilesize(), @@ -403,6 +405,8 @@ class EditMediaController extends AbstractEditController public function linkMediaToIndividual(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $media = Media::getInstance($xref, $tree); @@ -421,6 +425,8 @@ class EditMediaController extends AbstractEditController public function linkMediaToFamily(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $media = Media::getInstance($xref, $tree); @@ -439,6 +445,8 @@ class EditMediaController extends AbstractEditController public function linkMediaToSource(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $media = Media::getInstance($xref, $tree); diff --git a/app/Http/Controllers/EditNoteController.php b/app/Http/Controllers/EditNoteController.php index 08f5011b0c..b2b21261c4 100644 --- a/app/Http/Controllers/EditNoteController.php +++ b/app/Http/Controllers/EditNoteController.php @@ -21,8 +21,11 @@ namespace Fisharebest\Webtrees\Http\Controllers; use Fisharebest\Webtrees\Auth; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Note; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; /** * Controller for edit forms and responses. @@ -51,6 +54,8 @@ class EditNoteController extends AbstractEditController public function editNoteObject(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $note = Note::getInstance($xref, $tree); @@ -74,6 +79,8 @@ class EditNoteController extends AbstractEditController public function updateNoteObject(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getQueryParams()['xref']; $note = Note::getInstance($xref, $tree); diff --git a/app/Http/Controllers/GedcomFileController.php b/app/Http/Controllers/GedcomFileController.php index 71655100c9..6eaf309a83 100644 --- a/app/Http/Controllers/GedcomFileController.php +++ b/app/Http/Controllers/GedcomFileController.php @@ -24,11 +24,14 @@ use Fisharebest\Webtrees\Functions\FunctionsImport; use Fisharebest\Webtrees\Gedcom; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Services\TimeoutService; +use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Expression; use Illuminate\Support\Str; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; /** * Controller for the processing GEDCOM files. @@ -61,6 +64,7 @@ class GedcomFileController extends AbstractBaseController public function import(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); try { // Only allow one process to import each gedcom at a time diff --git a/app/Http/Controllers/HomePageController.php b/app/Http/Controllers/HomePageController.php index 60f517793a..6ccea79e7b 100644 --- a/app/Http/Controllers/HomePageController.php +++ b/app/Http/Controllers/HomePageController.php @@ -43,10 +43,12 @@ use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\Expression; use Illuminate\Support\Collection; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use function assert; /** * Controller for the user/tree's home page. @@ -277,6 +279,7 @@ class HomePageController extends AbstractBaseController public function treePage(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); $has_blocks = DB::table('block') ->where('gedcom_id', '=', $tree->id()) @@ -390,6 +393,7 @@ class HomePageController extends AbstractBaseController public function treePageEdit(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); $main_blocks = $this->treeBlocks($tree->id(), self::MAIN_BLOCKS); $side_blocks = $this->treeBlocks($tree->id(), self::SIDE_BLOCKS); diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php index 1fb069bcb4..429d806ec9 100644 --- a/app/Http/Controllers/ListController.php +++ b/app/Http/Controllers/ListController.php @@ -35,8 +35,10 @@ use Illuminate\Database\Capsule\Manager as DB; use Illuminate\Database\Query\Builder; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; /** * Controller for lists of GEDCOM records. @@ -98,6 +100,8 @@ class ListController extends AbstractBaseController public function individualOrFamilyList(ServerRequestInterface $request, bool $families, ?ModuleListInterface $moduleListInterface): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); // This action can show lists of both families and individuals. diff --git a/app/Http/Controllers/NoteController.php b/app/Http/Controllers/NoteController.php index df07646624..b39977e9e3 100644 --- a/app/Http/Controllers/NoteController.php +++ b/app/Http/Controllers/NoteController.php @@ -23,10 +23,13 @@ use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Filter; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Services\ClipboardService; +use Fisharebest\Webtrees\Tree; use Illuminate\Support\Collection; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; use function redirect; /** @@ -56,9 +59,11 @@ class NoteController extends AbstractBaseController */ public function show(ServerRequestInterface $request): ResponseInterface { - $slug = $request->getAttribute('slug'); $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $xref = $request->getAttribute('xref'); + $slug = $request->getAttribute('slug'); $note = Note::getInstance($xref, $tree); Auth::checkNoteAccess($note, false); diff --git a/app/Http/Controllers/PendingChangesController.php b/app/Http/Controllers/PendingChangesController.php index 191b339a63..d1609a4eab 100644 --- a/app/Http/Controllers/PendingChangesController.php +++ b/app/Http/Controllers/PendingChangesController.php @@ -34,9 +34,11 @@ use Fisharebest\Webtrees\Repository; use Fisharebest\Webtrees\Source; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; use function route; /** @@ -54,6 +56,8 @@ class PendingChangesController extends AbstractBaseController public function acceptAllChanges(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $url = $request->getQueryParams()['url']; $changes = DB::table('change') @@ -168,6 +172,8 @@ class PendingChangesController extends AbstractBaseController public function rejectAllChanges(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $url = $request->getQueryParams()['url']; DB::table('change') diff --git a/app/Http/Middleware/AuthEditor.php b/app/Http/Middleware/AuthEditor.php index f9800ddd98..e9182cedd4 100644 --- a/app/Http/Middleware/AuthEditor.php +++ b/app/Http/Middleware/AuthEditor.php @@ -23,11 +23,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\Http\RequestHandlers\LoginPage; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; +use function assert; use function redirect; use function route; @@ -45,6 +47,8 @@ class AuthEditor implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); // Logged in with the correct role? diff --git a/app/Http/Middleware/AuthManager.php b/app/Http/Middleware/AuthManager.php index 9e4ca9c06e..3db5e8035e 100644 --- a/app/Http/Middleware/AuthManager.php +++ b/app/Http/Middleware/AuthManager.php @@ -23,11 +23,13 @@ use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\Http\RequestHandlers\LoginPage; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; +use function assert; use function redirect; use function route; @@ -45,6 +47,8 @@ class AuthManager implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); // Logged in with the correct role? diff --git a/app/Http/Middleware/AuthMember.php b/app/Http/Middleware/AuthMember.php index e3e6568c21..a897f255e6 100644 --- a/app/Http/Middleware/AuthMember.php +++ b/app/Http/Middleware/AuthMember.php @@ -23,12 +23,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\Http\RequestHandlers\LoginPage; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; +use function assert; use function redirect; use function route; @@ -46,6 +48,8 @@ class AuthMember implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); // Logged in with the correct role? diff --git a/app/Http/Middleware/AuthModerator.php b/app/Http/Middleware/AuthModerator.php index 43d6e9a19d..c6c80ac22d 100644 --- a/app/Http/Middleware/AuthModerator.php +++ b/app/Http/Middleware/AuthModerator.php @@ -23,12 +23,14 @@ use Fisharebest\Webtrees\Http\RequestHandlers\HomePage; use Fisharebest\Webtrees\Http\RequestHandlers\LoginPage; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; +use function assert; use function redirect; use function route; @@ -46,6 +48,8 @@ class AuthModerator implements MiddlewareInterface public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); // Logged in with the correct role? diff --git a/app/Http/Middleware/UseLocale.php b/app/Http/Middleware/UseLocale.php index 6350d00432..f112d47c78 100644 --- a/app/Http/Middleware/UseLocale.php +++ b/app/Http/Middleware/UseLocale.php @@ -22,10 +22,13 @@ use Fisharebest\Localization\Locale as WebtreesLocale; use Fisharebest\Localization\Locale\LocaleInterface; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Session; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; +use function assert; /** * Middleware to set a global theme. diff --git a/app/Http/RequestHandlers/DeleteTreeAction.php b/app/Http/RequestHandlers/DeleteTreeAction.php index 38fd673a92..d37db2e190 100644 --- a/app/Http/RequestHandlers/DeleteTreeAction.php +++ b/app/Http/RequestHandlers/DeleteTreeAction.php @@ -23,9 +23,12 @@ use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Http\Controllers\AbstractBaseController; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Services\TreeService; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; use function e; use function response; @@ -55,6 +58,7 @@ class DeleteTreeAction extends AbstractBaseController public function handle(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); $this->tree_service->delete($tree); diff --git a/app/Http/RequestHandlers/LoginPage.php b/app/Http/RequestHandlers/LoginPage.php index 825c7ccbe4..41cc301697 100644 --- a/app/Http/RequestHandlers/LoginPage.php +++ b/app/Http/RequestHandlers/LoginPage.php @@ -21,9 +21,12 @@ namespace Fisharebest\Webtrees\Http\RequestHandlers; use Fisharebest\Webtrees\Http\Controllers\AbstractBaseController; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Site; +use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; +use function assert; /** * Show a login form. diff --git a/app/Http/RequestHandlers/Logout.php b/app/Http/RequestHandlers/Logout.php index 255ae7ec63..60a53779b8 100644 --- a/app/Http/RequestHandlers/Logout.php +++ b/app/Http/RequestHandlers/Logout.php @@ -24,10 +24,12 @@ use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Log; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\User; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; +use function assert; use function redirect; use function route; @@ -44,6 +46,8 @@ class Logout implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + $user = $request->getAttribute('user'); if ($user instanceof User) { diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php index 29eec1283d..315d152a29 100644 --- a/app/Http/RequestHandlers/RegisterAction.php +++ b/app/Http/RequestHandlers/RegisterAction.php @@ -31,10 +31,12 @@ use Fisharebest\Webtrees\SiteUser; use Fisharebest\Webtrees\Tree; use Fisharebest\Webtrees\TreeUser; use Illuminate\Database\Capsule\Manager as DB; +use InvalidArgumentException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Ramsey\Uuid\Uuid; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; +use function assert; /** * Process a user registration. @@ -73,6 +75,7 @@ class RegisterAction extends AbstractBaseController public function handle(ServerRequestInterface $request): ResponseInterface { $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); $this->checkRegistrationAllowed(); diff --git a/app/Http/RequestHandlers/ReorderChildrenAction.php b/app/Http/RequestHandlers/ReorderChildrenAction.php new file mode 100644 index 0000000000..88d4bc46ba --- /dev/null +++ b/app/Http/RequestHandlers/ReorderChildrenAction.php @@ -0,0 +1,88 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Family; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function array_merge; +use function array_search; +use function assert; +use function implode; +use function is_array; +use function redirect; +use function uksort; + +/** + * Reorder the children in a family. + */ +class ReorderChildrenAction implements RequestHandlerInterface +{ + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getAttribute('xref'); + assert(is_string($xref), new InvalidArgumentException()); + + $family = Family::getInstance($xref, $tree); + assert($family instanceof Family, new InvalidArgumentException()); + + $order = $request->getParsedBody()['order']; + assert(is_array($order), new InvalidArgumentException()); + + Auth::checkFamilyAccess($family, true); + + $dummy_facts = ['0 @' . $family->xref() . '@ FAM']; + $sort_facts = []; + $keep_facts = []; + + // Split facts into FAMS and other + foreach ($family->facts() as $fact) { + if ($fact->getTag() === 'CHIL') { + $sort_facts[$fact->id()] = $fact->gedcom(); + } else { + $keep_facts[] = $fact->gedcom(); + } + } + + // Sort the facts + uksort($sort_facts, static function ($x, $y) use ($order) { + return array_search($x, $order, true) - array_search($y, $order, true); + }); + + // Merge the facts + $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); + + $family->updateRecord($gedcom, false); + + return redirect($family->url()); + } +} diff --git a/app/Http/RequestHandlers/ReorderChildrenPage.php b/app/Http/RequestHandlers/ReorderChildrenPage.php new file mode 100644 index 0000000000..941e95c251 --- /dev/null +++ b/app/Http/RequestHandlers/ReorderChildrenPage.php @@ -0,0 +1,67 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Family; +use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function assert; +use function is_string; + +/** + * Reorder the children in a family. + */ +class ReorderChildrenPage implements RequestHandlerInterface +{ + use ViewResponseTrait; + + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getAttribute('xref'); + assert(is_string($xref), new InvalidArgumentException()); + + $family = Family::getInstance($xref, $tree); + assert($family instanceof Family, new InvalidArgumentException()); + + Auth::checkFamilyAccess($family, true); + + $title = $family->fullName() . ' — ' . I18N::translate('Re-order children'); + + return $this->viewResponse('edit/reorder-children', [ + 'family' => $family, + 'title' => $title, + 'tree' => $tree, + ]); + } +} diff --git a/app/Http/RequestHandlers/ReorderMediaAction.php b/app/Http/RequestHandlers/ReorderMediaAction.php new file mode 100644 index 0000000000..fda0dfd9f0 --- /dev/null +++ b/app/Http/RequestHandlers/ReorderMediaAction.php @@ -0,0 +1,89 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function array_merge; +use function array_search; +use function assert; +use function implode; +use function is_array; +use function is_string; +use function redirect; +use function uksort; + +/** + * Reorder the media of an individual. + */ +class ReorderMediaAction implements RequestHandlerInterface +{ + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getParsedBody()['xref']; + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof Individual, new InvalidArgumentException()); + + $order = $request->getParsedBody()['order']; + assert(is_array($order), new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; + $sort_facts = []; + $keep_facts = []; + + // Split facts into OBJE and other + foreach ($individual->facts() as $fact) { + if ($fact->getTag() === 'OBJE') { + $sort_facts[$fact->id()] = $fact->gedcom(); + } else { + $keep_facts[] = $fact->gedcom(); + } + } + + // Sort the facts + uksort($sort_facts, static function ($x, $y) use ($order) { + return array_search($x, $order, true) - array_search($y, $order, true); + }); + + // Merge the facts + $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); + + $individual->updateRecord($gedcom, false); + + return redirect($individual->url()); + } +} diff --git a/app/Http/RequestHandlers/ReorderMediaPage.php b/app/Http/RequestHandlers/ReorderMediaPage.php new file mode 100644 index 0000000000..09bce44ddc --- /dev/null +++ b/app/Http/RequestHandlers/ReorderMediaPage.php @@ -0,0 +1,67 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function assert; +use function is_string; + +/** + * Reorder the media of an individual. + */ +class ReorderMediaPage implements RequestHandlerInterface +{ + use ViewResponseTrait; + + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getQueryParams()['xref']; + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof Individual, new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $title = $individual->fullName() . ' — ' . I18N::translate('Re-order media'); + + return $this->viewResponse('edit/reorder-media', [ + 'individual' => $individual, + 'title' => $title, + 'tree' => $tree, + ]); + } +} diff --git a/app/Http/RequestHandlers/ReorderNamesAction.php b/app/Http/RequestHandlers/ReorderNamesAction.php new file mode 100644 index 0000000000..1a6b8d48b5 --- /dev/null +++ b/app/Http/RequestHandlers/ReorderNamesAction.php @@ -0,0 +1,89 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function array_merge; +use function array_search; +use function assert; +use function implode; +use function is_array; +use function is_string; +use function redirect; +use function uksort; + +/** + * Reorder the names of an individual. + */ +class ReorderNamesAction implements RequestHandlerInterface +{ + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getParsedBody()['xref']; + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof Individual, new InvalidArgumentException()); + + $order = $request->getParsedBody()['order']; + assert(is_array($order), new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; + $sort_facts = []; + $keep_facts = []; + + // Split facts into NAME and other + foreach ($individual->facts() as $fact) { + if ($fact->getTag() === 'NAME') { + $sort_facts[$fact->id()] = $fact->gedcom(); + } else { + $keep_facts[] = $fact->gedcom(); + } + } + + // Sort the facts + uksort($sort_facts, static function ($x, $y) use ($order) { + return array_search($x, $order, true) - array_search($y, $order, true); + }); + + // Merge the facts + $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); + + $individual->updateRecord($gedcom, false); + + return redirect($individual->url()); + } +} diff --git a/app/Http/RequestHandlers/ReorderNamesPage.php b/app/Http/RequestHandlers/ReorderNamesPage.php new file mode 100644 index 0000000000..fa46c0a086 --- /dev/null +++ b/app/Http/RequestHandlers/ReorderNamesPage.php @@ -0,0 +1,67 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function assert; +use function is_string; + +/** + * Reorder the names of an individual. + */ +class ReorderNamesPage implements RequestHandlerInterface +{ + use ViewResponseTrait; + + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getQueryParams()['xref']; + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof InvalidArgumentException, new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $title = $individual->fullName() . ' — ' . I18N::translate('Re-order names'); + + return $this->viewResponse('edit/reorder-names', [ + 'individual' => $individual, + 'title' => $title, + 'tree' => $tree, + ]); + } +} diff --git a/app/Http/RequestHandlers/ReorderSpousesAction.php b/app/Http/RequestHandlers/ReorderSpousesAction.php new file mode 100644 index 0000000000..034b6edafd --- /dev/null +++ b/app/Http/RequestHandlers/ReorderSpousesAction.php @@ -0,0 +1,89 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function array_merge; +use function array_search; +use function assert; +use function implode; +use function is_array; +use function is_string; +use function redirect; +use function uksort; + +/** + * Reorder the spouses of an individual. + */ +class ReorderSpousesAction implements RequestHandlerInterface +{ + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getAttribute('xref'); + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof Individual, new InvalidArgumentException()); + + $order = $request->getParsedBody()['order']; + assert(is_array($order), new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; + $sort_facts = []; + $keep_facts = []; + + // Split facts into FAMS and other + foreach ($individual->facts() as $fact) { + if ($fact->getTag() === 'FAMS') { + $sort_facts[$fact->id()] = $fact->gedcom(); + } else { + $keep_facts[] = $fact->gedcom(); + } + } + + // Sort the facts + uksort($sort_facts, static function ($x, $y) use ($order) { + return array_search($x, $order, true) - array_search($y, $order, true); + }); + + // Merge the facts + $gedcom = implode("\n", array_merge($dummy_facts, $sort_facts, $keep_facts)); + + $individual->updateRecord($gedcom, false); + + return redirect($individual->url()); + } +} diff --git a/app/Http/RequestHandlers/ReorderSpousesPage.php b/app/Http/RequestHandlers/ReorderSpousesPage.php new file mode 100644 index 0000000000..f0538ae599 --- /dev/null +++ b/app/Http/RequestHandlers/ReorderSpousesPage.php @@ -0,0 +1,67 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Http\RequestHandlers; + +use Fisharebest\Webtrees\Auth; +use Fisharebest\Webtrees\Http\ViewResponseTrait; +use Fisharebest\Webtrees\I18N; +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Tree; +use InvalidArgumentException; +use Psr\Http\Message\ResponseInterface; +use Psr\Http\Message\ServerRequestInterface; +use Psr\Http\Server\RequestHandlerInterface; + +use function assert; +use function is_string; + +/** + * Reorder the spouses of an individual. + */ +class ReorderSpousesPage implements RequestHandlerInterface +{ + use ViewResponseTrait; + + /** + * @param ServerRequestInterface $request + * + * @return ResponseInterface + */ + public function handle(ServerRequestInterface $request): ResponseInterface + { + $tree = $request->getAttribute('tree'); + assert($tree instanceof Tree, new InvalidArgumentException()); + + $xref = $request->getAttribute('xref'); + assert(is_string($xref), new InvalidArgumentException()); + + $individual = Individual::getInstance($xref, $tree); + assert($individual instanceof Individual, new InvalidArgumentException()); + + Auth::checkIndividualAccess($individual, true); + + $title = $individual->fullName() . ' — ' . I18N::translate('Re-order families'); + + return $this->viewResponse('edit/reorder-spouses', [ + 'individual' => $individual, + 'title' => $title, + 'tree' => $tree, + ]); + } +} |