@@ -840,9 +840,9 @@ |
||
| 840 | 840 | } |
| 841 | 841 | |
| 842 | 842 | foreach ([ |
| 843 | - 'main' => $main_blocks, |
|
| 844 | - 'side' => $side_blocks, |
|
| 845 | - ] as $location => $updated_blocks) { |
|
| 843 | + 'main' => $main_blocks, |
|
| 844 | + 'side' => $side_blocks, |
|
| 845 | + ] as $location => $updated_blocks) { |
|
| 846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
| 847 | 847 | if (is_numeric($block_id)) { |
| 848 | 848 | // Updated block |
@@ -399,19 +399,19 @@ |
||
| 399 | 399 | private function faqsExist(Tree $tree, string $language): bool |
| 400 | 400 | { |
| 401 | 401 | return DB::table('block') |
| 402 | - ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 403 | - ->where('module_name', '=', $this->name()) |
|
| 404 | - ->where('setting_name', '=', 'languages') |
|
| 405 | - ->where(function (Builder $query) use ($tree): void { |
|
| 406 | - $query |
|
| 407 | - ->whereNull('gedcom_id') |
|
| 408 | - ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 409 | - }) |
|
| 410 | - ->select(['setting_value AS languages']) |
|
| 411 | - ->get() |
|
| 412 | - ->filter(function (stdClass $faq) use ($language): bool { |
|
| 413 | - return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 414 | - }) |
|
| 402 | + ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
| 403 | + ->where('module_name', '=', $this->name()) |
|
| 404 | + ->where('setting_name', '=', 'languages') |
|
| 405 | + ->where(function (Builder $query) use ($tree): void { |
|
| 406 | + $query |
|
| 407 | + ->whereNull('gedcom_id') |
|
| 408 | + ->orWhere('gedcom_id', '=', $tree->id()); |
|
| 409 | + }) |
|
| 410 | + ->select(['setting_value AS languages']) |
|
| 411 | + ->get() |
|
| 412 | + ->filter(function (stdClass $faq) use ($language): bool { |
|
| 413 | + return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
| 414 | + }) |
|
| 415 | 415 | ->isNotEmpty(); |
| 416 | 416 | } |
| 417 | 417 | } |
@@ -334,9 +334,11 @@ |
||
| 334 | 334 | 'fqpn', |
| 335 | 335 | ]; |
| 336 | 336 | |
| 337 | - if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) { // first choice is file on server |
|
| 337 | + if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) { |
|
| 338 | +// first choice is file on server |
|
| 338 | 339 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
| 339 | - } elseif ($request->files->has('localfile')) { // 2nd choice is local file |
|
| 340 | + } elseif ($request->files->has('localfile')) { |
|
| 341 | +// 2nd choice is local file |
|
| 340 | 342 | $filename = $request->files->get('localfile')->getPathName(); |
| 341 | 343 | } |
| 342 | 344 | |
@@ -102,9 +102,9 @@ |
||
| 102 | 102 | ->groupBy(['century', 'sex']); |
| 103 | 103 | |
| 104 | 104 | return $male->unionAll($female) |
| 105 | - ->orderBy('century') |
|
| 106 | - ->get() |
|
| 107 | - ->all(); |
|
| 105 | + ->orderBy('century') |
|
| 106 | + ->get() |
|
| 107 | + ->all(); |
|
| 108 | 108 | } |
| 109 | 109 | |
| 110 | 110 | /** |
@@ -233,7 +233,8 @@ discard block |
||
| 233 | 233 | <li class="wt-initials-list-item d-flex"> |
| 234 | 234 | <?php if ($count > 0) : ?> |
| 235 | 235 | <a href="<?= e(route('module', ['module' => $module, 'action' => $action, 'alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 236 | - <?php else : ?> |
|
| 236 | + <?php else { |
|
| 237 | + : ?> |
|
| 237 | 238 | <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 238 | 239 | |
| 239 | 240 | <?php endif ?> |
@@ -287,6 +288,7 @@ discard block |
||
| 287 | 288 | |
| 288 | 289 | if ($show === 'indi' || $show === 'surn') { |
| 289 | 290 | $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation()); |
| 291 | +} |
|
| 290 | 292 | if ($show === 'surn') { |
| 291 | 293 | // Show the surname list |
| 292 | 294 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -322,10 +322,10 @@ |
||
| 322 | 322 | } |
| 323 | 323 | // print gedcom ages |
| 324 | 324 | foreach ([ |
| 325 | - I18N::translate('Age') => $fact_age, |
|
| 326 | - I18N::translate('Husband') => $husb_age, |
|
| 327 | - I18N::translate('Wife') => $wife_age, |
|
| 328 | - ] as $label => $age) { |
|
| 325 | + I18N::translate('Age') => $fact_age, |
|
| 326 | + I18N::translate('Husband') => $husb_age, |
|
| 327 | + I18N::translate('Wife') => $wife_age, |
|
| 328 | + ] as $label => $age) { |
|
| 329 | 329 | if ($age !== '') { |
| 330 | 330 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
| 331 | 331 | } |
@@ -11,7 +11,8 @@ |
||
| 11 | 11 | /** |
| 12 | 12 | * An example module to modify PHP and database configuration. |
| 13 | 13 | */ |
| 14 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
| 14 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
| 15 | +{ |
|
| 15 | 16 | use ModuleCustomTrait; |
| 16 | 17 | |
| 17 | 18 | /** @var ServerCheckService */ |
@@ -13,7 +13,8 @@ |
||
| 13 | 13 | /** |
| 14 | 14 | * Example module |
| 15 | 15 | */ |
| 16 | -return new class extends AbstractModule implements ModuleCustomInterface { |
|
| 16 | +return new class extends AbstractModule implements ModuleCustomInterface |
|
| 17 | +{ |
|
| 17 | 18 | use ModuleCustomTrait; |
| 18 | 19 | |
| 19 | 20 | /** |
@@ -20,7 +20,8 @@ |
||
| 20 | 20 | * Example theme. Here we are extending an existing theme. |
| 21 | 21 | * Instead, you could extend AbstractModule and implement ModuleThemeInterface directly. |
| 22 | 22 | */ |
| 23 | -return new class extends MinimalTheme implements ModuleCustomInterface { |
|
| 23 | +return new class extends MinimalTheme implements ModuleCustomInterface |
|
| 24 | +{ |
|
| 24 | 25 | use ModuleCustomTrait; |
| 25 | 26 | |
| 26 | 27 | /** |