@@ -345,10 +345,10 @@ |
||
| 345 | 345 | } |
| 346 | 346 | // print gedcom ages |
| 347 | 347 | foreach ([ |
| 348 | - I18N::translate('Age') => $fact_age, |
|
| 349 | - I18N::translate('Husband') => $husb_age, |
|
| 350 | - I18N::translate('Wife') => $wife_age, |
|
| 351 | - ] as $label => $age) { |
|
| 348 | + I18N::translate('Age') => $fact_age, |
|
| 349 | + I18N::translate('Husband') => $husb_age, |
|
| 350 | + I18N::translate('Wife') => $wife_age, |
|
| 351 | + ] as $label => $age) { |
|
| 352 | 352 | if ($age != '') { |
| 353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
| 354 | 354 | } |
@@ -224,10 +224,10 @@ |
||
| 224 | 224 | $src = $this->imageUrl($width, $height, $fit); |
| 225 | 225 | $srcset = []; |
| 226 | 226 | foreach ([ |
| 227 | - 2, |
|
| 228 | - 3, |
|
| 229 | - 4, |
|
| 230 | - ] as $x) { |
|
| 227 | + 2, |
|
| 228 | + 3, |
|
| 229 | + 4, |
|
| 230 | + ] as $x) { |
|
| 231 | 231 | $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x'; |
| 232 | 232 | } |
| 233 | 233 | } |
@@ -342,9 +342,11 @@ |
||
| 342 | 342 | 'fqpn', |
| 343 | 343 | ]; |
| 344 | 344 | |
| 345 | - if ($serverfile !== '') { // first choice is file on server |
|
| 345 | + if ($serverfile !== '') { |
|
| 346 | +// first choice is file on server |
|
| 346 | 347 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
| 347 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
| 348 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
| 349 | +// 2nd choice is local file |
|
| 348 | 350 | $filename = $_FILES['localfile']['tmp_name']; |
| 349 | 351 | } |
| 350 | 352 | |
@@ -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 |
@@ -240,7 +240,7 @@ |
||
| 240 | 240 | // Link to send email to other users. |
| 241 | 241 | if ($user_id != $user->getUserId()) { |
| 242 | 242 | $datum[4] = '<a href="' . e(route('message', ['to' => $datum[2], |
| 243 | - 'url' => route('admin-users'), |
|
| 243 | + 'url' => route('admin-users'), |
|
| 244 | 244 | ])) . '">' . $datum[4] . '</a>'; |
| 245 | 245 | } |
| 246 | 246 | |
@@ -327,9 +327,9 @@ |
||
| 327 | 327 | |
| 328 | 328 | // Now fetch these anniversaries |
| 329 | 329 | foreach ([ |
| 330 | - 'INDI' => $ind_sql . $where . $order_by, |
|
| 331 | - 'FAM' => $fam_sql . $where . $order_by, |
|
| 332 | - ] as $type => $sql) { |
|
| 330 | + 'INDI' => $ind_sql . $where . $order_by, |
|
| 331 | + 'FAM' => $fam_sql . $where . $order_by, |
|
| 332 | + ] as $type => $sql) { |
|
| 333 | 333 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
| 334 | 334 | foreach ($rows as $row) { |
| 335 | 335 | if ($type === 'INDI') { |
@@ -1016,7 +1016,7 @@ discard block |
||
| 1016 | 1016 | I18N::translate('Females') . ' - ' . $per_f . '|' . |
| 1017 | 1017 | I18N::translate('Males') . ' - ' . $per_m; |
| 1018 | 1018 | $chart_title = I18N::translate('Males') . ' - ' . $per_m . I18N::$list_separator . |
| 1019 | - I18N::translate('Females') . ' - ' . $per_f; |
|
| 1019 | + I18N::translate('Females') . ' - ' . $per_f; |
|
| 1020 | 1020 | |
| 1021 | 1021 | return "<img src=\"https://chart.googleapis.com/chart?cht=p3&chd=e:{$chd}&chs={$size}&chco={$color_female},{$color_male}&chf=bg,s,ffffff00&chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />'; |
| 1022 | 1022 | } |
@@ -1132,7 +1132,7 @@ discard block |
||
| 1132 | 1132 | I18N::translate('Living') . ' - ' . $per_l . '|' . |
| 1133 | 1133 | I18N::translate('Dead') . ' - ' . $per_d . '|'; |
| 1134 | 1134 | $chart_title = I18N::translate('Living') . ' - ' . $per_l . I18N::$list_separator . |
| 1135 | - I18N::translate('Dead') . ' - ' . $per_d; |
|
| 1135 | + I18N::translate('Dead') . ' - ' . $per_d; |
|
| 1136 | 1136 | |
| 1137 | 1137 | return "<img src=\"https://chart.googleapis.com/chart?cht=p3&chd=e:{$chd}&chs={$size}&chco={$color_living},{$color_dead}&chf=bg,s,ffffff00&chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />'; |
| 1138 | 1138 | } |
@@ -378,8 +378,8 @@ |
||
| 378 | 378 | $edit_links = FontAwesome::linkIcon('edit', I18N::translate('Edit the gender'), [ |
| 379 | 379 | 'class' => 'btn btn-link', |
| 380 | 380 | 'href' => route('edit-fact', ['xref' => $individual->xref(), |
| 381 | - 'fact_id' => $fact->id(), |
|
| 382 | - 'ged' => $individual->tree()->name(), |
|
| 381 | + 'fact_id' => $fact->id(), |
|
| 382 | + 'ged' => $individual->tree()->name(), |
|
| 383 | 383 | ]), |
| 384 | 384 | ]); |
| 385 | 385 | } else { |
@@ -216,7 +216,8 @@ discard block |
||
| 216 | 216 | <li class="wt-initials-list-item d-flex"> |
| 217 | 217 | <?php if ($count > 0) : ?> |
| 218 | 218 | <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 219 | - <?php else : ?> |
|
| 219 | + <?php else { |
|
| 220 | + : ?> |
|
| 220 | 221 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 221 | 222 | |
| 222 | 223 | <?php endif ?> |
@@ -270,6 +271,7 @@ discard block |
||
| 270 | 271 | |
| 271 | 272 | if ($show === 'indi' || $show === 'surn') { |
| 272 | 273 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families); |
| 274 | +} |
|
| 273 | 275 | if ($show === 'surn') { |
| 274 | 276 | // Show the surname list |
| 275 | 277 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |