@@ -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 |
@@ -45,7 +45,8 @@ discard block |
||
45 | 45 | <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->d, 'month' => $m, 'year' => $cal_date->y, 'filterev' => $filterev, 'filterof' => $filterof, 'filtersx' => $filtersx, 'view' => 'month', 'ged' => $tree->getName()])) ?>" rel="nofollow"> |
46 | 46 | <?php if ($m === $cal_month): ?> |
47 | 47 | <span class="error"><?= e($month_name) ?></span> |
48 | - <?php else: ?> |
|
48 | + <?php else { |
|
49 | + : ?> |
|
49 | 50 | <?= e($month_name) ?> |
50 | 51 | <?php endif ?> |
51 | 52 | </a> | |
@@ -160,6 +161,7 @@ discard block |
||
160 | 161 | <td class="topbottombar width50"> |
161 | 162 | <?php |
162 | 163 | $n = 0; |
164 | +} |
|
163 | 165 | foreach (Date::calendarNames() as $newcal => $cal_name) { |
164 | 166 | $tmp = $cal_date->convertToCalendar($newcal); |
165 | 167 | if ($tmp->inValidRange()) { |