@@ -78,7 +78,7 @@ |
||
| 78 | 78 | public function getIndividuals(Tree $tree, string $request): string |
| 79 | 79 | { |
| 80 | 80 | $json_requests = explode(';', $request); |
| 81 | - $r = []; |
|
| 81 | + $r = []; |
|
| 82 | 82 | foreach ($json_requests as $json_request) { |
| 83 | 83 | $firstLetter = substr($json_request, 0, 1); |
| 84 | 84 | $json_request = substr($json_request, 1); |
@@ -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]; |
@@ -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'); |
@@ -545,7 +545,7 @@ discard block |
||
| 545 | 545 | $tree = $request->getAttribute('tree'); |
| 546 | 546 | assert($tree instanceof Tree); |
| 547 | 547 | |
| 548 | - $xref = $request->getQueryParams()['xref']; |
|
| 548 | + $xref = $request->getQueryParams()['xref']; |
|
| 549 | 549 | |
| 550 | 550 | $individual = Individual::getInstance($xref, $tree); |
| 551 | 551 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -557,7 +557,7 @@ discard block |
||
| 557 | 557 | $family = Family::getInstance($famid, $tree); |
| 558 | 558 | $family = Auth::checkFamilyAccess($family, true); |
| 559 | 559 | |
| 560 | - $PEDI = $params['PEDI']; |
|
| 560 | + $PEDI = $params['PEDI']; |
|
| 561 | 561 | |
| 562 | 562 | // Replace any existing child->family link (we may be changing the PEDI); |
| 563 | 563 | $fact_id = ''; |
@@ -629,7 +629,7 @@ discard block |
||
| 629 | 629 | $tree = $request->getAttribute('tree'); |
| 630 | 630 | assert($tree instanceof Tree); |
| 631 | 631 | |
| 632 | - $xref = $request->getQueryParams()['xref']; |
|
| 632 | + $xref = $request->getQueryParams()['xref']; |
|
| 633 | 633 | |
| 634 | 634 | $individual = Individual::getInstance($xref, $tree); |
| 635 | 635 | $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. |
@@ -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, |
@@ -312,7 +312,7 @@ |
||
| 312 | 312 | $title = I18N::translate('Edit the story') . ' — ' . e($tree->title()); |
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - $individual = Individual::getInstance($xref, $tree); |
|
| 315 | + $individual = Individual::getInstance($xref, $tree); |
|
| 316 | 316 | |
| 317 | 317 | return $this->viewResponse('modules/stories/edit', [ |
| 318 | 318 | 'block_id' => $block_id, |
@@ -172,7 +172,7 @@ |
||
| 172 | 172 | 'tree' => $tree->name(), |
| 173 | 173 | 'show_all' => 'yes', |
| 174 | 174 | ]; |
| 175 | - $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 175 | + $show = $request->getQueryParams()['show'] ?? 'surn'; |
|
| 176 | 176 | } |
| 177 | 177 | } elseif ($surname !== '') { |
| 178 | 178 | $alpha = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter |
@@ -246,7 +246,8 @@ discard block |
||
| 246 | 246 | <li class="wt-initials-list-item d-flex"> |
| 247 | 247 | <?php if ($count > 0) : ?> |
| 248 | 248 | <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> |
| 249 | - <?php else : ?> |
|
| 249 | + <?php else { |
|
| 250 | + : ?> |
|
| 250 | 251 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 251 | 252 | |
| 252 | 253 | <?php endif ?> |
@@ -300,6 +301,7 @@ discard block |
||
| 300 | 301 | |
| 301 | 302 | if ($show === 'indi' || $show === 'surn') { |
| 302 | 303 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, I18N::locale()); |
| 304 | +} |
|
| 303 | 305 | if ($show === 'surn') { |
| 304 | 306 | // Show the surname list |
| 305 | 307 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -75,7 +75,7 @@ |
||
| 75 | 75 | |
| 76 | 76 | $query = DB::table('hit_counter') |
| 77 | 77 | ->where('gedcom_id', '=', $tree->id()) |
| 78 | - ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php']) |
|
| 78 | + ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php']) |
|
| 79 | 79 | ->orderByDesc('page_count'); |
| 80 | 80 | |
| 81 | 81 | $results = []; |