@@ -26,7 +26,7 @@ |
||
26 | 26 | <button type="submit" class="btn btn-primary"> |
27 | 27 | <?= view('icons/save') ?> |
28 | 28 | <?= /* I18N: A button label. */ |
29 | - I18N::translate('continue') ?> |
|
29 | + I18N::translate('continue') ?> |
|
30 | 30 | </button> |
31 | 31 | |
32 | 32 | <?= I18N::translate('Caution! This may take a long time. Be patient.') ?> |
@@ -25,12 +25,12 @@ discard block |
||
25 | 25 | </label> |
26 | 26 | <div class="col-sm-9 wt-page-options-value"> |
27 | 27 | <?= |
28 | - Bootstrap4::select( |
|
29 | - FunctionsEdit::numericOptions(range(2, $maxgenerations)), |
|
30 | - $generations, |
|
31 | - ['id' => 'generations', 'name' => 'generations'] |
|
32 | - ) |
|
33 | - ?> |
|
28 | + Bootstrap4::select( |
|
29 | + FunctionsEdit::numericOptions(range(2, $maxgenerations)), |
|
30 | + $generations, |
|
31 | + ['id' => 'generations', 'name' => 'generations'] |
|
32 | + ) |
|
33 | + ?> |
|
34 | 34 | </div> |
35 | 35 | </div> |
36 | 36 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | <div class="col-sm-3 wt-page-options-label"></div> |
39 | 39 | <div class="col-sm-9 wt-page-options-value"> |
40 | 40 | <input class="btn btn-primary" type="submit" value="<?= /* I18N: A button label. */ |
41 | - I18N::translate('view') |
|
42 | - ?>"> |
|
41 | + I18N::translate('view') |
|
42 | + ?>"> |
|
43 | 43 | </div> |
44 | 44 | </div> |
45 | 45 | </form> |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | $note = false; |
61 | 61 | |
62 | 62 | if ($showmap) { |
63 | - $note = true; |
|
63 | + $note = true; |
|
64 | 64 | $content .= view('place-map', [ |
65 | 65 | 'module' => self::MAP_MODULE, |
66 | 66 | 'ref' => $fqpn, |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | switch ($action) { |
73 | 73 | case 'list': |
74 | 74 | $nextaction = ['hierarchy' => I18N::translate('Show place hierarchy')]; |
75 | - $content .= view('place-list', $this->getList($tree)); |
|
75 | + $content .= view('place-list', $this->getList($tree)); |
|
76 | 76 | break; |
77 | 77 | case 'hierarchy': |
78 | 78 | case 'hierarchy-e': |
79 | 79 | $nextaction = ['list' => I18N::translate('Show all places in a list')]; |
80 | 80 | $data = $this->getHierarchy($tree, $place, $parent); |
81 | - $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
81 | + $content .= (null === $data || $showmap) ? '' : view('place-hierarchy', $data); |
|
82 | 82 | if (null === $data || $action === 'hierarchy-e') { |
83 | 83 | $content .= view('place-events', $this->getEvents($tree, $place)); |
84 | 84 | } |
@@ -157,7 +157,7 @@ |
||
157 | 157 | */ |
158 | 158 | public function getCount(Tree $tree, $page, $parameter): int |
159 | 159 | { |
160 | - return (int)Database::prepare( |
|
160 | + return (int) Database::prepare( |
|
161 | 161 | "SELECT page_count FROM `##hit_counter` WHERE gedcom_id = :tree_id AND page_name = :page AND page_parameter = :parameter" |
162 | 162 | )->execute([ |
163 | 163 | 'tree_id' => $tree->getTreeId(), |
@@ -9,14 +9,14 @@ |
||
9 | 9 | </a> |
10 | 10 | <?php endif ?> |
11 | 11 | |
12 | -<?php if($value): ?> |
|
12 | +<?php if ($value): ?> |
|
13 | 13 | <span> |
14 | 14 | <?= $value ?> |
15 | 15 | </span> |
16 | 16 | <?php endif ?> |
17 | 17 | |
18 | 18 | <div> |
19 | - <?php if($addtag): ?> |
|
19 | + <?php if ($addtag): ?> |
|
20 | 20 | <?= GedcomTag::getLabel('BIRT') ?>: |
21 | 21 | <?php endif ?> |
22 | 22 | <?= $date ?> |
@@ -9,14 +9,14 @@ |
||
9 | 9 | </a> |
10 | 10 | <?php endif ?> |
11 | 11 | |
12 | -<?php if($value): ?> |
|
12 | +<?php if ($value): ?> |
|
13 | 13 | <span> |
14 | 14 | <?= $value ?> |
15 | 15 | </span> |
16 | 16 | <?php endif ?> |
17 | 17 | |
18 | 18 | <div> |
19 | - <?php if($addtag): ?> |
|
19 | + <?php if ($addtag): ?> |
|
20 | 20 | <?= GedcomTag::getLabel('BIRT') ?>: |
21 | 21 | <?php endif ?> |
22 | 22 | <?= $date ?> |
@@ -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 |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | </legend> |
56 | 56 | <div class="col-sm-8"> |
57 | 57 | <?= Bootstrap4::radioButtons( |
58 | - 'cleardatabase', |
|
59 | - [I18N::translate('no'), I18N::translate('yes')], |
|
60 | - '0', |
|
61 | - true |
|
62 | - ) ?> |
|
58 | + 'cleardatabase', |
|
59 | + [I18N::translate('no'), I18N::translate('yes')], |
|
60 | + '0', |
|
61 | + true |
|
62 | + ) ?> |
|
63 | 63 | </div> |
64 | 64 | </div> |
65 | 65 | </fieldset> |
@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | </legend> |
73 | 73 | <div class="col-sm-8"> |
74 | 74 | <?= Bootstrap4::select( |
75 | - [ |
|
76 | - 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
77 | - 'add' => I18N::translate('Only add new records'), |
|
78 | - 'update' => I18N::translate('Only update existing records'), |
|
79 | - ], |
|
80 | - '0', |
|
81 | - ['id' => 'import-options', 'name' => 'import-options'] |
|
82 | - ) ?> |
|
75 | + [ |
|
76 | + 'addupdate' => I18N::translate('Add new, and update existing records'), |
|
77 | + 'add' => I18N::translate('Only add new records'), |
|
78 | + 'update' => I18N::translate('Only update existing records'), |
|
79 | + ], |
|
80 | + '0', |
|
81 | + ['id' => 'import-options', 'name' => 'import-options'] |
|
82 | + ) ?> |
|
83 | 83 | </div> |
84 | 84 | </div> |
85 | 85 | </fieldset> |
@@ -23,7 +23,7 @@ |
||
23 | 23 | </div> |
24 | 24 | <select id="serverfile" name="serverfile" class="form-control"> |
25 | 25 | <option selected value=""></option> |
26 | - <?php foreach($files as $file): ?> |
|
26 | + <?php foreach ($files as $file): ?> |
|
27 | 27 | <option value="<?= e($file) ?>"> |
28 | 28 | <?= e($file) ?> |
29 | 29 | </option> |
@@ -75,27 +75,27 @@ discard block |
||
75 | 75 | <a class="btn btn-primary" href="<?= e(route('map-data', ['parent_id' => $parent_id])) ?>"> |
76 | 76 | <?= FontAwesome::decorativeIcon('add') ?> |
77 | 77 | <?= /* I18N: A button label. */ |
78 | - I18N::translate('add place') ?> |
|
78 | + I18N::translate('add place') ?> |
|
79 | 79 | </a> |
80 | 80 | <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton" |
81 | 81 | data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> |
82 | 82 | <?= FontAwesome::decorativeIcon('download') ?> |
83 | 83 | <?= /* I18N: A button label. */ |
84 | - I18N::translate('export file') ?> |
|
84 | + I18N::translate('export file') ?> |
|
85 | 85 | </button> |
86 | 86 | <div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> |
87 | 87 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'csv'])) ?>"> |
88 | 88 | csv |
89 | 89 | </a> |
90 | 90 | <a class="dropdown-item" href="<?= e(route('locations-export', ['parent_id' => $parent_id, 'format' => 'geojson'] |
91 | - )) ?>"> |
|
91 | + )) ?>"> |
|
92 | 92 | geoJSON |
93 | 93 | </a> |
94 | 94 | </div> |
95 | 95 | <a class="btn btn-primary" href="<?= e(route('locations-import', ['parent_id' => $parent_id])) ?>"> |
96 | 96 | <?= FontAwesome::decorativeIcon('upload') ?> |
97 | 97 | <?= /* I18N: A button label. */ |
98 | - I18N::translate('import file') ?> |
|
98 | + I18N::translate('import file') ?> |
|
99 | 99 | </a> |
100 | 100 | </td> |
101 | 101 | </tr> |
@@ -111,16 +111,16 @@ discard block |
||
111 | 111 | </label> |
112 | 112 | <div class="col-sm-6"> |
113 | 113 | <?= Bootstrap4::select( |
114 | - Tree::getNameList(), |
|
115 | - '', |
|
116 | - ['id' => 'ged', 'name' => 'ged'] |
|
117 | - ) ?> |
|
114 | + Tree::getNameList(), |
|
115 | + '', |
|
116 | + ['id' => 'ged', 'name' => 'ged'] |
|
117 | + ) ?> |
|
118 | 118 | </div> |
119 | 119 | <div class="col-sm-2"> |
120 | 120 | <button type="submit" class="btn btn-primary"> |
121 | 121 | <?= view('icons/upload') ?> |
122 | 122 | <?= /* I18N: A button label. */ |
123 | - I18N::translate('import') ?> |
|
123 | + I18N::translate('import') ?> |
|
124 | 124 | </button> |
125 | 125 | </div> |
126 | 126 | </div> |
@@ -32,12 +32,10 @@ |
||
32 | 32 | </a> |
33 | 33 | </th> |
34 | 34 | <td> |
35 | - <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : |
|
36 | - strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
35 | + <?= ($place->pl_lati === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_lati, ['N' => '', 'S' => '-', ',' => '.']) ?> |
|
37 | 36 | </td> |
38 | 37 | <td> |
39 | - <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : |
|
40 | - strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
38 | + <?= ($place->pl_long === null) ? FontAwesome::decorativeIcon('warning') : strtr($place->pl_long, ['E' => '', 'W' => '-', ',' => '.']) ?> |
|
41 | 39 | </td> |
42 | 40 | <td> |
43 | 41 | <?= $place->pl_long === null ? FontAwesome::decorativeIcon('warning') : $place->pl_zoom ?> |