@@ -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')) { |
@@ -53,7 +53,7 @@ |
||
53 | 53 | */ |
54 | 54 | public function handle(ServerRequestInterface $request): ResponseInterface |
55 | 55 | { |
56 | - $place_id = (int) $request->getQueryParams()['place_id']; |
|
56 | + $place_id = (int) $request->getQueryParams()['place_id']; |
|
57 | 57 | |
58 | 58 | $place = $this->map_data_service->findById($place_id); |
59 | 59 | $parent = $place->parent(); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | public function __construct(GedcomService $gedcom_service) |
89 | 89 | { |
90 | - $this->gedcom_service = $gedcom_service; |
|
90 | + $this->gedcom_service = $gedcom_service; |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
@@ -161,13 +161,13 @@ discard block |
||
161 | 161 | |
162 | 162 | if ($place_id === 0) { |
163 | 163 | $breadcrumbs[] = I18N::translate('Add'); |
164 | - $title .= ' — ' . I18N::translate('Add'); |
|
164 | + $title .= ' — ' . I18N::translate('Add'); |
|
165 | 165 | $latitude = 0.0; |
166 | 166 | $longitude = 0.0; |
167 | 167 | $map_bounds = $parent->boundingRectangle(); |
168 | 168 | } else { |
169 | 169 | $breadcrumbs[] = I18N::translate('Edit'); |
170 | - $title .= ' — ' . I18N::translate('Edit'); |
|
170 | + $title .= ' — ' . I18N::translate('Edit'); |
|
171 | 171 | $latitude = $location->latitude(); |
172 | 172 | $longitude = $location->longitude(); |
173 | 173 | $map_bounds = $location->boundingRectangle(); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | use ModuleChartTrait; |
48 | 48 | |
49 | - protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
49 | + protected const ROUTE_URL = '/tree/{tree}/timeline-{scale}'; |
|
50 | 50 | |
51 | 51 | // Defaults |
52 | 52 | protected const DEFAULT_SCALE = 10; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | '_TODO', |
68 | 68 | 'CHAN', |
69 | 69 | ]; |
70 | - protected const BHEIGHT = 30; |
|
70 | + protected const BHEIGHT = 30; |
|
71 | 71 | |
72 | 72 | // Box height |
73 | 73 | |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | |
153 | 153 | $params = (array) $request->getParsedBody(); |
154 | 154 | |
155 | - $add = $params['add'] ?? ''; |
|
155 | + $add = $params['add'] ?? ''; |
|
156 | 156 | |
157 | 157 | Auth::checkComponentAccess($this, ModuleChartInterface::class, $tree, $user); |
158 | 158 |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | $create_form = ''; |
273 | 273 | foreach ($media_trees as $media_tree => $media_directory) { |
274 | 274 | if (str_starts_with($row[0], $media_directory)) { |
275 | - $tmp = substr($row[0], strlen($media_directory)); |
|
275 | + $tmp = substr($row[0], strlen($media_directory)); |
|
276 | 276 | $create_form .= |
277 | 277 | '<p><a href="#" data-toggle="modal" data-backdrop="static" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>'; |
278 | 278 | } |
@@ -366,8 +366,8 @@ discard block |
||
366 | 366 | try { |
367 | 367 | // This will work for local filesystems. For remote filesystems, we will |
368 | 368 | // need to copy the file locally to work out the image size. |
369 | - $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
370 | - $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
369 | + $imgsize = getimagesize(Webtrees::DATA_DIR . $file); |
|
370 | + $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>'; |
|
371 | 371 | /* I18N: image dimensions, width × height */ |
372 | 372 | $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>'; |
373 | 373 | } catch (Throwable $ex) { |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function find($user_id): ?User |
54 | 54 | { |
55 | - return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id): ?User { |
|
55 | + return Registry::cache()->array()->remember('user-' . $user_id, static function () use ($user_id) : ?User { |
|
56 | 56 | return DB::table('user') |
57 | 57 | ->where('user_id', '=', $user_id) |
58 | 58 | ->get() |