@@ -57,7 +57,7 @@ |
||
57 | 57 | $tot_l |
58 | 58 | ]; |
59 | 59 | |
60 | - $data[] = [ |
|
60 | + $data[] = [ |
|
61 | 61 | I18N::translate('Dead'), |
62 | 62 | $tot_d |
63 | 63 | ]; |
@@ -102,9 +102,9 @@ |
||
102 | 102 | ->groupBy(['century', 'sex']); |
103 | 103 | |
104 | 104 | return $male->unionAll($female) |
105 | - ->orderBy('century') |
|
106 | - ->get() |
|
107 | - ->all(); |
|
105 | + ->orderBy('century') |
|
106 | + ->get() |
|
107 | + ->all(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | /** |
@@ -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 |
@@ -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 |
@@ -3,7 +3,8 @@ |
||
3 | 3 | use Fisharebest\Webtrees\Module\ModuleCustomInterface; |
4 | 4 | use Fisharebest\Webtrees\Module\ModuleCustomTrait; |
5 | 5 | |
6 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
6 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
7 | +{ |
|
7 | 8 | use ModuleCustomTrait; |
8 | 9 | |
9 | 10 | /** |
@@ -252,7 +252,7 @@ |
||
252 | 252 | [$namespace, $view_name] = explode(self::NAMESPACE_SEPARATOR, $view_name, 2); |
253 | 253 | |
254 | 254 | if ((self::$namespaces[$namespace] ?? null) === null) { |
255 | - throw new RuntimeException('Namespace "' . e($namespace) . '" not found.'); |
|
255 | + throw new RuntimeException('Namespace "' . e($namespace) . '" not found.'); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | $view_file = self::$namespaces[$namespace] . $view_name . self::TEMPLATE_EXTENSION; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | // Ambiguous dates - don't override calendar escape |
157 | 157 | if ($cal === '') { |
158 | 158 | if (preg_match('/^(JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)$/', $m)) { |
159 | - $cal = GregorianDate::ESCAPE; |
|
159 | + $cal = GregorianDate::ESCAPE; |
|
160 | 160 | } elseif (preg_match('/^[345]\d\d\d$/', $y)) { |
161 | 161 | // Year 3000-5999 |
162 | 162 | $cal = JewishDate::ESCAPE; |
@@ -451,7 +451,7 @@ discard block |
||
451 | 451 | public function addYears(int $years, string $qualifier = ''): Date |
452 | 452 | { |
453 | 453 | $tmp = clone $this; |
454 | - $tmp->date1->year += $years; |
|
454 | + $tmp->date1->year += $years; |
|
455 | 455 | $tmp->date1->month = 0; |
456 | 456 | $tmp->date1->day = 0; |
457 | 457 | $tmp->date1->setJdFromYmd(); |
@@ -575,7 +575,7 @@ |
||
575 | 575 | $html .= view('components/select', ['id' => $id, 'name' => $name, 'selected' => $value, 'options' => GedcomCodeName::getValues()]); |
576 | 576 | } elseif ($fact === 'TYPE' && $level === '3') { |
577 | 577 | //-- Build the selector for the Media 'TYPE' Fact |
578 | - $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
578 | + $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
579 | 579 | $selectedValue = strtolower($value); |
580 | 580 | if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) { |
581 | 581 | $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>'; |
@@ -321,14 +321,14 @@ discard block |
||
321 | 321 | case 'sis': |
322 | 322 | case 'sib': |
323 | 323 | $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-right') . '</div></div>'; |
324 | - $x += 2; |
|
324 | + $x += 2; |
|
325 | 325 | break; |
326 | 326 | case 'son': |
327 | 327 | case 'dau': |
328 | 328 | case 'chi': |
329 | 329 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
330 | 330 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
331 | - $x += 2; |
|
331 | + $x += 2; |
|
332 | 332 | } else { |
333 | 333 | $table[$x][$y - 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
334 | 334 | } |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | case 'par': |
340 | 340 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
341 | 341 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
342 | - $x += 2; |
|
342 | + $x += 2; |
|
343 | 343 | } else { |
344 | 344 | $table[$x][$y + 1] = '<div style="background:url(' . e('"' . asset('css/images/vline.png') . '"') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
345 | 345 | } |
@@ -550,17 +550,17 @@ discard block |
||
550 | 550 | */ |
551 | 551 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
552 | 552 | { |
553 | - $spouse_codes = [ |
|
553 | + $spouse_codes = [ |
|
554 | 554 | 'M' => 'hus', |
555 | 555 | 'F' => 'wif', |
556 | 556 | 'U' => 'spo', |
557 | 557 | ]; |
558 | - $parent_codes = [ |
|
558 | + $parent_codes = [ |
|
559 | 559 | 'M' => 'fat', |
560 | 560 | 'F' => 'mot', |
561 | 561 | 'U' => 'par', |
562 | 562 | ]; |
563 | - $child_codes = [ |
|
563 | + $child_codes = [ |
|
564 | 564 | 'M' => 'son', |
565 | 565 | 'F' => 'dau', |
566 | 566 | 'U' => 'chi', |