@@ -299,6 +299,6 @@ |
||
299 | 299 | */ |
300 | 300 | private function dmyOrder(): string |
301 | 301 | { |
302 | - return preg_replace('/[^DMY]/', '', str_replace(['J', 'F',], ['D', 'M',], I18N::dateFormat())); |
|
302 | + return preg_replace('/[^DMY]/', '', str_replace(['J', 'F', ], ['D', 'M', ], I18N::dateFormat())); |
|
303 | 303 | } |
304 | 304 | } |
@@ -188,7 +188,7 @@ |
||
188 | 188 | $params['tree'] = $media_file->media()->tree()->name(); |
189 | 189 | $this->glideSignature()->validateRequest('', $params); |
190 | 190 | |
191 | - $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
191 | + $path = $media_file->media()->tree()->getPreference('MEDIA_DIRECTORY', 'media/') . $media_file->filename(); |
|
192 | 192 | $folder = dirname($path); |
193 | 193 | |
194 | 194 | $cache_path = 'thumbnail-cache/' . md5($folder); |
@@ -370,10 +370,10 @@ |
||
370 | 370 | } |
371 | 371 | |
372 | 372 | /** |
373 | - * @param ServerRequestInterface $request |
|
374 | - * |
|
375 | - * @return ResponseInterface |
|
376 | - */ |
|
373 | + * @param ServerRequestInterface $request |
|
374 | + * |
|
375 | + * @return ResponseInterface |
|
376 | + */ |
|
377 | 377 | public function duplicates(ServerRequestInterface $request): ResponseInterface |
378 | 378 | { |
379 | 379 | $tree = $request->getAttribute('tree'); |
@@ -240,7 +240,8 @@ discard block |
||
240 | 240 | <li class="wt-initials-list-item d-flex"> |
241 | 241 | <?php if ($count > 0) : ?> |
242 | 242 | <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> |
243 | - <?php else : ?> |
|
243 | + <?php else { |
|
244 | + : ?> |
|
244 | 245 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
245 | 246 | |
246 | 247 | <?php endif ?> |
@@ -294,6 +295,7 @@ discard block |
||
294 | 295 | |
295 | 296 | if ($show === 'indi' || $show === 'surn') { |
296 | 297 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
298 | +} |
|
297 | 299 | if ($show === 'surn') { |
298 | 300 | // Show the surname list |
299 | 301 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -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); // so we can highlight the initial letter |
@@ -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'); |
@@ -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), new InvalidArgumentException()); |
46 | 46 | |
47 | 47 | $xref = $request->getQueryParams()['mid']; |
@@ -828,7 +828,7 @@ |
||
828 | 828 | // Until this can be re-designed, we need this assertion to help static analysis tools. |
829 | 829 | assert($this->current_element instanceof ReportBaseElement, new LogicException()); |
830 | 830 | |
831 | - $this->wt_report = array_pop($this->wt_report_stack); |
|
831 | + $this->wt_report = array_pop($this->wt_report_stack); |
|
832 | 832 | $this->wt_report->addElement($this->current_element); |
833 | 833 | } |
834 | 834 |
@@ -301,7 +301,7 @@ |
||
301 | 301 | if ($request->getAttribute('route') === 'tree-page') { |
302 | 302 | $tree = $request->getAttribute('tree'); |
303 | 303 | assert($tree instanceof Tree, new InvalidArgumentException()); |
304 | - $redirect = route('user-page', ['tree' => $tree->name()]); |
|
304 | + $redirect = route('user-page', ['tree' => $tree->name()]); |
|
305 | 305 | } |
306 | 306 | |
307 | 307 | // Stay on the same tree page |
@@ -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); |