fisharebest / webtrees

app/Module/FrequentlyAskedQuestionsModule.php

Indentation +13 added lines, -13 removed lines

@@ -399,19 +399,19 @@
     private function faqsExist(Tree $tree, string $language): bool
     {
         return DB::table('block')
-             ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id')
-             ->where('module_name', '=', $this->name())
-             ->where('setting_name', '=', 'languages')
-             ->where(function (Builder $query) use ($tree): void {
-                 $query
-                     ->whereNull('gedcom_id')
-                     ->orWhere('gedcom_id', '=', $tree->id());
-             })
-             ->select(['setting_value AS languages'])
-             ->get()
-             ->filter(function (stdClass $faq) use ($language): bool {
-                 return $faq->languages === '' || in_array($language, explode(',', $faq->languages));
-             })
+                ->join('block_setting', 'block_setting.block_id', '=', 'block.block_id')
+                ->where('module_name', '=', $this->name())
+                ->where('setting_name', '=', 'languages')
+                ->where(function (Builder $query) use ($tree): void {
+                    $query
+                        ->whereNull('gedcom_id')
+                        ->orWhere('gedcom_id', '=', $tree->id());
+                })
+                ->select(['setting_value AS languages'])
+                ->get()
+                ->filter(function (stdClass $faq) use ($language): bool {
+                    return $faq->languages === '' || in_array($language, explode(',', $faq->languages));
+                })
             ->isNotEmpty();
     }
 }

app/Module/PedigreeChartModule.php

Spacing +2 added lines, -2 removed lines

@@ -416,7 +416,7 @@ 
             $html = sprintf('<div id="childarrow"><a href="#" class="menuselect %s"></a><div id="childbox-pedigree">', $this->arrows->menu);
 
             foreach ($families as $family) {
-                $html   .= '<span class="name1">' . I18N::translate('Family') . '</span>';
+                $html .= '<span class="name1">' . I18N::translate('Family') . '</span>';
                 $spouse = $family->getSpouse($root);
                 if ($spouse) {
                     $html .= '<a class="name1" href="' . e($this->chartUrl($spouse, ['generations' => $generations, 'orientation' => $orientation])) . '">' . $spouse->getFullName() . '</a>';
@@ -462,7 +462,7 @@ 
         $html = '';
         if ($chart_has_ancestors) {
             if ($this->nodes[$index]['indi'] && $this->nodes[$index]['indi']->getChildFamilies()) {
-                $html         .= '<div class="ancestorarrow">';
+                $html .= '<div class="ancestorarrow">';
                 $rootParentId = 1;
                 if ($index > (int) ($this->treesize / 2) + (int) ($this->treesize / 4)) {
                     $rootParentId++;

app/Module/ChartsBlockModule.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
                         'generations' => 3,
                         'layout'      => PedigreeChartModule::PORTRAIT,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);
@@ -110,7 +110,7 @@ 
                         'generations' => 2,
                         'chart_style' => DescendancyChartModule::CHART_STYLE_LIST,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);
@@ -124,7 +124,7 @@ 
                         'ajax'        => true,
                         'generations' => 2,
                     ]);
-                    $content   = view('modules/charts/chart', [
+                    $content = view('modules/charts/chart', [
                         'block_id'  => $block_id,
                         'chart_url' => $chart_url,
                     ]);

app/Http/Controllers/AdminController.php

Spacing +1 added lines, -1 removed lines

@@ -560,7 +560,7 @@
         $data = array_map(function (string $thumbnail): array {
             $original = $this->findOriginalFileFromThumbnail($thumbnail);
 
-            $original_url  = route('unused-media-thumbnail', [
+            $original_url = route('unused-media-thumbnail', [
                 'folder' => dirname($original),
                 'file'   => basename($original),
                 'w'      => 100,

app/Functions/FunctionsExport.php

Spacing +3 added lines, -3 removed lines

@@ -103,11 +103,11 @@
         $record = GedcomRecord::getInstance('HEAD', $tree);
         $fact = $record->getFirstFact('COPR');
         if ($fact instanceof Fact) {
-            $COPR = "\n1 COPR " .$fact->value();
+            $COPR = "\n1 COPR " . $fact->value();
         }
-        $fact   = $record->getFirstFact('LANG');
+        $fact = $record->getFirstFact('LANG');
         if ($fact instanceof Fact) {
-            $LANG = "\n1 LANG " .$fact->value();
+            $LANG = "\n1 LANG " . $fact->value();
         }
         // Link to actual SUBM/SUBN records, if they exist
         $subn = DB::table('other')

app/Census/CensusColumnNationality.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         }
 
         // Did we emigrate or naturalise?
-        foreach ($individual->facts(['IMMI' ,'EMIG', 'NATU'], true) as $fact) {
+        foreach ($individual->facts(['IMMI', 'EMIG', 'NATU'], true) as $fact) {
             if (Date::compare($fact->date(), $this->date()) <= 0) {
                 $place = $fact->place()->gedcomName();
             }

app/Http/Controllers/Admin/LocationController.php

Spacing +1 added lines, -1 removed lines

@@ -519,7 +519,7 @@
         // ... and process the differences
         $inserted = 0;
         if ($diff->isNotEmpty()) {
-            $nextRecordId    = 1 + (int) DB::table('placelocation')->max('pl_id');
+            $nextRecordId = 1 + (int) DB::table('placelocation')->max('pl_id');
 
             foreach ($diff as $place) {
                 // For Westminster, London, England, we must also create England and London, England

Braces +4 added lines, -2 removed lines

@@ -342,9 +342,11 @@
             'fqpn',
         ];
 
-        if ($serverfile !== '') {  // first choice is file on server
+        if ($serverfile !== '') {
+// first choice is file on server
             $filename = WT_DATA_DIR . 'places/' . $serverfile;
-        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) { // 2nd choice is local file
+        } elseif ($_FILES['localfile']['error'] === UPLOAD_ERR_OK) {
+// 2nd choice is local file
             $filename = $_FILES['localfile']['tmp_name'];
         }
 

app/Statistics/Google/ChartIndividual.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
         $color_from = $color_from ?? $chart_color1;
         $color_to   = $color_to ?? $chart_color2;
 
-        $sizes    = explode('x', $size);
+        $sizes = explode('x', $size);
 
         if ($tot_indi === 0) {
             return '';

app/Statistics/Google/ChartAge.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
             $decades .= '|' . I18N::number($i);
         }
 
-        $chxl  .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
+        $chxl .= '1:||' . I18N::translate('century') . '|2:' . $decades . '|3:||' . I18N::translate('Age') . '|';
         $title = I18N::translate('Average age related to death century');
 
         if (\count($rows) > 6 || mb_strlen($title) < 30) {

Indentation +7 added lines, -7 removed lines

@@ -65,11 +65,11 @@ 
                     ->on('birth.d_file', '=', 'i_file')
                     ->on('birth.d_gid', '=', 'i_id');
             })
-           ->join('dates AS death', function (JoinClause $join): void {
-               $join
+            ->join('dates AS death', function (JoinClause $join): void {
+                $join
                     ->on('death.d_file', '=', 'i_file')
                     ->on('death.d_gid', '=', 'i_id');
-           })
+            })
             ->where('i_file', '=', $this->tree->id())
             ->where('birth.d_fact', '=', 'BIRT')
             ->where('death.d_fact', '=', 'DEAT')
@@ -162,10 +162,10 @@ 
         }
 
         $chart_url = 'https://chart.googleapis.com/chart?cht=bvg&chs=' . $sizes[0] . 'x' . $sizes[1]
-             . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt='
-             . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl='
-             . rawurlencode($chxl) . '&chdl='
-             . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death'));
+                . '&chm=D,FF0000,2,0,3,1|N*f1*,000000,0,-1,11,1|N*f1*,000000,1,-1,11,1&chf=bg,s,ffffff00|c,s,ffffff00&chtt='
+                . rawurlencode($chtt) . '&chd=' . $chd . '&chco=0000FF,FFA0CB,FF0000&chbh=20,3&chxt=x,x,y,y&chxl='
+                . rawurlencode($chxl) . '&chdl='
+                . rawurlencode(I18N::translate('Males') . '|' . I18N::translate('Females') . '|' . I18N::translate('Average age at death'));
 
         return view(
             'statistics/other/chart-google',