@@ -291,7 +291,7 @@ |
||
| 291 | 291 | 'provider' => 'openstreetmap', |
| 292 | 292 | 'style' => 'mapnik', |
| 293 | 293 | ]; |
| 294 | - self::$map_providers = [ |
|
| 294 | + self::$map_providers = [ |
|
| 295 | 295 | 'openstreetmap' => [ |
| 296 | 296 | 'name' => 'OpenStreetMap', |
| 297 | 297 | 'styles' => ['mapnik' => 'Mapnik'], |
@@ -52,7 +52,7 @@ |
||
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // Did we emigrate or naturalise? |
| 55 | - foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) { |
|
| 55 | + foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) { |
|
| 56 | 56 | if (Date::compare($fact->date(), $this->date()) <= 0) { |
| 57 | 57 | $place = $fact->place()->gedcomName(); |
| 58 | 58 | } |
@@ -241,7 +241,7 @@ |
||
| 241 | 241 | echo '<table cellspacing="0" cellpadding="0" border="0" >'; |
| 242 | 242 | foreach ($children as $i => $child) { |
| 243 | 243 | echo '<tr><td>'; |
| 244 | - $kids = $this->printDescendency($generation + 1, $child); |
|
| 244 | + $kids = $this->printDescendency($generation + 1, $child); |
|
| 245 | 245 | $numkids += $kids; |
| 246 | 246 | echo '</td>'; |
| 247 | 247 | // Print the lines |
@@ -256,7 +256,7 @@ |
||
| 256 | 256 | |
| 257 | 257 | // Create a source, to indicate the source of the data. |
| 258 | 258 | $filetext .= "0 @WEBTREES@ SOUR\n1 TITL " . WT_BASE_URL . "\n"; |
| 259 | - $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
| 259 | + $author = $this->user_service->find((int) $tree->getPreference('CONTACT_USER_ID')); |
|
| 260 | 260 | if ($author !== null) { |
| 261 | 261 | $filetext .= '1 AUTH ' . $author->realName() . "\n"; |
| 262 | 262 | } |
@@ -589,7 +589,7 @@ discard block |
||
| 589 | 589 | for ($j = 0; $j < $ct; $j++) { |
| 590 | 590 | if (strpos($match[$j][1], '@') === false) { |
| 591 | 591 | $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2])); |
| 592 | - $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
| 592 | + $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>'; |
|
| 593 | 593 | } |
| 594 | 594 | } |
| 595 | 595 | // Find source for each fact |
@@ -607,7 +607,7 @@ discard block |
||
| 607 | 607 | } |
| 608 | 608 | $srec = substr($factrec, $spos1, $spos2 - $spos1); |
| 609 | 609 | $lt = preg_match_all("/$nlevel \w+/", $srec, $matches); |
| 610 | - $data .= '<div class="fact_SOUR">'; |
|
| 610 | + $data .= '<div class="fact_SOUR">'; |
|
| 611 | 611 | $elementID = Uuid::uuid4()->toString(); |
| 612 | 612 | if ($tree->getPreference('EXPAND_SOURCES')) { |
| 613 | 613 | $plusminus = 'icon-minus'; |
@@ -402,7 +402,7 @@ |
||
| 402 | 402 | |
| 403 | 403 | $newged = ''; |
| 404 | 404 | if (!empty($_POST['NAME'])) { |
| 405 | - $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 405 | + $newged .= "\n1 NAME " . $_POST['NAME']; |
|
| 406 | 406 | $name_facts = [ |
| 407 | 407 | 'TYPE', |
| 408 | 408 | 'NPFX', |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | $breadcrumbs[] = I18N::translate('Add'); |
| 103 | 103 | } else { |
| 104 | 104 | $breadcrumbs[] = I18N::translate('Edit'); |
| 105 | - $title .= ' — ' . I18N::translate('Edit'); |
|
| 105 | + $title .= ' — ' . I18N::translate('Edit'); |
|
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | return $this->viewResponse('admin/location-edit', [ |
@@ -334,9 +334,11 @@ |
||
| 334 | 334 | 'fqpn', |
| 335 | 335 | ]; |
| 336 | 336 | |
| 337 | - if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) { // first choice is file on server |
|
| 337 | + if ($serverfile !== '' && is_dir(WT_DATA_DIR . 'places')) { |
|
| 338 | +// first choice is file on server |
|
| 338 | 339 | $filename = WT_DATA_DIR . 'places/' . $serverfile; |
| 339 | - } elseif ($request->files->has('localfile')) { // 2nd choice is local file |
|
| 340 | + } elseif ($request->files->has('localfile')) { |
|
| 341 | +// 2nd choice is local file |
|
| 340 | 342 | $filename = $request->files->get('localfile')->getPathName(); |
| 341 | 343 | } |
| 342 | 344 | |
@@ -560,7 +560,7 @@ |
||
| 560 | 560 | $data = array_map(function (string $thumbnail): array { |
| 561 | 561 | $original = $this->findOriginalFileFromThumbnail($thumbnail); |
| 562 | 562 | |
| 563 | - $original_url = route('unused-media-thumbnail', [ |
|
| 563 | + $original_url = route('unused-media-thumbnail', [ |
|
| 564 | 564 | 'folder' => dirname($original), |
| 565 | 565 | 'file' => basename($original), |
| 566 | 566 | 'w' => 100, |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | break; |
| 136 | 136 | |
| 137 | 137 | case 'DATE': |
| 138 | - $attributes += [ |
|
| 138 | + $attributes += [ |
|
| 139 | 139 | 'type' => 'text', |
| 140 | 140 | 'value' => $input['default'], |
| 141 | 141 | 'dir' => 'ltr', |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | default: |
| 149 | 149 | switch ($input['type']) { |
| 150 | 150 | case 'text': |
| 151 | - $attributes += [ |
|
| 151 | + $attributes += [ |
|
| 152 | 152 | 'type' => 'text', |
| 153 | 153 | 'value' => $input['default'], |
| 154 | 154 | ]; |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | break; |
| 157 | 157 | |
| 158 | 158 | case 'checkbox': |
| 159 | - $attributes += [ |
|
| 159 | + $attributes += [ |
|
| 160 | 160 | 'type' => 'checkbox', |
| 161 | 161 | 'checked' => (bool) $input['default'], |
| 162 | 162 | ]; |