@@ -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', |
@@ -87,7 +87,7 @@ |
||
87 | 87 | public function getMenu(Tree $tree): ?Menu |
88 | 88 | { |
89 | 89 | $submenus = $this->module_service->findByComponent(ModuleListInterface::class, $tree, Auth::user()) |
90 | - ->map(static function (ModuleListInterface $module) use ($tree): ?Menu { |
|
90 | + ->map(static function (ModuleListInterface $module) use ($tree) : ?Menu { |
|
91 | 91 | return $module->listMenu($tree); |
92 | 92 | }) |
93 | 93 | ->filter() |
@@ -721,7 +721,7 @@ |
||
721 | 721 | public function findByName(string $module_name, bool $include_disabled = false): ?ModuleInterface |
722 | 722 | { |
723 | 723 | return $this->all($include_disabled) |
724 | - ->first(static function (ModuleInterface $module) use ($module_name): bool { |
|
724 | + ->first(static function (ModuleInterface $module) use ($module_name) : bool { |
|
725 | 725 | return $module->name() === $module_name; |
726 | 726 | }); |
727 | 727 | } |
@@ -907,7 +907,7 @@ |
||
907 | 907 | private function filterActiveBlocks(Collection $blocks, Collection $active_blocks): Collection |
908 | 908 | { |
909 | 909 | return $blocks->map(static function (string $block_name) use ($active_blocks): ?ModuleBlockInterface { |
910 | - return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name): bool { |
|
910 | + return $active_blocks->filter(static function (ModuleInterface $block) use ($block_name) : bool { |
|
911 | 911 | return $block->name() === $block_name; |
912 | 912 | })->first(); |
913 | 913 | })->filter(); |
@@ -62,7 +62,7 @@ |
||
62 | 62 | } else { |
63 | 63 | $ip_address = '127.0.0.1'; |
64 | 64 | } |
65 | - $tree_id = $tree ? $tree->id() : null; |
|
65 | + $tree_id = $tree ? $tree->id() : null; |
|
66 | 66 | |
67 | 67 | DB::table('log')->insert([ |
68 | 68 | 'log_type' => $log_type, |
@@ -2618,7 +2618,7 @@ |
||
2618 | 2618 | /** @var ModuleBlockInterface|null $module */ |
2619 | 2619 | $module = $this->module_service |
2620 | 2620 | ->findByComponent(ModuleBlockInterface::class, $this->tree, Auth::user()) |
2621 | - ->first(static function (ModuleInterface $module) use ($block): bool { |
|
2621 | + ->first(static function (ModuleInterface $module) use ($block) : bool { |
|
2622 | 2622 | return $module->name() === $block && $module->name() !== 'html'; |
2623 | 2623 | }); |
2624 | 2624 |
@@ -192,13 +192,13 @@ |
||
192 | 192 | if (strlen($match[1]) > strlen($match[2])) { |
193 | 193 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
194 | 194 | } |
195 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
195 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
196 | 196 | $view = 'year'; |
197 | 197 | } elseif (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
198 | 198 | // advanced-year "decade/century wildcard" |
199 | 199 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
200 | 200 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
201 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
201 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
202 | 202 | $view = 'year'; |
203 | 203 | } else { |
204 | 204 | if ($year < 0) { |
@@ -513,7 +513,7 @@ discard block |
||
513 | 513 | */ |
514 | 514 | private function applyFilter(array $facts, string $filterof, string $filtersx): array |
515 | 515 | { |
516 | - $filtered = []; |
|
516 | + $filtered = []; |
|
517 | 517 | $hundred_years_ago = Carbon::now()->subYears(100)->julianDay(); |
518 | 518 | foreach ($facts as $fact) { |
519 | 519 | $record = $fact->record(); |
@@ -586,7 +586,7 @@ discard block |
||
586 | 586 | $html = ''; |
587 | 587 | |
588 | 588 | foreach ($list as $id => $facts) { |
589 | - $tmp = GedcomRecord::getInstance($id, $tree); |
|
589 | + $tmp = GedcomRecord::getInstance($id, $tree); |
|
590 | 590 | $html .= $tag1 . '<a href="' . e($tmp->url()) . '">' . $tmp->fullName() . '</a> '; |
591 | 591 | $html .= '<div class="indent">' . $facts . '</div>' . $tag2; |
592 | 592 | } |
@@ -261,7 +261,7 @@ |
||
261 | 261 | |
262 | 262 | // Create a source, to indicate the source of the data. |
263 | 263 | $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . $base_url . "\n"; |
264 | - $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
264 | + $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
265 | 265 | if ($author !== null) { |
266 | 266 | $filetext .= '1 AUTH ' . $author->realName() . "\n"; |
267 | 267 | } |
@@ -1,4 +1,4 @@ |
||
1 | 1 | <?php return array ( |
2 | - '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | - '%j %F %Y' => '%F %j, %Y', |
|
2 | + '%H:%i:%s' => '%g:%i:%s %a', |
|
3 | + '%j %F %Y' => '%F %j, %Y', |
|
4 | 4 | ); |
@@ -1,4 +1,4 @@ |
||
1 | -<?php return array ( |
|
1 | +<?php return array( |
|
2 | 2 | '%H:%i:%s' => '%g:%i:%s %a', |
3 | 3 | '%j %F %Y' => '%F %j, %Y', |
4 | 4 | ); |