fisharebest / webtrees

app/Http/Controllers/Admin/LocationController.php

Spacing +2 added lines, -2 removed lines

@@ -315,14 +315,14 @@
 
         if ($place_id === 0) {
             $breadcrumbs[]   = I18N::translate('Add');
-            $title           .= ' — ' . I18N::translate('Add');
+            $title .= ' — ' . I18N::translate('Add');
             $latitude        = '';
             $longitude       = '';
             $map_bounds      = $parent->boundingRectangle();
             $marker_position = [$parent->latitude(), $parent->longitude()];
         } else {
             $breadcrumbs[]   = I18N::translate('Edit');
-            $title           .= ' — ' . I18N::translate('Edit');
+            $title .= ' — ' . I18N::translate('Edit');
             $latitude        = $location->latitude();
             $longitude       = $location->longitude();
             $map_bounds      = $location->boundingRectangle();

app/Functions/FunctionsPrintFacts.php

Spacing +2 added lines, -2 removed lines

@@ -583,7 +583,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (!str_contains($match[$j][1], '@')) {
                 $source = e($match[$j][1] . preg_replace('/\n\d CONT ?/', "\n", $match[$j][2]));
-                $data   .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
+                $data .= '<div class="fact_SOUR"><span class="label">' . I18N::translate('Source') . ':</span> <span class="field" dir="auto">' . Filter::formatText($source, $tree) . '</span></div>';
             }
         }
         // Find source for each fact
@@ -601,7 +601,7 @@ 
                     }
                     $srec     = substr($factrec, $spos1, $spos2 - $spos1);
                     $lt       = preg_match_all("/$nlevel \w+/", $srec, $matches);
-                    $data     .= '<div class="fact_SOUR">';
+                    $data .= '<div class="fact_SOUR">';
                     $id       = 'collapse-' . Uuid::uuid4()->toString();
                     $expanded = (bool) $tree->getPreference('EXPAND_SOURCES');
                     if ($lt > 0) {

app/Http/Controllers/Admin/MediaController.php

Spacing +4 added lines, -4 removed lines

@@ -152,7 +152,7 @@ 
         $data_filesystem = $request->getAttribute('filesystem.data');
         assert($data_filesystem instanceof FilesystemInterface);
 
-        $files  = $request->getQueryParams()['files']; // local|external|unused
+        $files = $request->getQueryParams()['files']; // local|external|unused
 
         // Files within this folder
         $media_folder = $request->getQueryParams()['media_folder'];
@@ -266,7 +266,7 @@ 
                     $create_form = '';
                     foreach ($media_trees as $media_tree => $media_directory) {
                         if (str_starts_with($row[0], $media_directory)) {
-                            $tmp         = substr($row[0], strlen($media_directory));
+                            $tmp = substr($row[0], strlen($media_directory));
                             $create_form .=
                                 '<p><a href="#" data-toggle="modal" data-target="#modal-create-media-from-file" data-file="' . e($tmp) . '" data-url="' . e(route('create-media-from-file', ['tree' => $media_tree])) . '" onclick="document.getElementById(\'modal-create-media-from-file-form\').action=this.dataset.url; document.getElementById(\'file\').value=this.dataset.file;">' . I18N::translate('Create') . '</a> — ' . e($media_tree) . '<p>';
                         }
@@ -360,8 +360,8 @@ 
             try {
                 // This will work for local filesystems.  For remote filesystems, we will
                 // need to copy the file locally to work out the image size.
-                $imgsize = getimagesize(Webtrees::DATA_DIR .  $file);
-                $html    .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
+                $imgsize = getimagesize(Webtrees::DATA_DIR . $file);
+                $html .= '<dt>' . I18N::translate('Image dimensions') . '</dt>';
                 /* I18N: image dimensions, width × height */
                 $html .= '<dd>' . I18N::translate('%1$s × %2$s pixels', I18N::number($imgsize['0']), I18N::number($imgsize['1'])) . '</dd>';
             } catch (Throwable $ex) {

app/Module/BranchesListModule.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
 {
     use ModuleListTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/branches{/surname}';
+    protected const ROUTE_URL = '/tree/{tree}/branches{/surname}';
 
     /** @var ModuleService */
     protected $module_service;

app/Module/IndividualListModule.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 {
     use ModuleListTrait;
 
-    protected const ROUTE_URL  = '/tree/{tree}/individual-list';
+    protected const ROUTE_URL = '/tree/{tree}/individual-list';
 
     /** @var LocalizationService */
     private $localization_service;
@@ -199,7 +199,7 @@ 
         $alpha = $params['alpha'] ?? '';
 
         // All individuals with this surname
-        $surname = $params['surname'] ??  '';
+        $surname = $params['surname'] ?? '';
 
         // All individuals
         $show_all = $params['show_all'] ?? 'no';
@@ -252,7 +252,7 @@ 
                     'tree'     => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $params['show'] ?? 'surn';
+                $show = $params['show'] ?? 'surn';
             }
         } elseif ($surname !== '') {
             $alpha    = $this->localization_service->initialLetter($surname, I18N::locale()); // so we can highlight the initial letter

Braces +3 added lines, -1 removed lines

@@ -326,7 +326,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e($this->listUrl($tree, ['alpha' => $letter, 'tree' => $tree->name()])) ?>" class="wt-initial px-1<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial px-1 text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -380,6 +381,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->surnames($tree, $surname, $alpha, $show_marnm === 'yes', $families, I18N::locale());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {