@@ -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 | |
@@ -30,7 +30,8 @@ discard block |
||
| 30 | 30 | <?= /* I18N: %s is a version number */ |
| 31 | 31 | I18N::translate('Upgrade to webtrees %s.', e($latest_version)) ?> |
| 32 | 32 | </a> |
| 33 | - <?php else : ?> |
|
| 33 | + <?php else { |
|
| 34 | + : ?> |
|
| 34 | 35 | <?= I18N::translate('This is the latest version of webtrees. No upgrade is available.') ?> |
| 35 | 36 | <?php endif ?> |
| 36 | 37 | </p> |
@@ -134,7 +135,9 @@ discard block |
||
| 134 | 135 | 'repositories' => $repositories, |
| 135 | 136 | 'media' => $media, |
| 136 | 137 | 'notes' => $notes, |
| 137 | - ]); ?> |
|
| 138 | + ]); |
|
| 139 | +} |
|
| 140 | +?> |
|
| 138 | 141 | </tbody> |
| 139 | 142 | <tfoot> |
| 140 | 143 | <tr> |
@@ -3,6 +3,8 @@ |
||
| 3 | 3 | |
| 4 | 4 | <?php if ($individual === null) : ?> |
| 5 | 5 | <?= FontAwesome::decorativeIcon($class) ?> |
| 6 | -<?php else : ?> |
|
| 6 | +<?php else { |
|
| 7 | + : ?> |
|
| 7 | 8 | <?= FontAwesome::linkIcon($class, I18N::translate('Compact tree of %s', strip_tags($individual->getFullName())), ['href' => route('compact-tree', ['xref' => $individual->getXref(), 'ged' => $individual->getTree()->getName()])]) ?> |
| 8 | 9 | <?php endif; |
| 10 | +} |
|
@@ -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) ?>"> |
@@ -215,7 +215,8 @@ discard block |
||
| 215 | 215 | <li class="wt-initials-list-item"> |
| 216 | 216 | <?php if ($count > 0): ?> |
| 217 | 217 | <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->getName()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : ''?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a> |
| 218 | - <?php else: ?> |
|
| 218 | + <?php else { |
|
| 219 | + : ?> |
|
| 219 | 220 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
| 220 | 221 | |
| 221 | 222 | <?php endif ?> |
@@ -269,6 +270,7 @@ discard block |
||
| 269 | 270 | |
| 270 | 271 | if ($show === 'indi' || $show === 'surn') { |
| 271 | 272 | $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families); |
| 273 | +} |
|
| 272 | 274 | if ($show === 'surn') { |
| 273 | 275 | // Show the surname list |
| 274 | 276 | switch ($tree->getPreference('SURNAME_LIST_STYLE')) { |
@@ -45,7 +45,8 @@ discard block |
||
| 45 | 45 | <a href="<?= e(route('calendar', ['cal' => $cal, 'day' => $cal_date->day(), 'month' => $m, 'year' => $cal_date->year(), '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()) { |