@@ -547,7 +547,7 @@ discard block |
||
547 | 547 | $tree = $request->getAttribute('tree'); |
548 | 548 | assert($tree instanceof Tree); |
549 | 549 | |
550 | - $xref = $request->getQueryParams()['xref']; |
|
550 | + $xref = $request->getQueryParams()['xref']; |
|
551 | 551 | |
552 | 552 | $individual = Factory::individual()->make($xref, $tree); |
553 | 553 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -559,7 +559,7 @@ discard block |
||
559 | 559 | $family = Factory::family()->make($famid, $tree); |
560 | 560 | $family = Auth::checkFamilyAccess($family, true); |
561 | 561 | |
562 | - $PEDI = $params['PEDI']; |
|
562 | + $PEDI = $params['PEDI']; |
|
563 | 563 | |
564 | 564 | // Replace any existing child->family link (we may be changing the PEDI); |
565 | 565 | $fact_id = ''; |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | $tree = $request->getAttribute('tree'); |
632 | 632 | assert($tree instanceof Tree); |
633 | 633 | |
634 | - $xref = $request->getQueryParams()['xref']; |
|
634 | + $xref = $request->getQueryParams()['xref']; |
|
635 | 635 | |
636 | 636 | $individual = Factory::individual()->make($xref, $tree); |
637 | 637 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -291,7 +291,7 @@ discard block |
||
291 | 291 | $anniversary_facts = $this->calendar_service->getCalendarEvents($ged_year->minimumJulianDay(), $ged_year->maximumJulianDay(), $filterev, $tree); |
292 | 292 | } |
293 | 293 | |
294 | - $anniversary_facts = $this->applyFilter($anniversary_facts, $filterof, $filtersx); |
|
294 | + $anniversary_facts = $this->applyFilter($anniversary_facts, $filterof, $filtersx); |
|
295 | 295 | $anniversaries = Collection::make($anniversary_facts) |
296 | 296 | ->unique() |
297 | 297 | ->sort(static function (Fact $x, Fact $y): int { |
@@ -467,7 +467,7 @@ discard block |
||
467 | 467 | */ |
468 | 468 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
469 | 469 | { |
470 | - $filtered = []; |
|
470 | + $filtered = []; |
|
471 | 471 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
472 | 472 | foreach ($facts as $fact) { |
473 | 473 | $record = $fact->record(); |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | $html = ''; |
520 | 520 | |
521 | 521 | foreach ($list as $xref => $facts) { |
522 | - $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
522 | + $tmp = Factory::gedcomRecord()->make((string) $xref, $tree); |
|
523 | 523 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
524 | 524 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
525 | 525 | } |
@@ -308,7 +308,7 @@ |
||
308 | 308 | $title = I18N::translate('Edit the story') . ' — ' . e($tree->title()); |
309 | 309 | } |
310 | 310 | |
311 | - $individual = Factory::individual()->make($xref, $tree); |
|
311 | + $individual = Factory::individual()->make($xref, $tree); |
|
312 | 312 | |
313 | 313 | return $this->viewResponse('modules/stories/edit', [ |
314 | 314 | 'block_id' => $block_id, |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | use ModuleChartTrait; |
55 | 55 | use ModuleConfigTrait; |
56 | 56 | |
57 | - protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
57 | + protected const ROUTE_URL = '/tree/{tree}/relationships-{ancestors}-{recursion}/{xref}{/xref2}'; |
|
58 | 58 | |
59 | 59 | /** It would be more correct to use PHP_INT_MAX, but this isn't friendly in URLs */ |
60 | 60 | public const UNLIMITED_RECURSION = 99; |
@@ -332,14 +332,14 @@ discard block |
||
332 | 332 | case 'sis': |
333 | 333 | case 'sib': |
334 | 334 | $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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-right') . '</div></div>'; |
335 | - $x += 2; |
|
335 | + $x += 2; |
|
336 | 336 | break; |
337 | 337 | case 'son': |
338 | 338 | case 'dau': |
339 | 339 | case 'chi': |
340 | 340 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
341 | 341 | $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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . 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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
345 | 345 | } |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | case 'par': |
351 | 351 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
352 | 352 | $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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
353 | - $x += 2; |
|
353 | + $x += 2; |
|
354 | 354 | } else { |
355 | 355 | $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], Factory::individual()->make($path[$n - 1], $tree), Factory::individual()->make($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
356 | 356 | } |
@@ -648,17 +648,17 @@ discard block |
||
648 | 648 | */ |
649 | 649 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
650 | 650 | { |
651 | - $spouse_codes = [ |
|
651 | + $spouse_codes = [ |
|
652 | 652 | 'M' => 'hus', |
653 | 653 | 'F' => 'wif', |
654 | 654 | 'U' => 'spo', |
655 | 655 | ]; |
656 | - $parent_codes = [ |
|
656 | + $parent_codes = [ |
|
657 | 657 | 'M' => 'fat', |
658 | 658 | 'F' => 'mot', |
659 | 659 | 'U' => 'par', |
660 | 660 | ]; |
661 | - $child_codes = [ |
|
661 | + $child_codes = [ |
|
662 | 662 | 'M' => 'son', |
663 | 663 | 'F' => 'dau', |
664 | 664 | 'U' => 'chi', |