@@ -101,7 +101,7 @@ |
||
101 | 101 | $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values'); |
102 | 102 | $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values'); |
103 | 103 | $color_from = $color_from ?? $chart_color1; |
104 | - $color_to = $color_to ?? $chart_color2; |
|
104 | + $color_to = $color_to ?? $chart_color2; |
|
105 | 105 | |
106 | 106 | $data = [ |
107 | 107 | [ |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values'); |
102 | 102 | $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values'); |
103 | 103 | $color_from = $color_from ?? $chart_color1; |
104 | - $color_to = $color_to ?? $chart_color2; |
|
104 | + $color_to = $color_to ?? $chart_color2; |
|
105 | 105 | |
106 | 106 | $data = [ |
107 | 107 | [ |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $chart_color1 = (string) $this->theme->parameter('distribution-chart-no-values'); |
102 | 102 | $chart_color2 = (string) $this->theme->parameter('distribution-chart-high-values'); |
103 | 103 | $color_from = $color_from ?? $chart_color1; |
104 | - $color_to = $color_to ?? $chart_color2; |
|
104 | + $color_to = $color_to ?? $chart_color2; |
|
105 | 105 | |
106 | 106 | $data = [ |
107 | 107 | [ |
@@ -159,7 +159,7 @@ |
||
159 | 159 | $stream_factory = app(StreamFactoryInterface::class); |
160 | 160 | assert($stream_factory instanceof StreamFactoryInterface); |
161 | 161 | |
162 | - $http_stream = $stream_factory->createStreamFromFile($temp_zip_file); |
|
162 | + $http_stream = $stream_factory->createStreamFromFile($temp_zip_file); |
|
163 | 163 | $filename = addcslashes($download_filename, '"') . '.zip'; |
164 | 164 | |
165 | 165 | /** @var ResponseFactoryInterface $response_factory */ |
@@ -79,7 +79,7 @@ |
||
79 | 79 | ->select(['d_gid as id', 'd_year as year', 'd_fact AS fact', 'd_type AS type']) |
80 | 80 | ->where('d_file', '=', $this->tree->id()) |
81 | 81 | ->where('d_fact', '=', $fact) |
82 | - ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact): void { |
|
82 | + ->where('d_julianday1', '=', function (Builder $query) use ($operation, $fact) : void { |
|
83 | 83 | $query->selectRaw($operation . '(d_julianday1)') |
84 | 84 | ->from('dates') |
85 | 85 | ->where('d_file', '=', $this->tree->id()) |
@@ -402,7 +402,7 @@ |
||
402 | 402 | $NAME = $params['NAME'] ?? ''; |
403 | 403 | |
404 | 404 | if ($NAME !== '') { |
405 | - $newged .= "\n1 NAME " . $NAME; |
|
405 | + $newged .= "\n1 NAME " . $NAME; |
|
406 | 406 | $name_facts = [ |
407 | 407 | 'TYPE', |
408 | 408 | 'NPFX', |
@@ -583,7 +583,7 @@ discard block |
||
583 | 583 | for ($j = 0; $j < $ct; $j++) { |
584 | 584 | if (!str_contains($match[$j][1], '@')) { |
585 | 585 | $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2])); |
586 | - $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
586 | + $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
587 | 587 | } |
588 | 588 | } |
589 | 589 | // Find source for each fact |
@@ -601,7 +601,7 @@ discard block |
||
601 | 601 | } |
602 | 602 | $srec = substr($factrec, $spos1, $spos2 - $spos1); |
603 | 603 | $lt = preg_match_all("/$nlevel \w+/", $srec, $matches); |
604 | - $data .= '<div class="fact_SOUR">'; |
|
604 | + $data .= '<div class="fact_SOUR">'; |
|
605 | 605 | $id = 'collapse-' . Uuid::uuid4()->toString(); |
606 | 606 | $expanded = (bool) $tree->getPreference('EXPAND_SOURCES'); |
607 | 607 | if ($lt > 0) { |
@@ -64,7 +64,7 @@ |
||
64 | 64 | { |
65 | 65 | use ModuleListTrait; |
66 | 66 | |
67 | - protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
67 | + protected const ROUTE_URL = '/tree/{tree}/branches{/surname}'; |
|
68 | 68 | |
69 | 69 | /** @var ModuleService */ |
70 | 70 | protected $module_service; |
@@ -326,7 +326,8 @@ discard block |
||
326 | 326 | <li class="wt-initials-list-item d-flex"> |
327 | 327 | <?php if ($count > 0) : ?> |
328 | 328 | <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
329 | - <?php else : ?> |
|
329 | + <?php else { |
|
330 | + : ?> |
|
330 | 331 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
331 | 332 | |
332 | 333 | <?php endif ?> |
@@ -380,6 +381,7 @@ discard block |
||
380 | 381 | |
381 | 382 | if ($show === 'indi' || $show === 'surn') { |
382 | 383 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
384 | +} |
|
383 | 385 | if ($show === 'surn') { |
384 | 386 | // Show the surname list |
385 | 387 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |