@@ -12,7 +12,8 @@ discard block |
||
12 | 12 | <th> |
13 | 13 | <?php if ($route == 'family-list'):?> |
14 | 14 | <?= I18N::translate('Spouses') ?> |
15 | - <?php else: ?> |
|
15 | + <?php else { |
|
16 | + : ?> |
|
16 | 17 | <?= I18N::translate('Individuals') ?> |
17 | 18 | <?php endif ?> |
18 | 19 | </th> |
@@ -43,7 +44,9 @@ discard block |
||
43 | 44 | <?php endforeach ?> |
44 | 45 | </td> |
45 | 46 | |
46 | - <td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); }, $surns)) ?>"> |
|
47 | + <td class="text-center" data-sort="<?= array_sum(array_map(function(array $x) { return count($x); |
|
48 | +} |
|
49 | +}, $surns)) ?>"> |
|
47 | 50 | <?php foreach ($surns as $indis): ?> |
48 | 51 | <?= I18N::number(count($indis)) ?> |
49 | 52 | <br> |
@@ -319,8 +319,11 @@ |
||
319 | 319 | <?php if (!isset($unique_indis[$individual->getXref()]) && $age_at_death >= 0 && $age_at_death <= $max_age): ?> |
320 | 320 | <?php $deat_by_age[$age_at_death] .= $individual->getSex(); ?> |
321 | 321 | <?php endif ?> |
322 | - <?php else: ?> |
|
323 | - <?php $age_at_death = ''; ?> |
|
322 | + <?php else { |
|
323 | + : ?> |
|
324 | + <?php $age_at_death = ''; |
|
325 | +} |
|
326 | +?> |
|
324 | 327 | <?php $age_at_death_sort = PHP_INT_MAX; ?> |
325 | 328 | <?php endif ?> |
326 | 329 | <td class="center" data-sort="<?= e($age_at_death_sort) ?>"> |
@@ -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 |
@@ -826,7 +826,8 @@ |
||
826 | 826 | * |
827 | 827 | * @return int|string |
828 | 828 | */ |
829 | - private function findAxisEntry($value, $axis) { |
|
829 | + private function findAxisEntry($value, $axis) |
|
830 | + { |
|
830 | 831 | if (is_numeric($value)) { |
831 | 832 | $value = (int) $value; |
832 | 833 |