@@ -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 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | { |
| 99 | 99 | $url = $request->get('url', ''); |
| 100 | 100 | $xref = $request->get('xref', ''); |
| 101 | - $change_id = (int)$request->get('change_id'); |
|
| 101 | + $change_id = (int) $request->get('change_id'); |
|
| 102 | 102 | |
| 103 | 103 | $changes = Database::prepare( |
| 104 | 104 | "SELECT change_id, xref, old_gedcom, new_gedcom" . |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | { |
| 205 | 205 | $url = $request->get('url', ''); |
| 206 | 206 | $xref = $request->get('xref', ''); |
| 207 | - $change_id = (int)$request->get('change_id'); |
|
| 207 | + $change_id = (int) $request->get('change_id'); |
|
| 208 | 208 | |
| 209 | 209 | // Reject a change, and subsequent changes to the same record |
| 210 | 210 | Database::prepare( |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | { |
| 74 | 74 | $latest_version = $this->fetchLatestVersion(); |
| 75 | 75 | |
| 76 | - list(, , $url) = explode('|', $latest_version . '||'); |
|
| 76 | + list(,, $url) = explode('|', $latest_version . '||'); |
|
| 77 | 77 | |
| 78 | 78 | return $url; |
| 79 | 79 | } |
@@ -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) ?>"> |