@@ -74,7 +74,7 @@ |
||
74 | 74 | } |
75 | 75 | |
76 | 76 | if (preg_match('/^(\d+) B\.C\.$/', $year, $match)) { |
77 | - return - (int) $match[1]; |
|
77 | + return -(int) $match[1]; |
|
78 | 78 | } |
79 | 79 | |
80 | 80 | return (int) $year; |
@@ -224,7 +224,7 @@ |
||
224 | 224 | public static function updateSchema($namespace, $schema_name, $target_version): bool |
225 | 225 | { |
226 | 226 | try { |
227 | - $current_version = (int)Site::getPreference($schema_name); |
|
227 | + $current_version = (int) Site::getPreference($schema_name); |
|
228 | 228 | } catch (PDOException $ex) { |
229 | 229 | DebugBar::addThrowable($ex); |
230 | 230 |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | */ |
231 | 231 | public function changesLogData(Request $request): Response |
232 | 232 | { |
233 | - list($select, , $where, $args1) = $this->changesQuery($request); |
|
233 | + list($select,, $where, $args1) = $this->changesQuery($request); |
|
234 | 234 | list($order_by, $limit, $args2) = $this->dataTablesPagination($request); |
235 | 235 | |
236 | 236 | $rows = Database::prepare( |
@@ -306,7 +306,7 @@ discard block |
||
306 | 306 | */ |
307 | 307 | public function changesLogDownload(Request $request): Response |
308 | 308 | { |
309 | - list($select, , $where, $args) = $this->changesQuery($request); |
|
309 | + list($select,, $where, $args) = $this->changesQuery($request); |
|
310 | 310 | |
311 | 311 | $rows = Database::prepare($select . $where)->execute($args)->fetchAll(); |
312 | 312 |
@@ -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) ?>"> |
@@ -107,7 +107,7 @@ |
||
107 | 107 | <?php foreach ($tabs as $tab) : ?> |
108 | 108 | <div id="<?= $tab->getName() ?>" class="tab-pane fade wt-ajax-load" role="tabpanel"><?php if (!$tab->canLoadAjax()) : |
109 | 109 | ?><?= $tab->getTabContent($individual) ?><?php |
110 | - endif ?></div> |
|
110 | + endif ?></div> |
|
111 | 111 | <?php endforeach ?> |
112 | 112 | </div> |
113 | 113 | </div> |
@@ -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 | } |
@@ -5374,7 +5374,7 @@ |
||
5374 | 5374 | foreach ($rows as $row) { |
5375 | 5375 | $family = Family::getInstance($row->id, $this->tree); |
5376 | 5376 | if ($family->canShow()) { |
5377 | - $total = (int) $row->tot; |
|
5377 | + $total = (int) $row->tot; |
|
5378 | 5378 | |
5379 | 5379 | if ($type === 'list') { |
5380 | 5380 | $top10[] = '<li><a href="' . e($family->url()) . '">' . $family->getFullName() . '</a> - ' . I18N::plural('%s grandchild', '%s grandchildren', $total, I18N::number($total)); |
@@ -215,7 +215,7 @@ |
||
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 | <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span> |
220 | 220 | |
221 | 221 | <?php endif ?> |
@@ -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')) { |