@@ -322,14 +322,14 @@ discard block |
||
322 | 322 | case 'sis': |
323 | 323 | case 'sib': |
324 | 324 | $table[$x + 1][$y] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class)->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>'; |
325 | - $x += 2; |
|
325 | + $x += 2; |
|
326 | 326 | break; |
327 | 327 | case 'son': |
328 | 328 | case 'dau': |
329 | 329 | case 'chi': |
330 | 330 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
331 | 331 | $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>'; |
332 | - $x += 2; |
|
332 | + $x += 2; |
|
333 | 333 | } else { |
334 | 334 | $table[$x][$y - 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
335 | 335 | ->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>'; |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | case 'par': |
342 | 342 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
343 | 343 | $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>'; |
344 | - $x += 2; |
|
344 | + $x += 2; |
|
345 | 345 | } else { |
346 | 346 | $table[$x][$y + 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
347 | 347 | ->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>'; |
@@ -482,17 +482,17 @@ discard block |
||
482 | 482 | */ |
483 | 483 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
484 | 484 | { |
485 | - $spouse_codes = [ |
|
485 | + $spouse_codes = [ |
|
486 | 486 | 'M' => 'hus', |
487 | 487 | 'F' => 'wif', |
488 | 488 | 'U' => 'spo', |
489 | 489 | ]; |
490 | - $parent_codes = [ |
|
490 | + $parent_codes = [ |
|
491 | 491 | 'M' => 'fat', |
492 | 492 | 'F' => 'mot', |
493 | 493 | 'U' => 'par', |
494 | 494 | ]; |
495 | - $child_codes = [ |
|
495 | + $child_codes = [ |
|
496 | 496 | 'M' => 'son', |
497 | 497 | 'F' => 'dau', |
498 | 498 | 'U' => 'chi', |
@@ -482,7 +482,7 @@ discard block |
||
482 | 482 | public function findByName(string $module_name): ?ModuleInterface |
483 | 483 | { |
484 | 484 | return self::all() |
485 | - ->filter(function (ModuleInterface $module) use ($module_name): bool { |
|
485 | + ->filter(function (ModuleInterface $module) use ($module_name) : bool { |
|
486 | 486 | return $module->isEnabled() && $module->name() === $module_name; |
487 | 487 | }) |
488 | 488 | ->first(); |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | public function findByClass(string $class_name): ?ModuleInterface |
499 | 499 | { |
500 | 500 | return self::all() |
501 | - ->filter(function (ModuleInterface $module) use ($class_name): bool { |
|
501 | + ->filter(function (ModuleInterface $module) use ($class_name) : bool { |
|
502 | 502 | return $module->isEnabled() && $module instanceof $class_name; |
503 | 503 | }) |
504 | 504 | ->first(); |
@@ -2591,7 +2591,7 @@ |
||
2591 | 2591 | /** @var ModuleBlockInterface $module */ |
2592 | 2592 | $module = $this->module_service |
2593 | 2593 | ->findByComponent('block', $this->tree, Auth::user()) |
2594 | - ->filter(function (ModuleInterface $module) use ($block): bool { |
|
2594 | + ->filter(function (ModuleInterface $module) use ($block) : bool { |
|
2595 | 2595 | return $module->name() === $block && $module->name() !== 'html'; |
2596 | 2596 | }) |
2597 | 2597 | ->first(); |
@@ -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'; |
@@ -789,7 +789,7 @@ |
||
789 | 789 | $html .= '<p class="small text-muted">' . I18N::translate('Use this image for charts and on the individual’s page.') . '</p>'; |
790 | 790 | } elseif ($fact === 'TYPE' && $level === '3') { |
791 | 791 | //-- Build the selector for the Media 'TYPE' Fact |
792 | - $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
792 | + $html .= '<select name="text[]"><option selected value="" ></option>'; |
|
793 | 793 | $selectedValue = strtolower($value); |
794 | 794 | if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) { |
795 | 795 | $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>'; |
@@ -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', |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $input['control'] = FunctionsEdit::formControlSource($tree, $source, $attributes + ['required' => 'true']); |
134 | 134 | break; |
135 | 135 | case 'DATE': |
136 | - $attributes += [ |
|
136 | + $attributes += [ |
|
137 | 137 | 'type' => 'text', |
138 | 138 | 'value' => $input['default'], |
139 | 139 | ]; |
@@ -147,14 +147,14 @@ discard block |
||
147 | 147 | default: |
148 | 148 | switch ($input['type']) { |
149 | 149 | case 'text': |
150 | - $attributes += [ |
|
150 | + $attributes += [ |
|
151 | 151 | 'type' => 'text', |
152 | 152 | 'value' => $input['default'], |
153 | 153 | ]; |
154 | 154 | $input['control'] = '<input ' . Html::attributes($attributes) . '>'; |
155 | 155 | break; |
156 | 156 | case 'checkbox': |
157 | - $attributes += [ |
|
157 | + $attributes += [ |
|
158 | 158 | 'type' => 'checkbox', |
159 | 159 | 'checked' => (bool) $input['default'], |
160 | 160 | ]; |