diff options
Diffstat (limited to 'app/Http/RequestHandlers')
41 files changed, 125 insertions, 77 deletions
diff --git a/app/Http/RequestHandlers/AbstractSelect2Handler.php b/app/Http/RequestHandlers/AbstractSelect2Handler.php index 9f11b43f6c..95bdba3c1e 100644 --- a/app/Http/RequestHandlers/AbstractSelect2Handler.php +++ b/app/Http/RequestHandlers/AbstractSelect2Handler.php @@ -66,10 +66,12 @@ abstract class AbstractSelect2Handler implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $query = $request->getParsedBody()['q'] ?? ''; + $params = (array) $request->getParsedBody(); + + $query = $params['q'] ?? ''; assert(strlen($query) >= self::MINIMUM_INPUT_LENGTH); - $page = (int) ($request->getParsedBody()['page'] ?? 1); + $page = (int) ($params['page'] ?? 1); // Fetch one more row than we need, so we can know if more rows exist. $offset = ($page - 1) * self::RESULTS_PER_PAGE; diff --git a/app/Http/RequestHandlers/AccountUpdate.php b/app/Http/RequestHandlers/AccountUpdate.php index dd6370b8d7..095527928b 100644 --- a/app/Http/RequestHandlers/AccountUpdate.php +++ b/app/Http/RequestHandlers/AccountUpdate.php @@ -62,7 +62,7 @@ class AccountUpdate implements RequestHandlerInterface $user = $request->getAttribute('user'); assert($user instanceof User); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $contact_method = $params['contact-method']; $email = $params['email']; diff --git a/app/Http/RequestHandlers/BroadcastAction.php b/app/Http/RequestHandlers/BroadcastAction.php index 44de2aff52..d85eb3d118 100644 --- a/app/Http/RequestHandlers/BroadcastAction.php +++ b/app/Http/RequestHandlers/BroadcastAction.php @@ -59,7 +59,7 @@ class BroadcastAction implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { $user = $request->getAttribute('user'); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $body = $params['body']; $subject = $params['subject']; $to = $params['to']; diff --git a/app/Http/RequestHandlers/ContactAction.php b/app/Http/RequestHandlers/ContactAction.php index 8d7ba76a02..1d69d45c57 100644 --- a/app/Http/RequestHandlers/ContactAction.php +++ b/app/Http/RequestHandlers/ContactAction.php @@ -76,7 +76,7 @@ class ContactAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $body = $params['body']; $from_email = $params['from_email']; $from_name = $params['from_name']; diff --git a/app/Http/RequestHandlers/CreateMediaObjectAction.php b/app/Http/RequestHandlers/CreateMediaObjectAction.php index 20f8e8d17e..ae99db15f1 100644 --- a/app/Http/RequestHandlers/CreateMediaObjectAction.php +++ b/app/Http/RequestHandlers/CreateMediaObjectAction.php @@ -65,7 +65,7 @@ class CreateMediaObjectAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $note = $params['media-note']; $title = $params['title']; $type = $params['type']; diff --git a/app/Http/RequestHandlers/CreateNoteAction.php b/app/Http/RequestHandlers/CreateNoteAction.php index 018b1dfd50..7851c3efdf 100644 --- a/app/Http/RequestHandlers/CreateNoteAction.php +++ b/app/Http/RequestHandlers/CreateNoteAction.php @@ -42,7 +42,7 @@ class CreateNoteAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $note = $params['note']; $privacy_restriction = $params['privacy-restriction']; $edit_restriction = $params['edit-restriction']; diff --git a/app/Http/RequestHandlers/CreateRepositoryAction.php b/app/Http/RequestHandlers/CreateRepositoryAction.php index 41526e6540..daf27290b6 100644 --- a/app/Http/RequestHandlers/CreateRepositoryAction.php +++ b/app/Http/RequestHandlers/CreateRepositoryAction.php @@ -42,7 +42,7 @@ class CreateRepositoryAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $name = $params['repository-name']; $privacy_restriction = $params['privacy-restriction']; $edit_restriction = $params['edit-restriction']; diff --git a/app/Http/RequestHandlers/CreateRepositoryModal.php b/app/Http/RequestHandlers/CreateRepositoryModal.php index cffa7497e9..d1db9a3b38 100644 --- a/app/Http/RequestHandlers/CreateRepositoryModal.php +++ b/app/Http/RequestHandlers/CreateRepositoryModal.php @@ -61,7 +61,7 @@ class CreateRepositoryModal implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $name = $params['repository-name']; $privacy_restriction = $params['privacy-restriction']; $edit_restriction = $params['edit-restriction']; diff --git a/app/Http/RequestHandlers/CreateSourceAction.php b/app/Http/RequestHandlers/CreateSourceAction.php index a3f8621ffe..d84ff073a9 100644 --- a/app/Http/RequestHandlers/CreateSourceAction.php +++ b/app/Http/RequestHandlers/CreateSourceAction.php @@ -42,7 +42,7 @@ class CreateSourceAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $title = $params['source-title']; $abbreviation = $params['source-abbreviation']; $author = $params['source-author']; diff --git a/app/Http/RequestHandlers/CreateSubmitterAction.php b/app/Http/RequestHandlers/CreateSubmitterAction.php index ee76278d13..01b8d7e8d6 100644 --- a/app/Http/RequestHandlers/CreateSubmitterAction.php +++ b/app/Http/RequestHandlers/CreateSubmitterAction.php @@ -42,7 +42,7 @@ class CreateSubmitterAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $name = $params['submitter_name']; $address = $params['submitter_address']; $privacy_restriction = $params['privacy-restriction']; diff --git a/app/Http/RequestHandlers/CreateTreeAction.php b/app/Http/RequestHandlers/CreateTreeAction.php index 024ce36872..9821eb6a69 100644 --- a/app/Http/RequestHandlers/CreateTreeAction.php +++ b/app/Http/RequestHandlers/CreateTreeAction.php @@ -56,8 +56,9 @@ class CreateTreeAction extends AbstractBaseController */ public function handle(ServerRequestInterface $request): ResponseInterface { - $name = $request->getParsedBody()['name']; - $title = $request->getParsedBody()['title']; + $params = (array) $request->getParsedBody(); + $name = $params['name']; + $title = $params['title']; if ($this->tree_service->all()->get($name) instanceof Tree) { FlashMessages::addMessage(I18N::translate('The family tree “%s” already exists.', e($name)), 'danger'); diff --git a/app/Http/RequestHandlers/EditRawFactAction.php b/app/Http/RequestHandlers/EditRawFactAction.php index 0c6fb00c00..ab61abd116 100644 --- a/app/Http/RequestHandlers/EditRawFactAction.php +++ b/app/Http/RequestHandlers/EditRawFactAction.php @@ -53,7 +53,10 @@ class EditRawFactAction implements RequestHandlerInterface $record = GedcomRecord::getInstance($xref, $tree); $fact_id = $request->getAttribute('fact_id'); - $gedcom = $request->getParsedBody()['gedcom']; + + $params = (array) $request->getParsedBody(); + + $gedcom = $params['gedcom']; // Cleanup the client’s bad editing? $gedcom = preg_replace('/[\r\n]+/', "\n", $gedcom); // Empty lines diff --git a/app/Http/RequestHandlers/EditRawRecordAction.php b/app/Http/RequestHandlers/EditRawRecordAction.php index 29ecccce71..1f18695abb 100644 --- a/app/Http/RequestHandlers/EditRawRecordAction.php +++ b/app/Http/RequestHandlers/EditRawRecordAction.php @@ -50,8 +50,10 @@ class EditRawRecordAction implements RequestHandlerInterface $record = GedcomRecord::getInstance($xref, $tree); $record = Auth::checkRecordAccess($record, true); - $facts = $request->getParsedBody()['fact'] ?? []; - $fact_ids = $request->getParsedBody()['fact_id'] ?? []; + $params = (array) $request->getParsedBody(); + + $facts = $params['fact'] ?? []; + $fact_ids = $params['fact_id'] ?? []; $gedcom = '0 @' . $record->xref() . '@ ' . $record::RECORD_TYPE; diff --git a/app/Http/RequestHandlers/EmailPreferencesAction.php b/app/Http/RequestHandlers/EmailPreferencesAction.php index 40b586fa59..d3b681e7de 100644 --- a/app/Http/RequestHandlers/EmailPreferencesAction.php +++ b/app/Http/RequestHandlers/EmailPreferencesAction.php @@ -61,7 +61,7 @@ class EmailPreferencesAction implements RequestHandlerInterface $user = $request->getAttribute('user'); assert($user instanceof User); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); Site::setPreference('SMTP_ACTIVE', $params['SMTP_ACTIVE']); Site::setPreference('SMTP_FROM_NAME', $params['SMTP_FROM_NAME']); diff --git a/app/Http/RequestHandlers/ExportGedcomClient.php b/app/Http/RequestHandlers/ExportGedcomClient.php index 615e028001..42fac96034 100644 --- a/app/Http/RequestHandlers/ExportGedcomClient.php +++ b/app/Http/RequestHandlers/ExportGedcomClient.php @@ -70,11 +70,13 @@ class ExportGedcomClient implements RequestHandlerInterface $data_filesystem = $request->getAttribute('filesystem.data'); assert($data_filesystem instanceof FilesystemInterface); - $convert = (bool) ($request->getParsedBody()['convert'] ?? false); - $zip = (bool) ($request->getParsedBody()['zip'] ?? false); - $media = (bool) ($request->getParsedBody()['media'] ?? false); - $media_path = $request->getParsedBody()['media-path'] ?? ''; - $privatize_export = $request->getParsedBody()['privatize_export']; + $params = (array) $request->getParsedBody(); + + $convert = (bool) ($params['convert'] ?? false); + $zip = (bool) ($params['zip'] ?? false); + $media = (bool) ($params['media'] ?? false); + $media_path = $params['media-path'] ?? ''; + $privatize_export = $params['privatize_export']; $access_levels = [ 'gedadmin' => Auth::PRIV_NONE, diff --git a/app/Http/RequestHandlers/LoginAction.php b/app/Http/RequestHandlers/LoginAction.php index b45401a07b..122d573cb9 100644 --- a/app/Http/RequestHandlers/LoginAction.php +++ b/app/Http/RequestHandlers/LoginAction.php @@ -68,10 +68,13 @@ class LoginAction extends AbstractBaseController */ public function handle(ServerRequestInterface $request): ResponseInterface { - $tree = $request->getAttribute('tree'); - $username = $request->getParsedBody()['username']; - $password = $request->getParsedBody()['password']; - $url = $request->getParsedBody()['url']; + $tree = $request->getAttribute('tree'); + + $params = (array) $request->getParsedBody(); + + $username = $params['username']; + $password = $params['password']; + $url = $params['url']; try { $this->doLogin($username, $password); diff --git a/app/Http/RequestHandlers/MergeFactsAction.php b/app/Http/RequestHandlers/MergeFactsAction.php index 19cc42a45d..cb1afe8e11 100644 --- a/app/Http/RequestHandlers/MergeFactsAction.php +++ b/app/Http/RequestHandlers/MergeFactsAction.php @@ -54,11 +54,13 @@ class MergeFactsAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $xref1 = $request->getParsedBody()['xref1'] ?? ''; - $xref2 = $request->getParsedBody()['xref2'] ?? ''; + $params = (array) $request->getParsedBody(); - $keep1 = $request->getParsedBody()['keep1'] ?? []; - $keep2 = $request->getParsedBody()['keep2'] ?? []; + $xref1 = $params['xref1'] ?? ''; + $xref2 = $params['xref2'] ?? ''; + + $keep1 = $params['keep1'] ?? []; + $keep2 = $params['keep2'] ?? []; // Merge record2 into record1 $record1 = GedcomRecord::getInstance($xref1, $tree); diff --git a/app/Http/RequestHandlers/MergeRecordsAction.php b/app/Http/RequestHandlers/MergeRecordsAction.php index 68ca8a3818..f06ab0a8a9 100644 --- a/app/Http/RequestHandlers/MergeRecordsAction.php +++ b/app/Http/RequestHandlers/MergeRecordsAction.php @@ -44,8 +44,10 @@ class MergeRecordsAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $xref1 = $request->getParsedBody()['xref1'] ?? ''; - $xref2 = $request->getParsedBody()['xref2'] ?? ''; + $params = (array) $request->getParsedBody(); + + $xref1 = $params['xref1'] ?? ''; + $xref2 = $params['xref2'] ?? ''; // Merge record2 into record1 $record1 = GedcomRecord::getInstance($xref1, $tree); diff --git a/app/Http/RequestHandlers/MessageAction.php b/app/Http/RequestHandlers/MessageAction.php index 5f55e4cba7..1eaf1df44a 100644 --- a/app/Http/RequestHandlers/MessageAction.php +++ b/app/Http/RequestHandlers/MessageAction.php @@ -72,7 +72,7 @@ class MessageAction implements RequestHandlerInterface assert($tree instanceof Tree); $user = $request->getAttribute('user'); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $body = $params['body']; $subject = $params['subject']; $to = $params['to']; diff --git a/app/Http/RequestHandlers/MessageSelect.php b/app/Http/RequestHandlers/MessageSelect.php index 9706952bc7..41a171fdbf 100644 --- a/app/Http/RequestHandlers/MessageSelect.php +++ b/app/Http/RequestHandlers/MessageSelect.php @@ -39,12 +39,14 @@ class MessageSelect implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); + $params = (array) $request->getParsedBody(); + return redirect(route(MessagePage::class, [ - 'body' => $request->getParsedBody()['body'] ?? '', - 'subject' => $request->getParsedBody()['subject'] ?? '', - 'to' => $request->getParsedBody()['to'] ?? '', + 'body' => $params['body'] ?? '', + 'subject' => $params['subject'] ?? '', + 'to' => $params['to'] ?? '', 'tree' => $tree->name(), - 'url' => $request->getParsedBody()['url'] ?? '', + 'url' => $params['url'] ?? '', ])); } } diff --git a/app/Http/RequestHandlers/PasswordRequestAction.php b/app/Http/RequestHandlers/PasswordRequestAction.php index 6a5da3577f..d9670dcc43 100644 --- a/app/Http/RequestHandlers/PasswordRequestAction.php +++ b/app/Http/RequestHandlers/PasswordRequestAction.php @@ -73,7 +73,9 @@ class PasswordRequestAction implements RequestHandlerInterface, StatusCodeInterf { $tree = $request->getAttribute('tree'); - $email = $request->getParsedBody()['email'] ?? ''; + $params = (array) $request->getParsedBody(); + + $email = $params['email'] ?? ''; $user = $this->user_service->findByEmail($email); if ($user instanceof User) { diff --git a/app/Http/RequestHandlers/PasswordResetAction.php b/app/Http/RequestHandlers/PasswordResetAction.php index 3faaf9a8e2..a7860ad5c0 100644 --- a/app/Http/RequestHandlers/PasswordResetAction.php +++ b/app/Http/RequestHandlers/PasswordResetAction.php @@ -62,7 +62,9 @@ class PasswordResetAction implements RequestHandlerInterface, StatusCodeInterfac $user = $this->user_service->findByToken($token); if ($user instanceof User) { - $password = $request->getParsedBody()['password'] ?? ''; + $params = (array) $request->getParsedBody(); + + $password = $params['password'] ?? ''; $user->setPreference('password-token', ''); $user->setPreference('password-token-expire', ''); diff --git a/app/Http/RequestHandlers/PasteFact.php b/app/Http/RequestHandlers/PasteFact.php index c2bce2ad72..278ba162a5 100644 --- a/app/Http/RequestHandlers/PasteFact.php +++ b/app/Http/RequestHandlers/PasteFact.php @@ -64,7 +64,9 @@ class PasteFact implements RequestHandlerInterface $xref = $request->getAttribute('xref'); assert(is_string($xref)); - $fact_id = $request->getParsedBody()['fact_id']; + $params = (array) $request->getParsedBody(); + + $fact_id = $params['fact_id']; $record = GedcomRecord::getInstance($xref, $tree); $record = Auth::checkRecordAccess($record, true); diff --git a/app/Http/RequestHandlers/PendingChangesLogAction.php b/app/Http/RequestHandlers/PendingChangesLogAction.php index c995365216..66951fd8b6 100644 --- a/app/Http/RequestHandlers/PendingChangesLogAction.php +++ b/app/Http/RequestHandlers/PendingChangesLogAction.php @@ -35,15 +35,17 @@ class PendingChangesLogAction implements RequestHandlerInterface */ public function handle(ServerRequestInterface $request): ResponseInterface { + $params = (array) $request->getParsedBody(); + return redirect(route(PendingChangesLogPage::class, [ - 'tree' => $request->getParsedBody()['tree'], - 'from' => $request->getParsedBody()['from'] ?? '', - 'to' => $request->getParsedBody()['to'] ?? '', - 'type' => $request->getParsedBody()['type'] ?? '', - 'oldged' => $request->getParsedBody()['oldged'] ?? '', - 'newged' => $request->getParsedBody()['newged'] ?? '', - 'xref' => $request->getParsedBody()['xref'] ?? '', - 'username' => $request->getParsedBody()['username'] ?? '', + 'tree' => $params['tree'], + 'from' => $params['from'] ?? '', + 'to' => $params['to'] ?? '', + 'type' => $params['type'] ?? '', + 'oldged' => $params['oldged'] ?? '', + 'newged' => $params['newged'] ?? '', + 'xref' => $params['xref'] ?? '', + 'username' => $params['username'] ?? '', ])); } } diff --git a/app/Http/RequestHandlers/RegisterAction.php b/app/Http/RequestHandlers/RegisterAction.php index 0864a9fabe..6671d2e8a5 100644 --- a/app/Http/RequestHandlers/RegisterAction.php +++ b/app/Http/RequestHandlers/RegisterAction.php @@ -81,11 +81,13 @@ class RegisterAction extends AbstractBaseController $this->checkRegistrationAllowed(); - $comments = $request->getParsedBody()['comments'] ?? ''; - $email = $request->getParsedBody()['email'] ?? ''; - $password = $request->getParsedBody()['password'] ?? ''; - $realname = $request->getParsedBody()['realname'] ?? ''; - $username = $request->getParsedBody()['username'] ?? ''; + $params = (array) $request->getParsedBody(); + + $comments = $params['comments'] ?? ''; + $email = $params['email'] ?? ''; + $password = $params['password'] ?? ''; + $realname = $params['realname'] ?? ''; + $username = $params['username'] ?? ''; try { $this->doValidateRegistration($request, $username, $email, $realname, $comments, $password); diff --git a/app/Http/RequestHandlers/ReorderChildrenAction.php b/app/Http/RequestHandlers/ReorderChildrenAction.php index 1f3680c75b..312c066428 100644 --- a/app/Http/RequestHandlers/ReorderChildrenAction.php +++ b/app/Http/RequestHandlers/ReorderChildrenAction.php @@ -56,7 +56,8 @@ class ReorderChildrenAction implements RequestHandlerInterface $family = Family::getInstance($xref, $tree); $family = Auth::checkFamilyAccess($family, true); - $order = $request->getParsedBody()['order']; + $params = (array) $request->getParsedBody(); + $order = $params['order']; assert(is_array($order)); $dummy_facts = ['0 @' . $family->xref() . '@ FAM']; diff --git a/app/Http/RequestHandlers/ReorderFamiliesAction.php b/app/Http/RequestHandlers/ReorderFamiliesAction.php index 3c7496ae22..d4d9beffd1 100644 --- a/app/Http/RequestHandlers/ReorderFamiliesAction.php +++ b/app/Http/RequestHandlers/ReorderFamiliesAction.php @@ -56,7 +56,9 @@ class ReorderFamiliesAction implements RequestHandlerInterface $individual = Individual::getInstance($xref, $tree); $individual = Auth::checkIndividualAccess($individual, true); - $order = $request->getParsedBody()['order']; + $params = (array) $request->getParsedBody(); + + $order = $params['order']; assert(is_array($order)); $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; diff --git a/app/Http/RequestHandlers/ReorderMediaAction.php b/app/Http/RequestHandlers/ReorderMediaAction.php index 7d720c4c23..edf4372d89 100644 --- a/app/Http/RequestHandlers/ReorderMediaAction.php +++ b/app/Http/RequestHandlers/ReorderMediaAction.php @@ -56,7 +56,9 @@ class ReorderMediaAction implements RequestHandlerInterface $individual = Individual::getInstance($xref, $tree); $individual = Auth::checkIndividualAccess($individual, true); - $order = $request->getParsedBody()['order']; + $params = (array) $request->getParsedBody(); + + $order = $params['order']; assert(is_array($order)); $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; diff --git a/app/Http/RequestHandlers/ReorderNamesAction.php b/app/Http/RequestHandlers/ReorderNamesAction.php index 8e66f067f0..5653c8f465 100644 --- a/app/Http/RequestHandlers/ReorderNamesAction.php +++ b/app/Http/RequestHandlers/ReorderNamesAction.php @@ -56,7 +56,8 @@ class ReorderNamesAction implements RequestHandlerInterface $individual = Individual::getInstance($xref, $tree); $individual = Auth::checkIndividualAccess($individual, true); - $order = $request->getParsedBody()['order']; + $params = (array) $request->getParsedBody(); + $order = $params['order']; assert(is_array($order)); $dummy_facts = ['0 @' . $individual->xref() . '@ INDI']; diff --git a/app/Http/RequestHandlers/ReportListAction.php b/app/Http/RequestHandlers/ReportListAction.php index a307c42f37..e1eb884b48 100644 --- a/app/Http/RequestHandlers/ReportListAction.php +++ b/app/Http/RequestHandlers/ReportListAction.php @@ -67,7 +67,9 @@ class ReportListAction implements RequestHandlerInterface $user = $request->getAttribute('user'); assert($user instanceof UserInterface); - $report = $request->getParsedBody()['report'] ?? ''; + $params = (array) $request->getParsedBody(); + + $report = $params['report'] ?? ''; $module = $this->module_service->findByName($report); if ($module instanceof ModuleReportInterface) { diff --git a/app/Http/RequestHandlers/ReportSetupAction.php b/app/Http/RequestHandlers/ReportSetupAction.php index 9e3e0ee21e..6d7446579f 100644 --- a/app/Http/RequestHandlers/ReportSetupAction.php +++ b/app/Http/RequestHandlers/ReportSetupAction.php @@ -77,7 +77,7 @@ class ReportSetupAction implements RequestHandlerInterface Auth::checkComponentAccess($module, 'report', $tree, $user); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $params['tree'] = $tree->name(); $params['report'] = $report; diff --git a/app/Http/RequestHandlers/SearchAdvancedAction.php b/app/Http/RequestHandlers/SearchAdvancedAction.php index ecd0188d36..aaa2cfd57d 100644 --- a/app/Http/RequestHandlers/SearchAdvancedAction.php +++ b/app/Http/RequestHandlers/SearchAdvancedAction.php @@ -43,7 +43,7 @@ class SearchAdvancedAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $fields = $params['fields'] ?? []; $modifiers = $params['modifiers'] ?? []; diff --git a/app/Http/RequestHandlers/SearchGeneralAction.php b/app/Http/RequestHandlers/SearchGeneralAction.php index 28f33661c3..6667401181 100644 --- a/app/Http/RequestHandlers/SearchGeneralAction.php +++ b/app/Http/RequestHandlers/SearchGeneralAction.php @@ -43,7 +43,7 @@ class SearchGeneralAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); return redirect(route(SearchGeneralPage::class, [ 'query' => $params['query'] ?? '', diff --git a/app/Http/RequestHandlers/SearchPhoneticAction.php b/app/Http/RequestHandlers/SearchPhoneticAction.php index 9896a76ad2..1c9a1a1bb8 100644 --- a/app/Http/RequestHandlers/SearchPhoneticAction.php +++ b/app/Http/RequestHandlers/SearchPhoneticAction.php @@ -43,7 +43,7 @@ class SearchPhoneticAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); return redirect(route(SearchPhoneticPage::class, [ 'firstname' => $params['firstname'] ?? '', diff --git a/app/Http/RequestHandlers/SearchQuickAction.php b/app/Http/RequestHandlers/SearchQuickAction.php index 465386f9f5..cbb7a60cbe 100644 --- a/app/Http/RequestHandlers/SearchQuickAction.php +++ b/app/Http/RequestHandlers/SearchQuickAction.php @@ -46,7 +46,9 @@ class SearchQuickAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $query = $request->getParsedBody()['query'] ?? ''; + $params = (array) $request->getParsedBody(); + + $query = $params['query'] ?? ''; // Was the search query an XREF in the current tree? // If so, go straight to it. diff --git a/app/Http/RequestHandlers/SearchReplaceAction.php b/app/Http/RequestHandlers/SearchReplaceAction.php index 6058f30fcb..b047188d97 100644 --- a/app/Http/RequestHandlers/SearchReplaceAction.php +++ b/app/Http/RequestHandlers/SearchReplaceAction.php @@ -63,7 +63,7 @@ class SearchReplaceAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); + $params = (array) $request->getParsedBody(); $search = $params['search'] ?? ''; $replace = $params['replace'] ?? ''; $context = $params['context'] ?? 'all'; diff --git a/app/Http/RequestHandlers/SelectNewFact.php b/app/Http/RequestHandlers/SelectNewFact.php index 3decadd9f4..b03a089fc9 100644 --- a/app/Http/RequestHandlers/SelectNewFact.php +++ b/app/Http/RequestHandlers/SelectNewFact.php @@ -46,7 +46,8 @@ class SelectNewFact implements RequestHandlerInterface $xref = $request->getAttribute('xref'); assert(is_string($xref)); - $fact = $request->getParsedBody()['fact']; + $params = (array) $request->getParsedBody(); + $fact = $params['fact']; return redirect(route(AddNewFact::class, [ 'tree' => $tree->name(), diff --git a/app/Http/RequestHandlers/SiteLogsAction.php b/app/Http/RequestHandlers/SiteLogsAction.php index 564bab3e74..875dc60cef 100644 --- a/app/Http/RequestHandlers/SiteLogsAction.php +++ b/app/Http/RequestHandlers/SiteLogsAction.php @@ -35,14 +35,16 @@ class SiteLogsAction implements RequestHandlerInterface */ public function handle(ServerRequestInterface $request): ResponseInterface { + $params = (array) $request->getParsedBody(); + return redirect(route(SiteLogsPage::class, [ - 'tree' => $request->getParsedBody()['tree'], - 'from' => $request->getParsedBody()['from'] ?? '', - 'to' => $request->getParsedBody()['to'] ?? '', - 'type' => $request->getParsedBody()['type'] ?? '', - 'text' => $request->getParsedBody()['text'] ?? '', - 'ip' => $request->getParsedBody()['ip'] ?? '', - 'username' => $request->getParsedBody()['username'] ?? '', + 'tree' => $params['tree'], + 'from' => $params['from'] ?? '', + 'to' => $params['to'] ?? '', + 'type' => $params['type'] ?? '', + 'text' => $params['text'] ?? '', + 'ip' => $params['ip'] ?? '', + 'username' => $params['username'] ?? '', ])); } } diff --git a/app/Http/RequestHandlers/UnconnectedAction.php b/app/Http/RequestHandlers/UnconnectedAction.php index 304afea1b2..8a91758faa 100644 --- a/app/Http/RequestHandlers/UnconnectedAction.php +++ b/app/Http/RequestHandlers/UnconnectedAction.php @@ -44,7 +44,9 @@ class UnconnectedAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $associates = $request->getParsedBody()['associates'] ?? ''; + $params = (array) $request->getParsedBody(); + + $associates = $params['associates'] ?? ''; return redirect(route(UnconnectedPage::class, ['tree' => $tree->name(), 'associates' => $associates])); } diff --git a/app/Http/RequestHandlers/UpdatePlacesAction.php b/app/Http/RequestHandlers/UpdatePlacesAction.php index 281e3f8574..9262c2b71c 100644 --- a/app/Http/RequestHandlers/UpdatePlacesAction.php +++ b/app/Http/RequestHandlers/UpdatePlacesAction.php @@ -53,9 +53,11 @@ class UpdatePlacesAction implements RequestHandlerInterface $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $replace = $request->getParsedBody()['replace'] ?? ''; - $search = $request->getParsedBody()['search'] ?? ''; - $submit = $request->getParsedBody()['submit'] ?? ''; + $params = (array) $request->getParsedBody(); + + $replace = $params['replace'] ?? ''; + $search = $params['search'] ?? ''; + $submit = $params['submit'] ?? ''; if ($search !== '' && $replace !== '' && $submit === 'update') { $individual_changes = DB::table('individuals') diff --git a/app/Http/RequestHandlers/UsersCleanupAction.php b/app/Http/RequestHandlers/UsersCleanupAction.php index 21950ecaed..b8cbecbdaf 100644 --- a/app/Http/RequestHandlers/UsersCleanupAction.php +++ b/app/Http/RequestHandlers/UsersCleanupAction.php @@ -55,7 +55,9 @@ class UsersCleanupAction implements RequestHandlerInterface */ public function handle(ServerRequestInterface $request): ResponseInterface { - $delete = $request->getParsedBody()['delete'] ?? []; + $params = (array) $request->getParsedBody(); + + $delete = $params['delete'] ?? []; foreach ($delete as $user_id) { $user = $this->user_service->find($user_id); |