summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/AdvancedSearchController.php3
-rw-r--r--app/Controller/AncestryController.php8
-rw-r--r--app/Controller/DescendancyController.php12
-rw-r--r--app/Controller/FamilyBookController.php9
-rw-r--r--app/Controller/FamilyController.php11
-rw-r--r--app/Controller/HourglassController.php9
-rw-r--r--app/Controller/IndividualController.php9
-rw-r--r--app/Controller/LifespanController.php3
-rw-r--r--app/Controller/MediaController.php3
-rw-r--r--app/Controller/PageController.php3
-rw-r--r--app/Controller/PedigreeController.php2
-rw-r--r--app/Controller/SearchController.php22
-rw-r--r--app/Controller/TimelineController.php8
13 files changed, 61 insertions, 41 deletions
diff --git a/app/Controller/AdvancedSearchController.php b/app/Controller/AdvancedSearchController.php
index 120323f121..51911f08d1 100644
--- a/app/Controller/AdvancedSearchController.php
+++ b/app/Controller/AdvancedSearchController.php
@@ -17,6 +17,7 @@ namespace Fisharebest\Webtrees\Controller;
*/
use Fisharebest\Webtrees\Database;
use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
@@ -638,7 +639,7 @@ class AdvancedSearchController extends SearchController {
public function printResults() {
if ($this->myindilist) {
uasort($this->myindilist, '\Fisharebest\Webtrees\GedcomRecord::compare');
- echo format_indi_table($this->myindilist);
+ echo FunctionsPrintLists::individualTable($this->myindilist);
} elseif (array_filter($this->values)) {
echo '<p class="ui-state-highlight">', I18N::translate('No results found.'), '</p>';
}
diff --git a/app/Controller/AncestryController.php b/app/Controller/AncestryController.php
index 2d374664aa..51f31f0491 100644
--- a/app/Controller/AncestryController.php
+++ b/app/Controller/AncestryController.php
@@ -16,6 +16,8 @@ namespace Fisharebest\Webtrees\Controller;
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsCharts;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
@@ -72,13 +74,13 @@ class AncestryController extends ChartController {
echo '<img src="', Theme::theme()->parameter('image-spacer'), '" height="3" width="2" alt="">';
echo '<img src="', Theme::theme()->parameter('image-hline'), '" height="3" width="', Theme::theme()->parameter('chart-descendancy-indent') - 2, '"></td><td>';
}
- print_pedigree_person($individual, $this->showFull());
+ FunctionsPrint::printPedigreePerson($individual, $this->showFull());
echo '</td><td>';
if ($sosa > 1) {
- print_url_arrow('?rootid=' . $individual->getXref() . '&amp;PEDIGREE_GENERATIONS=' . $this->generations . '&amp;show_full=' . $this->showFull() . '&amp;chart_style=' . $this->chart_style . '&amp;ged=' . $individual->getTree()->getNameUrl(), I18N::translate('Ancestors of %s', $individual->getFullName()), 3);
+ FunctionsCharts::printUrlArrow('?rootid=' . $individual->getXref() . '&amp;PEDIGREE_GENERATIONS=' . $this->generations . '&amp;show_full=' . $this->showFull() . '&amp;chart_style=' . $this->chart_style . '&amp;ged=' . $individual->getTree()->getNameUrl(), I18N::translate('Ancestors of %s', $individual->getFullName()), 3);
}
echo '</td><td class="details1">&nbsp;<span class="person_box' . ($sosa === 1 ? 'NN' : ($sosa % 2 ? 'F' : '')) . '">', I18N::number($sosa), '</span> ';
- echo '</td><td class="details1">&nbsp;', get_sosa_name($sosa), '</td>';
+ echo '</td><td class="details1">&nbsp;', FunctionsCharts::getSosaName($sosa), '</td>';
echo '</tr></tbody></table>';
// Parents
diff --git a/app/Controller/DescendancyController.php b/app/Controller/DescendancyController.php
index 3b45faf911..d2bfe2424a 100644
--- a/app/Controller/DescendancyController.php
+++ b/app/Controller/DescendancyController.php
@@ -18,6 +18,8 @@ namespace Fisharebest\Webtrees\Controller;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsCharts;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
@@ -77,7 +79,7 @@ class DescendancyController extends ChartController {
return;
}
foreach ($person->getSpouseFamilies() as $family) {
- print_sosa_family($family->getXref(), '', -1, $label, $person->getXref(), $gpid, 0, $this->showFull());
+ FunctionsCharts::printSosaFamily($family->getXref(), '', -1, $label, $person->getXref(), $gpid, 0, $this->showFull());
$i = 1;
foreach ($family->getChildren() as $child) {
$this->printChildFamily($child, $depth - 1, $label . ($i++) . '.', $person->getXref());
@@ -100,7 +102,7 @@ class DescendancyController extends ChartController {
echo "<img src=\"" . Theme::theme()->parameter('image-spacer') . "\" height=\"3\" width=\"3\" alt=\"\">";
echo "<img src=\"" . Theme::theme()->parameter('image-hline') . "\" height=\"3\" width=\"", Theme::theme()->parameter('chart-descendancy-indent') - 3, "\" alt=\"\"></td><td>";
}
- print_pedigree_person($person, $this->showFull());
+ FunctionsPrint::printPedigreePerson($person, $this->showFull());
echo '</td>';
// check if child has parents and add an arrow
@@ -108,7 +110,7 @@ class DescendancyController extends ChartController {
echo '<td>';
foreach ($person->getChildFamilies() as $cfamily) {
foreach ($cfamily->getSpouses() as $parent) {
- print_url_arrow('?rootid=' . $parent->getXref() . '&amp;generations=' . $this->generations . '&amp;chart_style=' . $this->chart_style . '&amp;show_full=' . $this->showFull() . '&amp;ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2);
+ FunctionsCharts::printUrlArrow('?rootid=' . $parent->getXref() . '&amp;generations=' . $this->generations . '&amp;chart_style=' . $this->chart_style . '&amp;show_full=' . $this->showFull() . '&amp;ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2);
// only show the arrow for one of the parents
break;
}
@@ -176,7 +178,7 @@ class DescendancyController extends ChartController {
echo '<ul id="' . $uid . '" class="generation">';
echo '<li>';
echo '<table><tr><td>';
- print_pedigree_person($spouse, $this->showFull());
+ FunctionsPrint::printPedigreePerson($spouse, $this->showFull());
echo '</td>';
// check if spouse has parents and add an arrow
@@ -185,7 +187,7 @@ class DescendancyController extends ChartController {
if ($spouse) {
foreach ($spouse->getChildFamilies() as $cfamily) {
foreach ($cfamily->getSpouses() as $parent) {
- print_url_arrow('?rootid=' . $parent->getXref() . '&amp;generations=' . $this->generations . '&amp;chart_style=' . $this->chart_style . '&amp;show_full=' . $this->showFull() . '&amp;ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2);
+ FunctionsCharts::printUrlArrow('?rootid=' . $parent->getXref() . '&amp;generations=' . $this->generations . '&amp;chart_style=' . $this->chart_style . '&amp;show_full=' . $this->showFull() . '&amp;ged=' . $parent->getTree()->getNameUrl(), I18N::translate('Start at parents'), 2);
// only show the arrow for one of the parents
break;
}
diff --git a/app/Controller/FamilyBookController.php b/app/Controller/FamilyBookController.php
index ad2dd42f72..2aac9d6ef9 100644
--- a/app/Controller/FamilyBookController.php
+++ b/app/Controller/FamilyBookController.php
@@ -17,6 +17,7 @@ namespace Fisharebest\Webtrees\Controller;
*/
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
@@ -152,7 +153,7 @@ class FamilyBookController extends ChartController {
}
echo '<table><tr><td>';
if ($person) {
- print_pedigree_person($person, $this->showFull());
+ FunctionsPrint::printPedigreePerson($person, $this->showFull());
echo '</td><td>',
'<img class="line2" src="', Theme::theme()->parameter('image-hline'), '" width="8" height="3" alt="">';
} else {
@@ -166,7 +167,7 @@ class FamilyBookController extends ChartController {
foreach ($person->getSpouseFamilies() as $family) {
$spouse = $family->getSpouse($person);
echo '</td></tr><tr><td>';
- print_pedigree_person($spouse, $this->showFull());
+ FunctionsPrint::printPedigreePerson($spouse, $this->showFull());
$numkids += 0.95;
echo '</td><td>';
}
@@ -259,7 +260,7 @@ class FamilyBookController extends ChartController {
'<td>';
$lh = $savlh; // restore original line height
//-- print the father box
- print_pedigree_person($family->getHusband(), $this->showFull());
+ FunctionsPrint::printPedigreePerson($family->getHusband(), $this->showFull());
echo '</td>';
if ($family->getHusband()) {
echo '<td>';
@@ -282,7 +283,7 @@ class FamilyBookController extends ChartController {
'<td><img class="line4" src="', Theme::theme()->parameter('image-hline'), '" height="3"></td>',
'<td>';
//-- print the mother box
- print_pedigree_person($family->getWife(), $this->showFull());
+ FunctionsPrint::printPedigreePerson($family->getWife(), $this->showFull());
echo '</td>';
if ($family->getWife()) {
echo '<td>';
diff --git a/app/Controller/FamilyController.php b/app/Controller/FamilyController.php
index e657168ee3..d0d31f3403 100644
--- a/app/Controller/FamilyController.php
+++ b/app/Controller/FamilyController.php
@@ -18,6 +18,9 @@ namespace Fisharebest\Webtrees\Controller;
use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\Functions;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
+use Fisharebest\Webtrees\Functions\FunctionsPrintFacts;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Menu;
@@ -177,16 +180,16 @@ class FamilyController extends GedcomRecordController {
$indifacts = $this->record->getFacts();
if ($indifacts) {
- sort_facts($indifacts);
+ Functions::sortFacts($indifacts);
foreach ($indifacts as $fact) {
- print_fact($fact, $this->record);
+ FunctionsPrintFacts::printFact($fact, $this->record);
}
} else {
echo '<tr><td class="messagebox" colspan="2">', I18N::translate('No facts for this family.'), '</td></tr>';
}
if (Auth::isEditor($this->record->getTree())) {
- print_add_new_fact($this->record->getXref(), $indifacts, 'FAM');
+ FunctionsPrint::printAddNewFact($this->record->getXref(), $indifacts, 'FAM');
echo '<tr><td class="descriptionbox">';
echo I18N::translate('Note');
@@ -205,7 +208,7 @@ class FamilyController extends GedcomRecordController {
echo I18N::translate('Media object');
echo '</td><td class="optionbox">';
echo "<a href=\"#\" onclick=\"window.open('addmedia.php?action=showmediaform&amp;linktoid=" . $this->record->getXref() . "', '_blank', edit_window_specs); return false;\">", I18N::translate('Add a new media object'), '</a>';
- echo help_link('OBJE');
+ echo FunctionsPrint::helpLink('OBJE');
echo '<br>';
echo "<a href=\"#\" onclick=\"window.open('inverselink.php?linktoid=" . $this->record->getXref() . "&amp;linkto=family', '_blank', find_window_specs); return false;\">", I18N::translate('Link to an existing media object'), '</a>';
echo '</td></tr>';
diff --git a/app/Controller/HourglassController.php b/app/Controller/HourglassController.php
index e0073a3908..abcf723008 100644
--- a/app/Controller/HourglassController.php
+++ b/app/Controller/HourglassController.php
@@ -17,6 +17,7 @@ namespace Fisharebest\Webtrees\Controller;
*/
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
@@ -120,7 +121,7 @@ class HourglassController extends ChartController {
echo '<td><img class="line4" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3"></td>';
echo '<td>';
//-- print the father box
- print_pedigree_person($family->getHusband(), $this->showFull());
+ FunctionsPrint::printPedigreePerson($family->getHusband(), $this->showFull());
echo "</td>";
if ($family->getHusband()) {
$ARID = $family->getHusband()->getXref();
@@ -152,7 +153,7 @@ class HourglassController extends ChartController {
'<td><img class="line4" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3" alt=""></td>',
'<td>';
//-- print the mother box
- print_pedigree_person($family->getWife(), $this->showFull());
+ FunctionsPrint::printPedigreePerson($family->getWife(), $this->showFull());
echo '</td>';
if ($family->getWife()) {
$ARID = $family->getWife()->getXref();
@@ -285,7 +286,7 @@ class HourglassController extends ChartController {
}
echo '<table id="table2_' . $pid . '"><tr><td>';
- print_pedigree_person($person, $this->showFull());
+ FunctionsPrint::printPedigreePerson($person, $this->showFull());
echo '</td><td><img class="line2" src="' . Theme::theme()->parameter('image-hline') . '" width="7" height="3">';
//----- Print the spouse
@@ -297,7 +298,7 @@ class HourglassController extends ChartController {
$temph = $this->getBoxDimensions()->height;
$this->getBoxDimensions()->width -= 10;
$this->getBoxDimensions()->height -= 10;
- print_pedigree_person($family->getSpouse($person), $this->showFull());
+ FunctionsPrint::printPedigreePerson($family->getSpouse($person), $this->showFull());
$this->getBoxDimensions()->width = $tempw;
$this->getBoxDimensions()->height = $temph;
$numkids += 0.95;
diff --git a/app/Controller/IndividualController.php b/app/Controller/IndividualController.php
index 995f764779..8777a44a3f 100644
--- a/app/Controller/IndividualController.php
+++ b/app/Controller/IndividualController.php
@@ -21,6 +21,9 @@ use Fisharebest\Webtrees\Database;
use Fisharebest\Webtrees\Fact;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsDb;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
+use Fisharebest\Webtrees\Functions\FunctionsPrintFacts;
use Fisharebest\Webtrees\GedcomCode\GedcomCodeName;
use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
@@ -48,7 +51,7 @@ class IndividualController extends GedcomRecordController {
$this->record = Individual::getInstance($xref, $WT_TREE);
if (!$this->record && $WT_TREE->getPreference('USE_RIN')) {
- $rin = find_rin_id($xref);
+ $rin = FunctionsDb::findRin($xref);
$this->record = Individual::getInstance($rin, $WT_TREE);
}
@@ -209,10 +212,10 @@ class IndividualController extends GedcomRecordController {
echo '</div>';
}
if (preg_match("/\n2 SOUR/", $factrec)) {
- echo '<div id="indi_sour" class="clearfloat">', print_fact_sources($factrec, 2), '</div>';
+ echo '<div id="indi_sour" class="clearfloat">', FunctionsPrintFacts::printFactSources($factrec, 2), '</div>';
}
if (preg_match("/\n2 NOTE/", $factrec)) {
- echo '<div id="indi_note" class="clearfloat">', print_fact_notes($factrec, 2), '</div>';
+ echo '<div id="indi_note" class="clearfloat">', FunctionsPrint::printFactNotes($factrec, 2), '</div>';
}
echo '</div>';
}
diff --git a/app/Controller/LifespanController.php b/app/Controller/LifespanController.php
index f0468bcd8f..bcd062a384 100644
--- a/app/Controller/LifespanController.php
+++ b/app/Controller/LifespanController.php
@@ -20,6 +20,7 @@ use Fisharebest\ExtCalendar\GregorianCalendar;
use Fisharebest\Webtrees\Database;
use Fisharebest\Webtrees\Date;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\Functions;
use Fisharebest\Webtrees\GedcomTag;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
@@ -430,7 +431,7 @@ class LifespanController extends PageController {
$unparsedEvents[] = $fact;
}
}
- sort_facts($unparsedEvents);
+ Functions::sortFacts($unparsedEvents);
$eventinformation = array();
foreach ($unparsedEvents as $val) {
diff --git a/app/Controller/MediaController.php b/app/Controller/MediaController.php
index eba6c2d301..b7b968a473 100644
--- a/app/Controller/MediaController.php
+++ b/app/Controller/MediaController.php
@@ -19,6 +19,7 @@ namespace Fisharebest\Webtrees\Controller;
use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Fact;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\Functions;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Media;
use Fisharebest\Webtrees\Menu;
@@ -131,7 +132,7 @@ class MediaController extends GedcomRecordController {
$facts[] = new Fact('1 __FILE_SIZE__ ' . $this->record->getFilesize(), $this->record, 0);
}
- sort_facts($facts);
+ Functions::sortFacts($facts);
return $facts;
}
diff --git a/app/Controller/PageController.php b/app/Controller/PageController.php
index 309a196d00..848774552a 100644
--- a/app/Controller/PageController.php
+++ b/app/Controller/PageController.php
@@ -20,6 +20,7 @@ use Fisharebest\Webtrees\Auth;
use Fisharebest\Webtrees\Database;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\Functions;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
@@ -115,7 +116,7 @@ class PageController extends BaseController {
*/
public function restrictAccess($condition) {
if ($condition !== true) {
- header('Location: ' . WT_LOGIN_URL . '?url=' . rawurlencode(get_query_url()));
+ header('Location: ' . WT_LOGIN_URL . '?url=' . rawurlencode(Functions::getQueryUrl()));
exit;
}
diff --git a/app/Controller/PedigreeController.php b/app/Controller/PedigreeController.php
index 1de6c89f66..09b7559683 100644
--- a/app/Controller/PedigreeController.php
+++ b/app/Controller/PedigreeController.php
@@ -257,7 +257,7 @@ class PedigreeController extends ChartController {
*
* @return string
*/
- public function get_menu() {
+ public function getMenu() {
$famids = $this->root->getSpouseFamilies();
$html = '';
if ($famids) {
diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php
index e33cbb220f..946c3875cb 100644
--- a/app/Controller/SearchController.php
+++ b/app/Controller/SearchController.php
@@ -21,6 +21,8 @@ use Fisharebest\Webtrees\ConfigData;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
use Fisharebest\Webtrees\FlashMessages;
+use Fisharebest\Webtrees\Functions\FunctionsDb;
+use Fisharebest\Webtrees\Functions\FunctionsPrintLists;
use Fisharebest\Webtrees\GedcomRecord;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
@@ -238,26 +240,26 @@ class SearchController extends PageController {
// Search the individuals
if ($this->srindi && $query_terms) {
- $this->myindilist = search_indis($query_terms, $this->search_trees);
+ $this->myindilist = FunctionsDb::searchIndividuals($query_terms, $this->search_trees);
}
// Search the fams
if ($this->srfams && $query_terms) {
$this->myfamlist = array_merge(
- search_fams($query_terms, $this->search_trees),
- search_fams_names($query_terms, $this->search_trees)
+ FunctionsDb::searchFamilies($query_terms, $this->search_trees),
+ FunctionsDb::searchFamilyNames($query_terms, $this->search_trees)
);
$this->myfamlist = array_unique($this->myfamlist);
}
// Search the sources
if ($this->srsour && $query_terms) {
- $this->mysourcelist = search_sources($query_terms, $this->search_trees);
+ $this->mysourcelist = FunctionsDb::searchSources($query_terms, $this->search_trees);
}
// Search the notes
if ($this->srnote && $query_terms) {
- $this->mynotelist = search_notes($query_terms, $this->search_trees);
+ $this->mynotelist = FunctionsDb::searchNotes($query_terms, $this->search_trees);
}
// If only 1 item is returned, automatically forward to that item
@@ -462,7 +464,7 @@ class SearchController extends PageController {
Log::addSearchLog($logstring, $this->search_trees);
if ($this->search_trees) {
- $this->myindilist = search_indis_soundex($this->soundex, $this->lastname, $this->firstname, $this->place, $this->search_trees);
+ $this->myindilist = FunctionsDb::searchIndividualsPhonetic($this->soundex, $this->lastname, $this->firstname, $this->place, $this->search_trees);
} else {
$this->myindilist = array();
}
@@ -524,16 +526,16 @@ class SearchController extends PageController {
}
echo '</ul>';
if (!empty($this->myindilist)) {
- echo '<div id="individual-results-tab">', format_indi_table($this->myindilist), '</div>';
+ echo '<div id="individual-results-tab">', FunctionsPrintLists::individualTable($this->myindilist), '</div>';
}
if (!empty($this->myfamlist)) {
- echo '<div id="families-results-tab">', format_fam_table($this->myfamlist), '</div>';
+ echo '<div id="families-results-tab">', FunctionsPrintLists::familyTable($this->myfamlist), '</div>';
}
if (!empty($this->mysourcelist)) {
- echo '<div id="sources-results-tab">', format_sour_table($this->mysourcelist), '</div>';
+ echo '<div id="sources-results-tab">', FunctionsPrintLists::sourceTable($this->mysourcelist), '</div>';
}
if (!empty($this->mynotelist)) {
- echo '<div id="notes-results-tab">', format_note_table($this->mynotelist), '</div>';
+ echo '<div id="notes-results-tab">', FunctionsPrintLists::noteTable($this->mynotelist), '</div>';
}
} else {
// One or more search terms were specified, but no results were found.
diff --git a/app/Controller/TimelineController.php b/app/Controller/TimelineController.php
index 4696ddb011..85a8095065 100644
--- a/app/Controller/TimelineController.php
+++ b/app/Controller/TimelineController.php
@@ -20,6 +20,8 @@ use Fisharebest\Webtrees\Date\GregorianDate;
use Fisharebest\Webtrees\Fact;
use Fisharebest\Webtrees\Family;
use Fisharebest\Webtrees\Filter;
+use Fisharebest\Webtrees\Functions\FunctionsDate;
+use Fisharebest\Webtrees\Functions\FunctionsPrint;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
use Fisharebest\Webtrees\Theme;
@@ -225,16 +227,16 @@ class TimelineController extends PageController {
echo $event->getLabel();
echo ' — ';
if ($record instanceof Individual) {
- echo format_fact_date($event, $record, false, false);
+ echo FunctionsPrint::formatFactDate($event, $record, false, false);
} elseif ($record instanceof Family) {
echo $gdate->display();
if ($record->getHusband() && $record->getHusband()->getBirthDate()->isOK()) {
- $ageh = get_age_at_event(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate), false);
+ $ageh = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getHusband()->getBirthDate(), $gdate), false);
} else {
$ageh = null;
}
if ($record->getWife() && $record->getWife()->getBirthDate()->isOK()) {
- $agew = get_age_at_event(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate), false);
+ $agew = FunctionsDate::getAgeAtEvent(Date::getAgeGedcom($record->getWife()->getBirthDate(), $gdate), false);
} else {
$agew = null;
}
generated by cgit v1.3 (git 2.53.0) at 2026-07-08 22:13:38 +0000