@@ -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'); |
@@ -537,7 +537,7 @@ discard block |
||
| 537 | 537 | $tree = $request->getAttribute('tree'); |
| 538 | 538 | assert($tree instanceof Tree); |
| 539 | 539 | |
| 540 | - $xref = $request->getQueryParams()['xref']; |
|
| 540 | + $xref = $request->getQueryParams()['xref']; |
|
| 541 | 541 | |
| 542 | 542 | $individual = Individual::getInstance($xref, $tree); |
| 543 | 543 | $individual = Auth::checkIndividualAccess($individual, true); |
@@ -547,7 +547,7 @@ discard block |
||
| 547 | 547 | $family = Family::getInstance($famid, $tree); |
| 548 | 548 | $family = Auth::checkFamilyAccess($family, true); |
| 549 | 549 | |
| 550 | - $PEDI = $request->getParsedBody()['PEDI']; |
|
| 550 | + $PEDI = $request->getParsedBody()['PEDI']; |
|
| 551 | 551 | |
| 552 | 552 | // Replace any existing child->family link (we may be changing the PEDI); |
| 553 | 553 | $fact_id = ''; |
@@ -619,7 +619,7 @@ discard block |
||
| 619 | 619 | $tree = $request->getAttribute('tree'); |
| 620 | 620 | assert($tree instanceof Tree); |
| 621 | 621 | |
| 622 | - $xref = $request->getQueryParams()['xref']; |
|
| 622 | + $xref = $request->getQueryParams()['xref']; |
|
| 623 | 623 | |
| 624 | 624 | $individual = Individual::getInstance($xref, $tree); |
| 625 | 625 | $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, |
@@ -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 = []; |
@@ -80,7 +80,7 @@ |
||
| 80 | 80 | $sizePostMax = $this->parseIniFileSize(ini_get('post_max_size')); |
| 81 | 81 | $sizeUploadMax = $this->parseIniFileSize(ini_get('upload_max_filesize')); |
| 82 | 82 | |
| 83 | - $bytes = min($sizePostMax, $sizeUploadMax); |
|
| 83 | + $bytes = min($sizePostMax, $sizeUploadMax); |
|
| 84 | 84 | $kb = intdiv($bytes + 1023, 1024); |
| 85 | 85 | |
| 86 | 86 | return I18N::translate('%s KB', I18N::number($kb)); |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | // The system files are always in this location. |
| 67 | 67 | // It is also the default location of user data, such as media and GEDCOM files. |
| 68 | 68 | // The user files could be anywhere supported by Flysystem. |
| 69 | - public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
| 69 | + public const DATA_DIR = self::ROOT_DIR . 'data/'; |
|
| 70 | 70 | |
| 71 | 71 | // Location of the file containing the database connection details. |
| 72 | 72 | public const CONFIG_FILE = self::DATA_DIR . 'config.ini.php'; |