@@ -72,14 +72,14 @@ discard block |
||
72 | 72 | if (strlen($match[1]) > strlen($match[2])) { |
73 | 73 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
74 | 74 | } |
75 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
75 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
76 | 76 | $view = 'year'; |
77 | 77 | } else { |
78 | 78 | // advanced-year "decade/century wildcard" |
79 | 79 | if (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
80 | 80 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
81 | 81 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
82 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
82 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
83 | 83 | $view = 'year'; |
84 | 84 | } else { |
85 | 85 | if ($year < 0) { |
@@ -191,14 +191,14 @@ discard block |
||
191 | 191 | if (strlen($match[1]) > strlen($match[2])) { |
192 | 192 | $match[2] = substr($match[1], 0, strlen($match[1]) - strlen($match[2])) . $match[2]; |
193 | 193 | } |
194 | - $ged_date = new Date("FROM {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
194 | + $ged_date = new Date("from {$cal} {$match[1]} TO {$cal} {$match[2]}"); |
|
195 | 195 | $view = 'year'; |
196 | 196 | } else { |
197 | 197 | // advanced-year "decade/century wildcard" |
198 | 198 | if (preg_match('/^(\d+)(\?+)$/', $year, $match)) { |
199 | 199 | $y1 = $match[1] . str_replace('?', '0', $match[2]); |
200 | 200 | $y2 = $match[1] . str_replace('?', '9', $match[2]); |
201 | - $ged_date = new Date("FROM {$cal} {$y1} TO {$cal} {$y2}"); |
|
201 | + $ged_date = new Date("from {$cal} {$y1} TO {$cal} {$y2}"); |
|
202 | 202 | $view = 'year'; |
203 | 203 | } else { |
204 | 204 | if ($year < 0) { |
@@ -345,10 +345,10 @@ |
||
345 | 345 | } |
346 | 346 | // print gedcom ages |
347 | 347 | foreach ([ |
348 | - I18N::translate('Age') => $fact_age, |
|
349 | - I18N::translate('Husband') => $husb_age, |
|
350 | - I18N::translate('Wife') => $wife_age, |
|
351 | - ] as $label => $age) { |
|
348 | + I18N::translate('Age') => $fact_age, |
|
349 | + I18N::translate('Husband') => $husb_age, |
|
350 | + I18N::translate('Wife') => $wife_age, |
|
351 | + ] as $label => $age) { |
|
352 | 352 | if ($age != '') { |
353 | 353 | $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>'; |
354 | 354 | } |
@@ -224,10 +224,10 @@ |
||
224 | 224 | $src = $this->imageUrl($width, $height, $fit); |
225 | 225 | $srcset = []; |
226 | 226 | foreach ([ |
227 | - 2, |
|
228 | - 3, |
|
229 | - 4, |
|
230 | - ] as $x) { |
|
227 | + 2, |
|
228 | + 3, |
|
229 | + 4, |
|
230 | + ] as $x) { |
|
231 | 231 | $srcset[] = $this->imageUrl($width * $x, $height * $x, $fit) . ' ' . $x . 'x'; |
232 | 232 | } |
233 | 233 | } |
@@ -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 |
@@ -840,9 +840,9 @@ |
||
840 | 840 | } |
841 | 841 | |
842 | 842 | foreach ([ |
843 | - 'main' => $main_blocks, |
|
844 | - 'side' => $side_blocks, |
|
845 | - ] as $location => $updated_blocks) { |
|
843 | + 'main' => $main_blocks, |
|
844 | + 'side' => $side_blocks, |
|
845 | + ] as $location => $updated_blocks) { |
|
846 | 846 | foreach ($updated_blocks as $block_order => $block_id) { |
847 | 847 | if (is_numeric($block_id)) { |
848 | 848 | // Updated block |
@@ -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( |
@@ -327,9 +327,9 @@ |
||
327 | 327 | |
328 | 328 | // Now fetch these anniversaries |
329 | 329 | foreach ([ |
330 | - 'INDI' => $ind_sql . $where . $order_by, |
|
331 | - 'FAM' => $fam_sql . $where . $order_by, |
|
332 | - ] as $type => $sql) { |
|
330 | + 'INDI' => $ind_sql . $where . $order_by, |
|
331 | + 'FAM' => $fam_sql . $where . $order_by, |
|
332 | + ] as $type => $sql) { |
|
333 | 333 | $rows = Database::prepare($sql)->execute($args)->fetchAll(); |
334 | 334 | foreach ($rows as $row) { |
335 | 335 | if ($type === 'INDI') { |
@@ -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; |
@@ -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 | } |