@@ -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'], |
@@ -190,8 +190,8 @@ discard block |
||
190 | 190 | foreach ($person->getChildFamilies() as $cfamily) { |
191 | 191 | foreach ($cfamily->getSpouses() as $parent) { |
192 | 192 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
193 | - 'xref' => $parent->xref(), |
|
194 | - 'generations' => $generations, |
|
193 | + 'xref' => $parent->xref(), |
|
194 | + 'generations' => $generations, |
|
195 | 195 | ]), |
196 | 196 | ]); |
197 | 197 | // only show the arrow for one of the parents |
@@ -273,8 +273,8 @@ discard block |
||
273 | 273 | foreach ($spouse->getChildFamilies() as $cfamily) { |
274 | 274 | foreach ($cfamily->getSpouses() as $parent) { |
275 | 275 | echo FontAwesome::linkIcon('arrow-up', I18N::translate('Start at parents'), ['href' => route('descendants', ['ged' => $parent->tree()->name(), |
276 | - 'xref' => $parent->xref(), |
|
277 | - 'generations' => $generations, |
|
276 | + 'xref' => $parent->xref(), |
|
277 | + 'generations' => $generations, |
|
278 | 278 | ]), |
279 | 279 | ]); |
280 | 280 | // only show the arrow for one of the parents |
@@ -399,19 +399,19 @@ |
||
399 | 399 | private function faqsExist(Tree $tree, string $language): bool |
400 | 400 | { |
401 | 401 | return DB::table('block') |
402 | - ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
403 | - ->where('module_name', '=', $this->name()) |
|
404 | - ->where('setting_name', '=', 'languages') |
|
405 | - ->where(function (Builder $query) use ($tree): void { |
|
406 | - $query |
|
407 | - ->whereNull('gedcom_id') |
|
408 | - ->orWhere('gedcom_id', '=', $tree->id()); |
|
409 | - }) |
|
410 | - ->select(['setting_value AS languages']) |
|
411 | - ->get() |
|
412 | - ->filter(function (stdClass $faq) use ($language): bool { |
|
413 | - return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
414 | - }) |
|
402 | + ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id') |
|
403 | + ->where('module_name', '=', $this->name()) |
|
404 | + ->where('setting_name', '=', 'languages') |
|
405 | + ->where(function (Builder $query) use ($tree): void { |
|
406 | + $query |
|
407 | + ->whereNull('gedcom_id') |
|
408 | + ->orWhere('gedcom_id', '=', $tree->id()); |
|
409 | + }) |
|
410 | + ->select(['setting_value AS languages']) |
|
411 | + ->get() |
|
412 | + ->filter(function (stdClass $faq) use ($language): bool { |
|
413 | + return $faq->languages === '' || in_array($language, explode(',', $faq->languages)); |
|
414 | + }) |
|
415 | 415 | ->isNotEmpty(); |
416 | 416 | } |
417 | 417 | } |
@@ -416,7 +416,7 @@ discard block |
||
416 | 416 | $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu); |
417 | 417 | |
418 | 418 | foreach ($families as $family) { |
419 | - $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
419 | + $html .= '<span class="name1">' . I18N::translate('Family') . '</span>'; |
|
420 | 420 | $spouse = $family->getSpouse($root); |
421 | 421 | if ($spouse) { |
422 | 422 | $html .= '<a class="name1" href="' . e($this->chartUrl($spouse, ['generations' => $generations, 'orientation' => $orientation])) . '">' . $spouse->getFullName() . '</a>'; |
@@ -462,7 +462,7 @@ discard block |
||
462 | 462 | $html = ''; |
463 | 463 | if ($chart_has_ancestors) { |
464 | 464 | if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) { |
465 | - $html .= '<div class="ancestorarrow">'; |
|
465 | + $html .= '<div class="ancestorarrow">'; |
|
466 | 466 | $rootParentId = 1; |
467 | 467 | if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) { |
468 | 468 | $rootParentId++; |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | 'generations' => 3, |
96 | 96 | 'layout' => PedigreeChartModule::PORTRAIT, |
97 | 97 | ]); |
98 | - $content = view('modules/charts/chart', [ |
|
98 | + $content = view('modules/charts/chart', [ |
|
99 | 99 | 'block_id' => $block_id, |
100 | 100 | 'chart_url' => $chart_url, |
101 | 101 | ]); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | 'generations' => 2, |
111 | 111 | 'chart_style' => DescendancyChartModule::CHART_STYLE_LIST, |
112 | 112 | ]); |
113 | - $content = view('modules/charts/chart', [ |
|
113 | + $content = view('modules/charts/chart', [ |
|
114 | 114 | 'block_id' => $block_id, |
115 | 115 | 'chart_url' => $chart_url, |
116 | 116 | ]); |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | 'ajax' => true, |
125 | 125 | 'generations' => 2, |
126 | 126 | ]); |
127 | - $content = view('modules/charts/chart', [ |
|
127 | + $content = view('modules/charts/chart', [ |
|
128 | 128 | 'block_id' => $block_id, |
129 | 129 | 'chart_url' => $chart_url, |
130 | 130 | ]); |
@@ -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, |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | $sosa = array_search($individual, $ancestors, true); |
262 | 262 | if (is_int($sosa) && $module instanceof RelationshipsChartModule) { |
263 | 263 | $sosa_class = 'search_hit'; |
264 | - $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa); |
|
264 | + $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa); |
|
265 | 265 | } else { |
266 | 266 | $sosa_class = ''; |
267 | 267 | $sosa_html = ''; |
@@ -297,7 +297,7 @@ discard block |
||
297 | 297 | $sosa = array_search($spouse, $ancestors, true); |
298 | 298 | if (is_int($sosa) && $module instanceof RelationshipsChartModule) { |
299 | 299 | $sosa_class = 'search_hit'; |
300 | - $sosa_html = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa); |
|
300 | + $sosa_html = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa); |
|
301 | 301 | } else { |
302 | 302 | $sosa_class = ''; |
303 | 303 | $sosa_html = ''; |
@@ -103,11 +103,11 @@ |
||
103 | 103 | $record = GedcomRecord::getInstance('HEAD', $tree); |
104 | 104 | $fact = $record->getFirstFact('COPR'); |
105 | 105 | if ($fact instanceof Fact) { |
106 | - $COPR = "\n1 COPR " .$fact->value(); |
|
106 | + $COPR = "\n1 COPR " . $fact->value(); |
|
107 | 107 | } |
108 | - $fact = $record->getFirstFact('LANG'); |
|
108 | + $fact = $record->getFirstFact('LANG'); |
|
109 | 109 | if ($fact instanceof Fact) { |
110 | - $LANG = "\n1 LANG " .$fact->value(); |
|
110 | + $LANG = "\n1 LANG " . $fact->value(); |
|
111 | 111 | } |
112 | 112 | // Link to actual SUBM/SUBN records, if they exist |
113 | 113 | $subn = DB::table('other') |
@@ -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 | } |