@@ -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', |
@@ -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 |