fisharebest / webtrees

app/Functions/FunctionsPrint.php

Spacing +6 added lines, -6 removed lines

@@ -172,7 +172,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->gedcom();
                         $nt      = preg_match("/0 @$nmatch[1]@ NOTE (.*)/", $noterec, $n1match);
-                        $data    .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
+                        $data .= self::printNoteRecord($tree, $nt > 0 ? $n1match[1] : '', 1, $noterec);
                     }
                 } else {
                     $data = '<div class="fact_NOTE"><span class="label">' . I18N::translate('Note') . '</span>: <span class="field error">' . $nmatch[1] . '</span></div>';
@@ -272,7 +272,7 @@ 
                         }
                     },
                     $age_string
-                ) ;
+                );
         }
     }
 
@@ -336,7 +336,7 @@ 
                     $ageText = '';
                     if ($fact === 'DEAT' || Date::compare($date, $death_date) <= 0 || !$record->isDead()) {
                         // Before death, print age
-                        $age = (new Age($birth_date, $date))->ageAtEvent(false,$record->sex());
+                        $age = (new Age($birth_date, $date))->ageAtEvent(false, $record->sex());
                         // Only show calculated age if it differs from recorded age
                         if ($age !== '') {
                             if ($fact_age !== '' && $fact_age !== $age) {
@@ -406,20 +406,20 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->fullName();
+                        $html .= ' - ' . $wt_place->fullName();
                     }
                 }
                 $map_lati = '';
                 $cts      = preg_match('/\d LATI (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_lati = $match[1];
-                    $html     .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
+                    $html .= '<br><span class="label">' . I18N::translate('Latitude') . ': </span>' . $map_lati;
                 }
                 $map_long = '';
                 $cts      = preg_match('/\d LONG (.*)/', $placerec, $match);
                 if ($cts > 0) {
                     $map_long = $match[1];
-                    $html     .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
+                    $html .= ' <span class="label">' . I18N::translate('Longitude') . ': </span>' . $map_long;
                 }
                 if ($map_lati && $map_long) {
                     $map_lati = trim(strtr($map_lati, 'NSEW,�', ' - -. ')); // S5,6789 ==> -5.6789

app/Http/RequestHandlers/IndividualPage.php

Spacing +2 added lines, -2 removed lines

@@ -111,11 +111,11 @@
 
         if ($individual->isDead()) {
             // If dead, show age at death
-            $age = (new Age($bdate, $ddate))->ageAtEvent(false,$individual->sex());
+            $age = (new Age($bdate, $ddate))->ageAtEvent(false, $individual->sex());
         } else {
             // If living, show age today
             $today = strtoupper(date('d M Y'));
-            $age   = (new Age($bdate, new Date($today)))->ageAtEvent(true,$individual->sex());
+            $age   = (new Age($bdate, new Date($today)))->ageAtEvent(true, $individual->sex());
         }
 
         // What images are linked to this individual

app/Functions/FunctionsPrintFacts.php

Spacing +4 added lines, -4 removed lines

@@ -531,14 +531,14 @@ 
                 }
 
                 // Compute age of associated Person at the event (Person BIRT is mandatory )
-                $ageOfAssociated ="";
+                $ageOfAssociated = "";
                 if (preg_match('/\n2 DATE (.+)/', $event->gedcom(), $match1)) {
                     if (preg_match('/\n1 BIRT/', $person->gedcom(), $match)) {
                         preg_match('/\n2 DATE (.+)/', $person->gedcom(), $match2);
                         $isLiving = !preg_match('/\n1 DEAT/', $person->gedcom(), $match3);
                         $dateEvent = new Date($match1[1]);
                         $dateAssoP = new Date($match2[1]);
-                        $ageOfAssociated   = (new Age($dateAssoP, $dateEvent))->ageAtEvent($isLiving,$person->sex());
+                        $ageOfAssociated = (new Age($dateAssoP, $dateEvent))->ageAtEvent($isLiving, $person->sex());
                     }
                 }
                 $values = ['<a href="' . e($person->url()) . '">' . $person->fullName() . '<i> ' . $ageOfAssociated . '</i>' . '</a>'];
@@ -602,7 +602,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
@@ -620,7 +620,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/RequestHandlers/TreePreferencesAction.php

Braces +7 added lines, -7 removed lines

@@ -40,8 +40,8 @@ 
 /**

  * Edit the tree preferences.

  */

-class TreePreferencesAction implements RequestHandlerInterface

-{

+class TreePreferencesAction implements RequestHandlerInterface
+{
     /**

      * @param ServerRequestInterface $request

      *

@@ -119,8 +119,8 @@ 
 

         $gedcom = $params['gedcom'] ?? '';

 

-        if ($gedcom !== '' && $gedcom !== $tree->name()) {

-            try {

+        if ($gedcom !== '' && $gedcom !== $tree->name()) {
+            try {
                 DB::table('gedcom')

                     ->where('gedcom_id', '=', $tree->id())

                     ->update(['gedcom_name' => $gedcom]);

@@ -129,7 +129,7 @@ 
                     ->where('setting_name', '=', 'DEFAULT_GEDCOM')

                     ->where('setting_value', '=', $tree->name())

                     ->update(['setting_value' => $gedcom]);

-            } catch (Exception $ex) {

+            } catch (Exception $ex) {
                 // Probably a duplicate name.

             }

         }

@@ -140,11 +140,11 @@ 
         $all_trees = $params['all_trees'] ?? '';

         $new_trees = $params['new_trees'] ?? '';

 

-        if ($all_trees === 'on') {

+        if ($all_trees === 'on') {
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.'), 'success');

         }

 

-        if ($new_trees === 'on') {

+        if ($new_trees === 'on') {
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.'), 'success');

         }

 

app/Schema/SeedGedcomSettingTable.php

Braces +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@ 
 /**

  * Populate the gedcom_setting table

  */

-class SeedGedcomSettingTable implements SeedInterface

-{

+class SeedGedcomSettingTable implements SeedInterface
+{
     private const DEFAULT_SETTINGS = [

         'ADVANCED_NAME_FACTS'          => 'NICK,_AKA',

         'ADVANCED_PLAC_FACTS'          => '',

@@ -114,7 +114,7 @@ 
     public function run(): void

     {

         // Set default settings for new trees

-        foreach (self::DEFAULT_SETTINGS as $setting_name => $setting_value) {

+        foreach (self::DEFAULT_SETTINGS as $setting_name => $setting_value) {
             DB::table('gedcom_setting')->updateOrInsert([

                 'gedcom_id'     => -1,

                 'setting_name'  => $setting_name,