@@ -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', |
@@ -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 | |
@@ -504,7 +504,7 @@ discard block |
||
| 504 | 504 | public function findByName(string $module_name): ?ModuleInterface |
| 505 | 505 | { |
| 506 | 506 | return $this->all() |
| 507 | - ->filter(function (ModuleInterface $module) use ($module_name): bool { |
|
| 507 | + ->filter(function (ModuleInterface $module) use ($module_name) : bool { |
|
| 508 | 508 | return $module->isEnabled() && $module->name() === $module_name; |
| 509 | 509 | }) |
| 510 | 510 | ->first(); |
@@ -520,7 +520,7 @@ discard block |
||
| 520 | 520 | public function findByClass(string $class_name): ?ModuleInterface |
| 521 | 521 | { |
| 522 | 522 | return $this->all() |
| 523 | - ->filter(function (ModuleInterface $module) use ($class_name): bool { |
|
| 523 | + ->filter(function (ModuleInterface $module) use ($class_name) : bool { |
|
| 524 | 524 | return $module->isEnabled() && $module instanceof $class_name; |
| 525 | 525 | }) |
| 526 | 526 | ->first(); |
@@ -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, |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | $length = (int) $request->get('length'); |
| 121 | 121 | |
| 122 | 122 | // Files within this folder |
| 123 | - $media_folder = $request->get('media_folder', ''); |
|
| 123 | + $media_folder = $request->get('media_folder', ''); |
|
| 124 | 124 | |
| 125 | 125 | // subfolders within $media_path |
| 126 | 126 | $subfolders = $request->get('subfolders', ''); // include|exclude |
@@ -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 | 'dir' => 'ltr', |
@@ -148,14 +148,14 @@ 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 | ]; |
| 155 | 155 | $input['control'] = '<input ' . Html::attributes($attributes) . '>'; |
| 156 | 156 | break; |
| 157 | 157 | case 'checkbox': |
| 158 | - $attributes += [ |
|
| 158 | + $attributes += [ |
|
| 159 | 159 | 'type' => 'checkbox', |
| 160 | 160 | 'checked' => (bool) $input['default'], |
| 161 | 161 | ]; |
@@ -320,14 +320,14 @@ discard block |
||
| 320 | 320 | case 'sis': |
| 321 | 321 | case 'sib': |
| 322 | 322 | $table[$x + 1][$y] = '<div style="background:url(' . e(asset('css/images/hline.png')) . ') 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>'; |
| 323 | - $x += 2; |
|
| 323 | + $x += 2; |
|
| 324 | 324 | break; |
| 325 | 325 | case 'son': |
| 326 | 326 | case 'dau': |
| 327 | 327 | case 'chi': |
| 328 | 328 | if ($n > 2 && preg_match('/fat|mot|par/', $relationships[$n - 2])) { |
| 329 | 329 | $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>'; |
| 330 | - $x += 2; |
|
| 330 | + $x += 2; |
|
| 331 | 331 | } else { |
| 332 | 332 | $table[$x][$y - 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
| 333 | 333 | ->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>'; |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | case 'par': |
| 340 | 340 | if ($n > 2 && preg_match('/son|dau|chi/', $relationships[$n - 2])) { |
| 341 | 341 | $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>'; |
| 342 | - $x += 2; |
|
| 342 | + $x += 2; |
|
| 343 | 343 | } else { |
| 344 | 344 | $table[$x][$y + 1] = '<div style="background:url(' . app()->make(ModuleThemeInterface::class) |
| 345 | 345 | ->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>'; |
@@ -480,17 +480,17 @@ discard block |
||
| 480 | 480 | */ |
| 481 | 481 | private function oldStyleRelationshipPath(Tree $tree, array $path): array |
| 482 | 482 | { |
| 483 | - $spouse_codes = [ |
|
| 483 | + $spouse_codes = [ |
|
| 484 | 484 | 'M' => 'hus', |
| 485 | 485 | 'F' => 'wif', |
| 486 | 486 | 'U' => 'spo', |
| 487 | 487 | ]; |
| 488 | - $parent_codes = [ |
|
| 488 | + $parent_codes = [ |
|
| 489 | 489 | 'M' => 'fat', |
| 490 | 490 | 'F' => 'mot', |
| 491 | 491 | 'U' => 'par', |
| 492 | 492 | ]; |
| 493 | - $child_codes = [ |
|
| 493 | + $child_codes = [ |
|
| 494 | 494 | 'M' => 'son', |
| 495 | 495 | 'F' => 'dau', |
| 496 | 496 | 'U' => 'chi', |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function sidebarTitle(): string { |
| 64 | - return $this->title(); |
|
| 64 | + return $this->title(); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |