@@ -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 | |
@@ -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')) { |
@@ -414,7 +414,7 @@ |
||
| 414 | 414 | ]; |
| 415 | 415 | |
| 416 | 416 | $access_level = $access_levels[$privatize_export]; |
| 417 | - $encoding = $convert ? 'ANSI' : 'UTF-8'; |
|
| 417 | + $encoding = $convert ? 'ANSI' : 'UTF-8'; |
|
| 418 | 418 | |
| 419 | 419 | // What to call the downloaded file |
| 420 | 420 | $download_filename = $tree->getName(); |