@@ -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 | ]); |
@@ -318,14 +318,14 @@ discard block |
||
| 318 | 318 | case 'sis': |
| 319 | 319 | case 'sib': |
| 320 | 320 | $table[$x + 1][$y] = '<div style="background:url(' . Theme::theme()->parameter('image-hline') . ') repeat-x center; width: 94px; text-align: center"><div class="hline-text" style="height: 32px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px;">' . view('icons/arrow-end') . '</div></div>'; |
| 321 | - $x += 2; |
|
| 321 | + $x += 2; |
|
| 322 | 322 | break; |
| 323 | 323 | case 'son': |
| 324 | 324 | case 'dau': |
| 325 | 325 | case 'chi': |
| 326 | 326 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
| 327 | 327 | $table[$x + 1][$y - 1] = '<div style="background:url(' . $diagonal2 . '); width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: end;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: start;">' . view('icons/arrow-down') . '</div></div>'; |
| 328 | - $x += 2; |
|
| 328 | + $x += 2; |
|
| 329 | 329 | } else { |
| 330 | 330 | $table[$x][$y - 1] = '<div style="background:url(' . Theme::theme() |
| 331 | 331 | ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align: center;"><div class="vline-text" style="display: inline-block; width:50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width:50%; line-height: 64px;">' . view('icons/arrow-down') . '</div></div>'; |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | case 'par': |
| 338 | 338 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
| 339 | 339 | $table[$x + 1][$y + 1] = '<div style="background:url(' . $diagonal1 . '); background-position: top right; width: 64px; height: 64px; text-align: center;"><div style="height: 32px; text-align: start;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="height: 32px; text-align: end;">' . view('icons/arrow-down') . '</div></div>'; |
| 340 | - $x += 2; |
|
| 340 | + $x += 2; |
|
| 341 | 341 | } else { |
| 342 | 342 | $table[$x][$y + 1] = '<div style="background:url(' . Theme::theme() |
| 343 | 343 | ->parameter('image-vline') . ') repeat-y center; height: 64px; text-align:center; "><div class="vline-text" style="display: inline-block; width: 50%; line-height: 64px;">' . Functions::getRelationshipNameFromPath($relationships[$n], Individual::getInstance($path[$n - 1], $tree), Individual::getInstance($path[$n + 1], $tree)) . '</div><div style="display: inline-block; width: 50%; line-height: 32px">' . view('icons/arrow-up') . '</div></div>'; |
@@ -478,17 +478,17 @@ discard block |
||
| 478 | 478 | */ |
| 479 | 479 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
| 480 | 480 | { |
| 481 | - $spouse_codes = [ |
|
| 481 | + $spouse_codes = [ |
|
| 482 | 482 | 'M' => 'hus', |
| 483 | 483 | 'F' => 'wif', |
| 484 | 484 | 'U' => 'spo', |
| 485 | 485 | ]; |
| 486 | - $parent_codes = [ |
|
| 486 | + $parent_codes = [ |
|
| 487 | 487 | 'M' => 'fat', |
| 488 | 488 | 'F' => 'mot', |
| 489 | 489 | 'U' => 'par', |
| 490 | 490 | ]; |
| 491 | - $child_codes = [ |
|
| 491 | + $child_codes = [ |
|
| 492 | 492 | 'M' => 'son', |
| 493 | 493 | 'F' => 'dau', |
| 494 | 494 | 'U' => 'chi', |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | public static function findByName(string $module_name): ?ModuleInterface |
| 309 | 309 | { |
| 310 | 310 | return self::all() |
| 311 | - ->filter(function (ModuleInterface $module) use ($module_name): bool { |
|
| 311 | + ->filter(function (ModuleInterface $module) use ($module_name) : bool { |
|
| 312 | 312 | return $module->isEnabled() && $module->name() === $module_name; |
| 313 | 313 | }) |
| 314 | 314 | ->first(); |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | public static function findByClass(string $class_name): ?ModuleInterface |
| 325 | 325 | { |
| 326 | 326 | return self::all() |
| 327 | - ->filter(function (ModuleInterface $module) use ($class_name): bool { |
|
| 327 | + ->filter(function (ModuleInterface $module) use ($class_name) : bool { |
|
| 328 | 328 | return $module->isEnabled() && $module instanceof $class_name; |
| 329 | 329 | }) |
| 330 | 330 | ->first(); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | public function reportList(Tree $tree, User $user): Response |
| 57 | 57 | { |
| 58 | - $title = I18N::translate('Choose a report to run'); |
|
| 58 | + $title = I18N::translate('Choose a report to run'); |
|
| 59 | 59 | |
| 60 | 60 | return $this->viewResponse('report-select-page', [ |
| 61 | 61 | 'reports' => Module::findByComponent('report', $tree, $user), |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | |
| 254 | - $report_xml =WT_ROOT . 'resources/xml/reports/' . $module->name() . '.xml'; |
|
| 254 | + $report_xml = WT_ROOT . 'resources/xml/reports/' . $module->name() . '.xml'; |
|
| 255 | 255 | |
| 256 | 256 | |
| 257 | 257 | switch ($output) { |
@@ -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 = ''; |