@@ -235,7 +235,8 @@ discard block |
||
| 235 | 235 | <?php // Reset - otherwise we might "undo all changes", which refreshes the ?> |
| 236 | 236 | <?php // page, which makes them all again! ?> |
| 237 | 237 | <script>reset_reload();</script> |
| 238 | - <?php else: ?> |
|
| 238 | + <?php else { |
|
| 239 | + : ?> |
|
| 239 | 240 | <hr> |
| 240 | 241 | <div id="batch_update2" class="col-sm-12"> |
| 241 | 242 | <?php if ($this->curr_xref): ?> |
@@ -273,6 +274,7 @@ discard block |
||
| 273 | 274 | foreach (array_keys($this->all_xrefs) as $key) { |
| 274 | 275 | if ($key > $xref) { |
| 275 | 276 | $record = self::getLatestRecord($key, $this->all_xrefs[$key]); |
| 277 | +} |
|
| 276 | 278 | if ($this->PLUGIN->doesRecordNeedUpdate($key, $record)) { |
| 277 | 279 | return $key; |
| 278 | 280 | } |
@@ -3,9 +3,12 @@ |
||
| 3 | 3 | |
| 4 | 4 | <?php if ($summary !== ''): ?> |
| 5 | 5 | <span class="details_label"><?= $summary ?></span> |
| 6 | -<?php else: ?> |
|
| 6 | +<?php else { |
|
| 7 | + : ?> |
|
| 7 | 8 | <?php foreach ($facts as $fact): ?> |
| 8 | - <?php $record = $fact->getParent(); ?> |
|
| 9 | + <?php $record = $fact->getParent(); |
|
| 10 | +} |
|
| 11 | +?> |
|
| 9 | 12 | <a href="<?= e($record->url()) ?>" class="list_item name2"> |
| 10 | 13 | <?= $record->getFullName() ?> |
| 11 | 14 | </a> |
@@ -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> |
@@ -1067,9 +1067,11 @@ discard block |
||
| 1067 | 1067 | $delimiter = ''; |
| 1068 | 1068 | $field_names = ['pl_level', 'pl_long', 'pl_lati', 'pl_zoom', 'pl_icon', 'fqpn']; |
| 1069 | 1069 | |
| 1070 | - if ($serverfile !== '') { // first choice is file on server |
|
| 1070 | + if ($serverfile !== '') { |
|
| 1071 | +// first choice is file on server |
|
| 1071 | 1072 | $filename = WT_MODULES_DIR . $this->getName() . '/extra/' . $serverfile; |
| 1072 | - } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file |
|
| 1073 | + } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { |
|
| 1074 | +// 2nd choice is local file |
|
| 1073 | 1075 | $filename = $_FILES['localfile']['tmp_name']; |
| 1074 | 1076 | } |
| 1075 | 1077 | |
@@ -1090,7 +1092,8 @@ discard block |
||
| 1090 | 1092 | $delimiter = ','; |
| 1091 | 1093 | } |
| 1092 | 1094 | if ($delimiter !== '') { |
| 1093 | - if (!is_numeric($record[0])) { // lose the header |
|
| 1095 | + if (!is_numeric($record[0])) { |
|
| 1096 | +// lose the header |
|
| 1094 | 1097 | array_shift($input_array); |
| 1095 | 1098 | } |
| 1096 | 1099 | |
@@ -165,7 +165,7 @@ |
||
| 165 | 165 | public function getFileAction(Request $request): Response { |
| 166 | 166 | $file = $request->get('file', ''); |
| 167 | 167 | |
| 168 | - if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) { |
|
| 168 | + if (!preg_match('/^(\d+)-([imnrs])-(\d+)$/', $file, $match)) { |
|
| 169 | 169 | throw new NotFoundHttpException('Bad sitemap file'); |
| 170 | 170 | } |
| 171 | 171 | |
@@ -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) ?>"> |