@@ -73,7 +73,7 @@ |
||
| 73 | 73 | |
| 74 | 74 | $users = ['' => '']; |
| 75 | 75 | foreach ($this->user_service->all() as $user) { |
| 76 | - $user_name = $user->userName(); |
|
| 76 | + $user_name = $user->userName(); |
|
| 77 | 77 | $users[$user_name] = $user_name; |
| 78 | 78 | } |
| 79 | 79 | |
@@ -192,7 +192,7 @@ |
||
| 192 | 192 | '<div class="gedcom-data" dir="ltr">' . |
| 193 | 193 | preg_replace_callback( |
| 194 | 194 | '/@(' . Gedcom::REGEX_XREF . ')@/', |
| 195 | - static function (array $match) use ($tree): string { |
|
| 195 | + static function (array $match) use ($tree) : string { |
|
| 196 | 196 | $record = GedcomRecord::getInstance($match[1], $tree); |
| 197 | 197 | |
| 198 | 198 | return $record ? '<a href="' . e($record->url()) . '">' . $match[0] . '</a>' : $match[0]; |
@@ -41,7 +41,7 @@ |
||
| 41 | 41 | */ |
| 42 | 42 | public function handle(ServerRequestInterface $request): ResponseInterface |
| 43 | 43 | { |
| 44 | - $tree = $request->getQueryParams()['ged']; |
|
| 44 | + $tree = $request->getQueryParams()['ged']; |
|
| 45 | 45 | assert(is_string($tree)); |
| 46 | 46 | |
| 47 | 47 | $xref = $request->getQueryParams()['mid']; |
@@ -175,7 +175,7 @@ |
||
| 175 | 175 | 'tree' => $tree->name(), |
| 176 | 176 | 'show_all' => 'yes', |
| 177 | 177 | ]; |
| 178 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 178 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 179 | 179 | } |
| 180 | 180 | } elseif ($surname !== '') { |
| 181 | 181 | $alpha = $this->localization_service->initialLetter($surname, $locale); // so we can highlight the initial letter |
@@ -249,7 +249,8 @@ discard block |
||
| 249 | 249 | <li class="wt-initials-list-item d-flex"> |
| 250 | 250 | <?php if ($count > 0) : ?> |
| 251 | 251 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 252 | - <?php else : ?> |
|
| 252 | + <?php else { |
|
| 253 | + : ?> |
|
| 253 | 254 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 254 | 255 | |
| 255 | 256 | <?php endif ?> |
@@ -303,6 +304,7 @@ discard block |
||
| 303 | 304 | |
| 304 | 305 | if ($show === 'indi' || $show === 'surn') { |
| 305 | 306 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, $locale); |
| 307 | +} |
|
| 306 | 308 | if ($show === 'surn') { |
| 307 | 309 | // Show the surname list |
| 308 | 310 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -37,12 +37,12 @@ |
||
| 37 | 37 | class EditIndividualController extends AbstractEditController |
| 38 | 38 | { |
| 39 | 39 | /** |
| 40 | - * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | - * |
|
| 42 | - * @param ServerRequestInterface $request |
|
| 43 | - * |
|
| 44 | - * @return ResponseInterface |
|
| 45 | - */ |
|
| 40 | + * Add a child to an existing individual (creating a one-parent family). |
|
| 41 | + * |
|
| 42 | + * @param ServerRequestInterface $request |
|
| 43 | + * |
|
| 44 | + * @return ResponseInterface |
|
| 45 | + */ |
|
| 46 | 46 | public function addChild(ServerRequestInterface $request): ResponseInterface |
| 47 | 47 | { |
| 48 | 48 | $tree = $request->getAttribute('tree'); |
@@ -534,7 +534,7 @@ discard block |
||
| 534 | 534 | $tree = $request->getAttribute('tree'); |
| 535 | 535 | assert($tree instanceof Tree); |
| 536 | 536 | |
| 537 | - $xref = $request->getParsedBody()['xref']; |
|
| 537 | + $xref = $request->getParsedBody()['xref']; |
|
| 538 | 538 | |
| 539 | 539 | $individual = Individual::getInstance($xref, $tree); |
| 540 | 540 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | $family = Family::getInstance($famid, $tree); |
| 545 | 545 | $family = Auth::checkFamilyAccess($family, true); |
| 546 | 546 | |
| 547 | - $PEDI = $request->getParsedBody()['PEDI']; |
|
| 547 | + $PEDI = $request->getParsedBody()['PEDI']; |
|
| 548 | 548 | |
| 549 | 549 | // Replace any existing child->family link (we may be changing the PEDI); |
| 550 | 550 | $fact_id = ''; |
@@ -614,7 +614,7 @@ discard block |
||
| 614 | 614 | $tree = $request->getAttribute('tree'); |
| 615 | 615 | assert($tree instanceof Tree); |
| 616 | 616 | |
| 617 | - $xref = $request->getParsedBody()['xref']; |
|
| 617 | + $xref = $request->getParsedBody()['xref']; |
|
| 618 | 618 | |
| 619 | 619 | $individual = Individual::getInstance($xref, $tree); |
| 620 | 620 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | { |
| 33 | 33 | public const RECORD_TYPE = 'SOUR'; |
| 34 | 34 | |
| 35 | - protected const ROUTE_NAME = SourcePage::class; |
|
| 35 | + protected const ROUTE_NAME = SourcePage::class; |
|
| 36 | 36 | |
| 37 | 37 | /** |
| 38 | 38 | * A closure which will create a record from a database row. |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | $repository = Auth::checkRepositoryAccess($repository, false); |
| 83 | 83 | |
| 84 | 84 | // Redirect to correct xref/slug |
| 85 | - if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 85 | + if ($repository->xref() !== $xref || $request->getAttribute('slug') !== $repository->slug()) { |
|
| 86 | 86 | return redirect($repository->url()); |
| 87 | 87 | } |
| 88 | 88 | |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | // Turn each filename into a row for the table |
| 175 | 175 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
| 176 | 176 | |
| 177 | - $original_url = route('unused-media-thumbnail', [ |
|
| 177 | + $original_url = route('unused-media-thumbnail', [ |
|
| 178 | 178 | 'path' => $original, |
| 179 | 179 | 'w' => 100, |
| 180 | 180 | 'h' => 100, |