diff options
Diffstat (limited to 'app/Http/Controllers')
| -rw-r--r-- | app/Http/Controllers/AdminController.php | 18 | ||||
| -rw-r--r-- | app/Http/Controllers/AdminTreesController.php | 8 | ||||
| -rw-r--r-- | app/Http/Controllers/AncestorsChartController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/BranchesController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/DescendantsChartController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/EditFamilyController.php | 16 | ||||
| -rw-r--r-- | app/Http/Controllers/EditGedcomRecordController.php | 12 | ||||
| -rw-r--r-- | app/Http/Controllers/EditIndividualController.php | 12 | ||||
| -rw-r--r-- | app/Http/Controllers/FamilyController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/GedcomRecordController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/IndividualController.php | 12 | ||||
| -rw-r--r-- | app/Http/Controllers/MediaController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/NoteController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/RepositoryController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/SourceController.php | 2 | ||||
| -rw-r--r-- | app/Http/Controllers/TimelineChartController.php | 4 |
16 files changed, 50 insertions, 50 deletions
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index c0a665ec1e..d13e61d5c9 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -409,10 +409,10 @@ class AdminController extends AbstractBaseController $media = Media::getInstance($obje_xref, $tree); if ($individual !== null && $media !== null) { - foreach ($individual->getFacts() as $fact1) { + foreach ($individual->facts() as $fact1) { if ($fact1->id() === $fact_id) { $individual->updateFact($fact_id, $fact1->gedcom() . "\n2 OBJE @" . $obje_xref . '@', false); - foreach ($individual->getFacts('OBJE') as $fact2) { + foreach ($individual->facts('OBJE') as $fact2) { if ($fact2->target() === $media) { $individual->deleteFact($fact2->id(), false); } @@ -496,14 +496,14 @@ class AdminController extends AbstractBaseController $media = Media::getInstance($datum->m_id, $tree, $datum->m_gedcom); $individual = Individual::getInstance($datum->i_id, $tree, $datum->i_gedcom); - $facts = $individual->getFacts('', true); + $facts = $individual->facts('', true); $facts = array_filter($facts, function (Fact $fact) use ($ignore_facts): bool { return !$fact->isPendingDeletion() && !in_array($fact->getTag(), $ignore_facts); }); // The link to the media object may have been deleted in a pending change. $deleted = true; - foreach ($individual->getFacts('OBJE') as $fact) { + foreach ($individual->facts('OBJE') as $fact) { if ($fact->target() === $media && !$fact->isPendingDeletion()) { $deleted = false; } @@ -595,7 +595,7 @@ class AdminController extends AbstractBaseController } else { // The media object already has an image. Show this custom one in preference. $gedcom = '0 @' . $media_object->xref() . "@ OBJE\n" . $gedcom; - foreach ($media_object->getFacts() as $fact) { + foreach ($media_object->facts() as $fact) { $gedcom .= "\n" . $fact->gedcom(); } $media_object->updateRecord($gedcom, true); @@ -758,13 +758,13 @@ class AdminController extends AbstractBaseController $facts1 = []; $facts2 = []; - foreach ($record1->getFacts() as $fact) { + foreach ($record1->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts1[$fact->id()] = $fact; } } - foreach ($record2->getFacts() as $fact) { + foreach ($record2->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts2[$fact->id()] = $fact; } @@ -812,13 +812,13 @@ class AdminController extends AbstractBaseController $facts1 = []; $facts2 = []; - foreach ($record1->getFacts() as $fact) { + foreach ($record1->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts1[$fact->id()] = $fact; } } - foreach ($record2->getFacts() as $fact) { + foreach ($record2->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->getTag() !== 'CHAN') { $facts2[$fact->id()] = $fact; } diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index 3a71cab1f6..3df65a2470 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -1685,7 +1685,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Individual::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1705,7 +1705,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Family::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1744,7 +1744,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Individual::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); @@ -1766,7 +1766,7 @@ class AdminTreesController extends AbstractBaseController ])->fetchAll(); foreach ($rows as $row) { $record = Family::getInstance($row->xref, $tree, $row->gedcom); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { $old_place = $fact->attribute('PLAC'); if (preg_match('/(^|, )' . preg_quote($search, '/') . '$/i', $old_place)) { $new_place = preg_replace('/(^|, )' . preg_quote($search, '/') . '$/i', '$1' . $replace, $old_place); diff --git a/app/Http/Controllers/AncestorsChartController.php b/app/Http/Controllers/AncestorsChartController.php index 9f2e0c291f..4b66c8b08d 100644 --- a/app/Http/Controllers/AncestorsChartController.php +++ b/app/Http/Controllers/AncestorsChartController.php @@ -198,7 +198,7 @@ class AncestorsChartController extends AbstractChartController echo ' <span class="person_box">', I18N::number($sosa * 2), '</span> ', I18N::translate('and'); echo ' <span class="person_boxF">', I18N::number($sosa * 2 + 1), '</span>'; if ($family->canShow()) { - foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR) as $fact) { echo ' <a href="', e($family->url()), '" class="details1">', $fact->summary(), '</a>'; } } diff --git a/app/Http/Controllers/BranchesController.php b/app/Http/Controllers/BranchesController.php index 6ec1ce60b8..74041dbcdd 100644 --- a/app/Http/Controllers/BranchesController.php +++ b/app/Http/Controllers/BranchesController.php @@ -274,7 +274,7 @@ class BranchesController extends AbstractBaseController // If this is not a birth pedigree (e.g. an adoption), highlight it if ($parents) { $pedi = ''; - foreach ($individual->getFacts('FAMC') as $fact) { + foreach ($individual->facts('FAMC') as $fact) { if ($fact->target() === $parents) { $pedi = $fact->attribute('PEDI'); break; diff --git a/app/Http/Controllers/DescendantsChartController.php b/app/Http/Controllers/DescendantsChartController.php index 0a5a4a5abd..677de9dfe8 100644 --- a/app/Http/Controllers/DescendantsChartController.php +++ b/app/Http/Controllers/DescendantsChartController.php @@ -251,7 +251,7 @@ class DescendantsChartController extends AbstractChartController echo '<span class="details1">'; echo '<a href="#" onclick="expand_layer(\'' . $uid . '\'); return false;" class="top"><i id="' . $uid . '_img" class="icon-minus" title="' . I18N::translate('View this family') . '"></i></a>'; if ($family->canShow()) { - foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) { + foreach ($family->facts(WT_EVENTS_MARR) as $fact) { echo ' <a href="', e($family->url()), '" class="details1">', $fact->summary(), '</a>'; } } diff --git a/app/Http/Controllers/EditFamilyController.php b/app/Http/Controllers/EditFamilyController.php index 912c294b82..9b24c06096 100644 --- a/app/Http/Controllers/EditFamilyController.php +++ b/app/Http/Controllers/EditFamilyController.php @@ -72,7 +72,7 @@ class EditFamilyController extends AbstractEditController $keep_facts = []; // Split facts into FAMS and other - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { if ($fact->getTag() === 'CHIL') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -166,7 +166,7 @@ class EditFamilyController extends AbstractEditController // Insert new child at the right place $done = false; - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { $old_child = $fact->target(); if ($old_child instanceof Individual && Date::compare($new_child->getEstimatedBirthDate(), $old_child->getEstimatedBirthDate()) < 0) { // Insert before this child @@ -343,13 +343,13 @@ class EditFamilyController extends AbstractEditController if ($old_father !== $new_father) { if ($old_father) { // Remove old FAMS link - foreach ($old_father->getFacts('FAMS') as $fact) { + foreach ($old_father->facts('FAMS') as $fact) { if ($fact->target() === $family) { $old_father->deleteFact($fact->id(), true); } } // Remove old HUSB link - foreach ($family->getFacts('HUSB|WIFE') as $fact) { + foreach ($family->facts('HUSB|WIFE') as $fact) { if ($fact->target() === $old_father) { $family->deleteFact($fact->id(), true); } @@ -366,13 +366,13 @@ class EditFamilyController extends AbstractEditController if ($old_mother !== $new_mother) { if ($old_mother) { // Remove old FAMS link - foreach ($old_mother->getFacts('FAMS') as $fact) { + foreach ($old_mother->facts('FAMS') as $fact) { if ($fact->target() === $family) { $old_mother->deleteFact($fact->id(), true); } } // Remove old WIFE link - foreach ($family->getFacts('HUSB|WIFE') as $fact) { + foreach ($family->facts('HUSB|WIFE') as $fact) { if ($fact->target() === $old_mother) { $family->deleteFact($fact->id(), true); } @@ -389,13 +389,13 @@ class EditFamilyController extends AbstractEditController foreach ($old_children as $old_child) { if ($old_child && !in_array($old_child, $new_children)) { // Remove old FAMC link - foreach ($old_child->getFacts('FAMC') as $fact) { + foreach ($old_child->facts('FAMC') as $fact) { if ($fact->target() === $family) { $old_child->deleteFact($fact->id(), true); } } // Remove old CHIL link - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { if ($fact->target() === $old_child) { $family->deleteFact($fact->id(), true); } diff --git a/app/Http/Controllers/EditGedcomRecordController.php b/app/Http/Controllers/EditGedcomRecordController.php index da2ee31527..f69d5632c0 100644 --- a/app/Http/Controllers/EditGedcomRecordController.php +++ b/app/Http/Controllers/EditGedcomRecordController.php @@ -57,7 +57,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() == $fact_id) { switch ($fact->getTag()) { case 'NOTE': @@ -108,7 +108,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() == $fact_id && $fact->canShow() && $fact->canEdit()) { $record->deleteFact($fact_id, true); break; @@ -216,7 +216,7 @@ class EditGedcomRecordController extends AbstractEditController $title = I18N::translate('Edit the raw GEDCOM') . ' - ' . $record->getFullName(); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->id() === $fact_id) { return $this->viewResponse('edit/raw-gedcom-fact', [ 'pattern' => self::GEDCOM_FACT_REGEX, @@ -249,7 +249,7 @@ class EditGedcomRecordController extends AbstractEditController $this->checkRecordAccess($record, true); - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if (!$fact->isPendingDeletion() && $fact->id() === $fact_id && $fact->canEdit()) { $record->updateFact($fact_id, $gedcom, false); break; @@ -299,7 +299,7 @@ class EditGedcomRecordController extends AbstractEditController $gedcom = '0 @' . $record->xref() . '@ ' . $record::RECORD_TYPE; // Retain any private facts - foreach ($record->getFacts('', false, Auth::PRIV_HIDE) as $fact) { + foreach ($record->facts('', false, Auth::PRIV_HIDE) as $fact) { if (!in_array($fact->id(), $fact_ids) && !$fact->isPendingDeletion()) { $gedcom .= "\n" . $fact->gedcom(); } @@ -358,7 +358,7 @@ class EditGedcomRecordController extends AbstractEditController // Find the fact to edit $edit_fact = null; - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->id() === $fact_id && $fact->canEdit()) { $edit_fact = $fact; break; diff --git a/app/Http/Controllers/EditIndividualController.php b/app/Http/Controllers/EditIndividualController.php index ecfde6a07a..9cabe04ace 100644 --- a/app/Http/Controllers/EditIndividualController.php +++ b/app/Http/Controllers/EditIndividualController.php @@ -72,7 +72,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into OBJE and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'OBJE') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -133,7 +133,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into NAME and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'NAME') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -194,7 +194,7 @@ class EditIndividualController extends AbstractEditController $keep_facts = []; // Split facts into FAMS and other - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->getTag() === 'FAMS') { $sort_facts[$fact->id()] = $fact->gedcom(); } else { @@ -586,7 +586,7 @@ class EditIndividualController extends AbstractEditController $this->checkIndividualAccess($individual, true); // Find the fact to edit - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { if ($fact->id() === $fact_id && $fact->canEdit()) { return $this->viewResponse('edit/new-individual', [ 'tree' => $tree, @@ -713,7 +713,7 @@ class EditIndividualController extends AbstractEditController // Replace any existing child->family link (we may be changing the PEDI); $fact_id = ''; - foreach ($individual->getFacts('FAMC') as $fact) { + foreach ($individual->facts('FAMC') as $fact) { if ($family === $fact->target()) { $fact_id = $fact->id(); break; @@ -725,7 +725,7 @@ class EditIndividualController extends AbstractEditController // Only set the family->child link if it does not already exist $chil_link_exists = false; - foreach ($family->getFacts('CHIL') as $fact) { + foreach ($family->facts('CHIL') as $fact) { if ($individual === $fact->target()) { $chil_link_exists = true; break; diff --git a/app/Http/Controllers/FamilyController.php b/app/Http/Controllers/FamilyController.php index f80bbd1b88..942449f0dd 100644 --- a/app/Http/Controllers/FamilyController.php +++ b/app/Http/Controllers/FamilyController.php @@ -44,7 +44,7 @@ class FamilyController extends AbstractBaseController $this->checkFamilyAccess($family, false); return $this->viewResponse('family-page', [ - 'facts' => $family->getFacts('', true), + 'facts' => $family->facts('', true), 'meta_robots' => 'index,follow', 'record' => $family, 'significant' => $this->significant($family), diff --git a/app/Http/Controllers/GedcomRecordController.php b/app/Http/Controllers/GedcomRecordController.php index 82da802ef4..961a3a5030 100644 --- a/app/Http/Controllers/GedcomRecordController.php +++ b/app/Http/Controllers/GedcomRecordController.php @@ -54,7 +54,7 @@ class GedcomRecordController extends AbstractBaseController } return $this->viewResponse('gedcom-record-page', [ - 'facts' => $record->getFacts(), + 'facts' => $record->facts(), 'families' => $record->linkedFamilies($record::RECORD_TYPE), 'individuals' => $record->linkedIndividuals($record::RECORD_TYPE), 'meta_robots' => 'index,follow', diff --git a/app/Http/Controllers/IndividualController.php b/app/Http/Controllers/IndividualController.php index 171c13d36d..8251fe3118 100644 --- a/app/Http/Controllers/IndividualController.php +++ b/app/Http/Controllers/IndividualController.php @@ -105,7 +105,7 @@ class IndividualController extends AbstractBaseController // What images are linked to this individual $individual_media = []; - foreach ($individual->getFacts() as $fact) { + foreach ($individual->facts() as $fact) { $media_object = $fact->target(); if ($media_object instanceof Media) { $individual_media[] = $media_object->firstImageFile(); @@ -114,12 +114,12 @@ class IndividualController extends AbstractBaseController $individual_media = array_filter($individual_media); $name_records = []; - foreach ($individual->getFacts('NAME') as $n => $name_fact) { + foreach ($individual->facts('NAME') as $n => $name_fact) { $name_records[] = $this->formatNameRecord($tree, $n, $name_fact); } $sex_records = []; - foreach ($individual->getFacts('SEX') as $n => $sex_fact) { + foreach ($individual->facts('SEX') as $n => $sex_fact) { $sex_records[] = $this->formatSexRecord($sex_fact); } @@ -195,9 +195,9 @@ class IndividualController extends AbstractBaseController $this->checkIndividualAccess($individual, false); - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } @@ -226,7 +226,7 @@ class IndividualController extends AbstractBaseController { $count = 0; - foreach ($individual->getFacts($fact_name) as $fact) { + foreach ($individual->facts($fact_name) as $fact) { if (!$fact->isPendingDeletion()) { $count++; } diff --git a/app/Http/Controllers/MediaController.php b/app/Http/Controllers/MediaController.php index 6454f4a080..cc342ebe5a 100644 --- a/app/Http/Controllers/MediaController.php +++ b/app/Http/Controllers/MediaController.php @@ -62,7 +62,7 @@ class MediaController extends AbstractBaseController */ private function facts(Media $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); array_filter($facts, function (Fact $fact): bool { return $fact->getTag() !== 'FILE'; diff --git a/app/Http/Controllers/NoteController.php b/app/Http/Controllers/NoteController.php index 8db41e20a2..4161fdb061 100644 --- a/app/Http/Controllers/NoteController.php +++ b/app/Http/Controllers/NoteController.php @@ -65,7 +65,7 @@ class NoteController extends AbstractBaseController private function facts(Note $record): array { $facts = []; - foreach ($record->getFacts() as $fact) { + foreach ($record->facts() as $fact) { if ($fact->getTag() != 'CONT') { $facts[] = $fact; } diff --git a/app/Http/Controllers/RepositoryController.php b/app/Http/Controllers/RepositoryController.php index a36b88b97c..73999a58e1 100644 --- a/app/Http/Controllers/RepositoryController.php +++ b/app/Http/Controllers/RepositoryController.php @@ -59,7 +59,7 @@ class RepositoryController extends AbstractBaseController */ private function facts(Repository $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); usort( $facts, diff --git a/app/Http/Controllers/SourceController.php b/app/Http/Controllers/SourceController.php index 557d30f975..1470f8e454 100644 --- a/app/Http/Controllers/SourceController.php +++ b/app/Http/Controllers/SourceController.php @@ -62,7 +62,7 @@ class SourceController extends AbstractBaseController */ private function facts(Source $record): array { - $facts = $record->getFacts(); + $facts = $record->facts(); usort( $facts, diff --git a/app/Http/Controllers/TimelineChartController.php b/app/Http/Controllers/TimelineChartController.php index 50f0d30e5e..1ae3ed54fa 100644 --- a/app/Http/Controllers/TimelineChartController.php +++ b/app/Http/Controllers/TimelineChartController.php @@ -165,9 +165,9 @@ class TimelineChartController extends AbstractChartController $birthdays [$individual->xref()] = max(1, $date->day); } // find all the fact information - $facts = $individual->getFacts(); + $facts = $individual->facts(); foreach ($individual->getSpouseFamilies() as $family) { - foreach ($family->getFacts() as $fact) { + foreach ($family->facts() as $fact) { $facts[] = $fact; } } |
