@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | if ($note->canShow()) { |
146 | 146 | $noterec = $note->gedcom(); |
147 | 147 | $nt = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match); |
148 | - $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
148 | + $data .= self::printNoteRecord($tree, ($nt > 0) ? $n1match[1] : '', 1, $noterec); |
|
149 | 149 | } |
150 | 150 | } else { |
151 | 151 | $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>'; |
@@ -362,20 +362,20 @@ discard block |
||
362 | 362 | if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) { |
363 | 363 | foreach ($matches[1] as $match) { |
364 | 364 | $wt_place = new Place($match, $tree); |
365 | - $html .= ' - ' . $wt_place->fullName(); |
|
365 | + $html .= ' - ' . $wt_place->fullName(); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 | $map_lati = ''; |
369 | 369 | $cts = preg_match('/\d LATI (.*)/', $placerec, $match); |
370 | 370 | if ($cts > 0) { |
371 | 371 | $map_lati = $match[1]; |
372 | - $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
372 | + $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati; |
|
373 | 373 | } |
374 | 374 | $map_long = ''; |
375 | 375 | $cts = preg_match('/\d LONG (.*)/', $placerec, $match); |
376 | 376 | if ($cts > 0) { |
377 | 377 | $map_long = $match[1]; |
378 | - $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
378 | + $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long; |
|
379 | 379 | } |
380 | 380 | if ($map_lati && $map_long) { |
381 | 381 | $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789 |
@@ -177,7 +177,7 @@ |
||
177 | 177 | |
178 | 178 | // Father’s ancestors link to the father’s pedigree |
179 | 179 | // Mother’s ancestors link to the mother’s pedigree.. |
180 | - $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $orientation, $generations): string { |
|
180 | + $links = $ancestors->map(function (?Individual $individual, $sosa) use ($ancestors, $orientation, $generations) : string { |
|
181 | 181 | if ($individual instanceof Individual && $sosa >= 2 ** $generations / 2 && !empty($individual->childFamilies())) { |
182 | 182 | // The last row/column, and there are more generations. |
183 | 183 | if ($sosa >= 2 ** $generations * 3 / 4) { |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | echo '<td>'; |
260 | 260 | foreach ($person->childFamilies() as $cfamily) { |
261 | 261 | foreach ($cfamily->spouses() as $parent) { |
262 | - echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . I18N::translate('Start at parents') . '">' . view('icons/arrow-up') . '<span class="sr-only">' . I18N::translate('Start at parents') . '</span></a>'; |
|
262 | + echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . I18N::translate('Start at parents') . '">' . view('icons/arrow-up') . '<span class="sr-only">' . I18N::translate('Start at parents') . '</span></a>'; |
|
263 | 263 | // only show the arrow for one of the parents |
264 | 264 | break; |
265 | 265 | } |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | if ($spouse) { |
339 | 339 | foreach ($spouse->childFamilies() as $cfamily) { |
340 | 340 | foreach ($cfamily->spouses() as $parent) { |
341 | - echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . strip_tags($this->chartTitle($parent)) . '">' . view('icons/arrow-up') . '<span class="sr-only">' . strip_tags($this->chartTitle($parent)) . '</span></a>'; |
|
341 | + echo '<a href="' . e($this->chartUrl($parent, ['generations' => $generations])) . '" title="' . strip_tags($this->chartTitle($parent)) . '">' . view('icons/arrow-up') . '<span class="sr-only">' . strip_tags($this->chartTitle($parent)) . '</span></a>'; |
|
342 | 342 | // only show the arrow for one of the parents |
343 | 343 | break; |
344 | 344 | } |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | if ($kcount == 0) { |
292 | 292 | echo "</td><td style='width:", app()->make(ModuleThemeInterface::class)->parameter('chart-box-x'), "px'>"; |
293 | 293 | } else { |
294 | - echo '<a href="#" title="' . I18N::translate('Children') . '" data-route="Descendants" data-xref="' . e($pid) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($individual->tree()->name()) . '">' . view('icons/arrow-left') . '</a>'; |
|
294 | + echo '<a href="#" title="' . I18N::translate('Children') . '" data-route="Descendants" data-xref="' . e($pid) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($individual->tree()->name()) . '">' . view('icons/arrow-left') . '</a>'; |
|
295 | 295 | |
296 | 296 | //-- move the arrow up to line up with the correct box |
297 | 297 | if ($show_spouse) { |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | } |
373 | 373 | |
374 | 374 | // filter out root person from children array so only siblings remain |
375 | - $siblings = $family->children()->filter(function (Individual $x) use ($individual): bool { |
|
375 | + $siblings = $family->children()->filter(function (Individual $x) use ($individual): bool { |
|
376 | 376 | return $x !== $individual; |
377 | 377 | }); |
378 | 378 | |
@@ -445,7 +445,7 @@ discard block |
||
445 | 445 | echo '<td id="td_' . e($ARID) . '">'; |
446 | 446 | |
447 | 447 | if ($generation == $generations - 1 && $family->husband()->childFamilies()) { |
448 | - echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->husband()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
448 | + echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->husband()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
449 | 449 | } |
450 | 450 | |
451 | 451 | $this->printPersonPedigree($family->husband(), $generation + 1, $generations, $show_spouse); |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | echo '<td id="td_' . e($ARID) . '">'; |
477 | 477 | |
478 | 478 | if ($generation == $generations - 1 && $family->wife()->childFamilies()) { |
479 | - echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->wife()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
479 | + echo '<a href="#" title="' . I18N::translate('Parents') . '" data-route="Ancestors" data-xref="' . e($ARID) . '" data-spouses="' . e($show_spouse) . '" data-tree="' . e($family->wife()->tree()->name()) . '">' . view('icons/arrow-right') . '</a>'; |
|
480 | 480 | } |
481 | 481 | |
482 | 482 | $this->printPersonPedigree($family->wife(), $generation + 1, $generations, $show_spouse); |
@@ -103,11 +103,11 @@ |
||
103 | 103 | $record = GedcomRecord::getInstance('HEAD', $tree); |
104 | 104 | $fact = $record->facts(['COPR'])->first(); |
105 | 105 | if ($fact instanceof Fact) { |
106 | - $COPR = "\n1 COPR " .$fact->value(); |
|
106 | + $COPR = "\n1 COPR " . $fact->value(); |
|
107 | 107 | } |
108 | - $fact = $record->facts(['LANG'])->first(); |
|
108 | + $fact = $record->facts(['LANG'])->first(); |
|
109 | 109 | if ($fact instanceof Fact) { |
110 | - $LANG = "\n1 LANG " .$fact->value(); |
|
110 | + $LANG = "\n1 LANG " . $fact->value(); |
|
111 | 111 | } |
112 | 112 | // Link to actual SUBM/SUBN records, if they exist |
113 | 113 | $subn = DB::table('other') |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'generations' => 3, |
111 | 111 | 'layout' => PedigreeChartModule::ORIENTATION_RIGHT, |
112 | 112 | ]); |
113 | - $content = view('modules/charts/chart', [ |
|
113 | + $content = view('modules/charts/chart', [ |
|
114 | 114 | 'block_id' => $block_id, |
115 | 115 | 'chart_url' => $chart_url, |
116 | 116 | ]); |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | 'generations' => 2, |
126 | 126 | 'chart_style' => DescendancyChartModule::CHART_STYLE_LIST, |
127 | 127 | ]); |
128 | - $content = view('modules/charts/chart', [ |
|
128 | + $content = view('modules/charts/chart', [ |
|
129 | 129 | 'block_id' => $block_id, |
130 | 130 | 'chart_url' => $chart_url, |
131 | 131 | ]); |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | 'ajax' => true, |
140 | 140 | 'generations' => 2, |
141 | 141 | ]); |
142 | - $content = view('modules/charts/chart', [ |
|
142 | + $content = view('modules/charts/chart', [ |
|
143 | 143 | 'block_id' => $block_id, |
144 | 144 | 'chart_url' => $chart_url, |
145 | 145 | ]); |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function __construct(Tree $tree) |
51 | 51 | { |
52 | - $this->tree = $tree; |
|
52 | + $this->tree = $tree; |
|
53 | 53 | $this->country_service = new CountryService(); |
54 | 54 | } |
55 | 55 |