fisharebest / webtrees

app/Http/Controllers/BranchesController.php

Spacing +2 added lines, -2 removed lines

@@ -261,7 +261,7 @@ 
         $sosa = array_search($individual, $ancestors, true);
         if (is_int($sosa) && $module instanceof RelationshipsChartModule) {
             $sosa_class = 'search_hit';
-            $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' .  I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
+            $sosa_html = '<a class="details1 ' . $individual->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
         } else {
             $sosa_class = '';
             $sosa_html  = '';
@@ -297,7 +297,7 @@ 
                     $sosa = array_search($spouse, $ancestors, true);
                     if (is_int($sosa) && $module instanceof RelationshipsChartModule) {
                         $sosa_class = 'search_hit';
-                        $sosa_html  = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' .  I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
+                        $sosa_html  = '<a class="details1 ' . $spouse->getBoxStyle() . '" href="' . e($module->chartUrl($individual, ['xref2' => $individuals[1]->xref()])) . '" rel="nofollow" title="' . I18N::translate('Relationships') . '">' . I18N::number($sosa) . '</a>' . self::sosaGeneration($sosa);
                     } else {
                         $sosa_class = '';
                         $sosa_html  = '';

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

app/Stats.php

Spacing +28 added lines, -28 removed lines

@@ -734,11 +734,11 @@ 
                 }
             }
             if ($types) {
-                $sql  .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
+                $sql .= ' AND d_fact IN (' . implode(', ', array_fill(0, count($types), '?')) . ')';
                 $vars = array_merge($vars, $types);
             }
         }
-        $sql  .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
+        $sql .= ' AND d_fact NOT IN (' . implode(', ', array_fill(0, count($no_types), '?')) . ')';
         $vars = array_merge($vars, $no_types);
 
         $n = (int) Database::prepare($sql)->execute($vars)->fetchOne();
@@ -980,12 +980,12 @@ 
         }
 
         if ($tot_u > 0) {
-            $chd         = $this->arrayToExtendedEncoding([
+            $chd = $this->arrayToExtendedEncoding([
                 intdiv(4095 * $tot_u, $tot),
                 intdiv(4095 * $tot_f, $tot),
                 intdiv(4095 * $tot_m, $tot),
             ]);
-            $chl         =
+            $chl =
                 I18N::translateContext('unknown people', 'Unknown') . ' - ' . $per_u . '|' .
                 I18N::translate('Females') . ' - ' . $per_f . '|' .
                 I18N::translate('Males') . ' - ' . $per_m;
@@ -997,7 +997,7 @@ 
             return "<img src=\"https://chart.googleapis.com/chart?cht=p3&amp;chd=e:{$chd}&amp;chs={$size}&amp;chco={$color_unknown},{$color_female},{$color_male}&amp;chf=bg,s,ffffff00&amp;chl={$chl}\" width=\"{$sizes[0]}\" height=\"{$sizes[1]}\" alt=\"" . $chart_title . '" title="' . $chart_title . '" />';
         }
 
-        $chd         = $this->arrayToExtendedEncoding([
+        $chd = $this->arrayToExtendedEncoding([
             intdiv(4095 * $tot_f, $tot),
             intdiv(4095 * $tot_m, $tot),
         ]);
@@ -1112,7 +1112,7 @@ 
             return '';
         }
 
-        $chd         = $this->arrayToExtendedEncoding([
+        $chd = $this->arrayToExtendedEncoding([
             intdiv(4095 * $tot_l, $tot),
             intdiv(4095 * $tot_d, $tot),
         ]);
@@ -1176,12 +1176,12 @@ 
             if ($type == 'unknown') {
                 // There has to be a better way then this :(
                 foreach ($this->media_types as $t) {
-                    $sql    .= " AND (m_gedcom NOT LIKE ? AND m_gedcom NOT LIKE ?)";
+                    $sql .= " AND (m_gedcom NOT LIKE ? AND m_gedcom NOT LIKE ?)";
                     $vars[] = "%3 TYPE {$t}%";
                     $vars[] = "%1 _TYPE {$t}%";
                 }
             } else {
-                $sql    .= " AND (m_gedcom LIKE ? OR m_gedcom LIKE ?)";
+                $sql .= " AND (m_gedcom LIKE ? OR m_gedcom LIKE ?)";
                 $vars[] = "%3 TYPE {$type}%";
                 $vars[] = "%1 _TYPE {$type}%";
             }
@@ -2001,7 +2001,7 @@ 
             $tot   = 0;
             foreach ($rows as $values) {
                 $values->total = (int) $values->total;
-                $tot           += $values->total;
+                $tot += $values->total;
             }
             // Beware divide by zero
             if ($tot == 0) {
@@ -2010,7 +2010,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = intdiv(100 * $values->total, $tot);
+                $counts[] = intdiv(100 * $values->total, $tot);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -2087,7 +2087,7 @@ 
             $tot   = 0;
             foreach ($rows as $values) {
                 $values->total = (int) $values->total;
-                $tot           += $values->total;
+                $tot += $values->total;
             }
             // Beware divide by zero
             if ($tot == 0) {
@@ -2096,7 +2096,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = intdiv(100 * $values->total, $tot);
+                $counts[] = intdiv(100 * $values->total, $tot);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -2475,7 +2475,7 @@ 
             $sex_search = '';
         }
 
-        $rows  = $this->runSql(
+        $rows = $this->runSql(
             "SELECT" .
             " birth.d_gid AS id," .
             " MIN(birth.d_julianday1) AS age" .
@@ -3332,7 +3332,7 @@ 
             " GROUP BY family" .
             " ORDER BY age {$age_dir}"
         );
-        $rows  = [];
+        $rows = [];
         foreach ($drows as $family) {
             $rows[$family->family] = $family->age;
         }
@@ -3644,7 +3644,7 @@ 
 
             foreach ($rows as $values) {
                 $values->total = (int) $values->total;
-                $tot           += (int) $values->total;
+                $tot += (int) $values->total;
             }
             // Beware divide by zero
             if ($tot === 0) {
@@ -3653,7 +3653,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = intdiv(100 * $values->total, $tot);
+                $counts[] = intdiv(100 * $values->total, $tot);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -3732,7 +3732,7 @@ 
             $tot   = 0;
             foreach ($rows as $values) {
                 $values->total = (int) $values->total;
-                $tot           += $values->total;
+                $tot += $values->total;
             }
             // Beware divide by zero
             if ($tot === 0) {
@@ -3741,7 +3741,7 @@ 
             $centuries = '';
             $counts    = [];
             foreach ($rows as $values) {
-                $counts[]  = intdiv(100 * $values->total, $tot);
+                $counts[] = intdiv(100 * $values->total, $tot);
                 $centuries .= $this->centuryName($values->century) . ' - ' . I18N::number($values->total) . '|';
             }
             $chd = $this->arrayToExtendedEncoding($counts);
@@ -4011,7 +4011,7 @@ 
                 if ($sizes[0] < 1000) {
                     $sizes[0] += 50;
                 }
-                $chxl    .= $this->centuryName($century) . '|';
+                $chxl .= $this->centuryName($century) . '|';
                 $average = 0;
                 if (isset($values['F'])) {
                     if ($max <= 50) {
@@ -4730,7 +4730,7 @@ 
             if ($type == 'list') {
                 if ($one && !in_array($fam->family, $dist)) {
                     if ($child1->canShow() && $child2->canShow()) {
-                        $return  = '<li>';
+                        $return = '<li>';
                         $return  .= '<a href="' . e($child2->url()) . '">' . $child2->getFullName() . '</a> ';
                         $return  .= I18N::translate('and') . ' ';
                         $return  .= '<a href="' . e($child1->url()) . '">' . $child1->getFullName() . '</a>';
@@ -4741,7 +4741,7 @@ 
                         $dist[]  = $fam->family;
                     }
                 } elseif (!$one && $child1->canShow() && $child2->canShow()) {
-                    $return  = '<li>';
+                    $return = '<li>';
                     $return  .= '<a href="' . e($child2->url()) . '">' . $child2->getFullName() . '</a> ';
                     $return  .= I18N::translate('and') . ' ';
                     $return  .= '<a href="' . e($child1->url()) . '">' . $child1->getFullName() . '</a>';
@@ -4936,7 +4936,7 @@ 
         $tot = 0;
         foreach ($rows as $row) {
             $row->tot = (int) $row->tot;
-            $tot      += $row->tot;
+            $tot += $row->tot;
         }
         $chd = '';
         $chl = [];
@@ -4948,7 +4948,7 @@ 
                 } else {
                     $per = intdiv(100 * $row->tot, $tot);
                 }
-                $chd   .= $this->arrayToExtendedEncoding([$per]);
+                $chd .= $this->arrayToExtendedEncoding([$per]);
                 $chl[] = htmlspecialchars_decode(strip_tags($family->getFullName())) . ' - ' . I18N::number($row->tot);
             }
         }
@@ -5604,7 +5604,7 @@ 
             $max_name  = 0;
             $top_name  = '';
             foreach ($surns as $spfxsurn => $count) {
-                $per       = $count;
+                $per = $count;
                 $count_per += $per;
                 // select most common surname from all variants
                 if ($per > $max_name) {
@@ -5628,11 +5628,11 @@ 
                     ], $top_name);
             }
             $per   = intdiv(100 * $count_per, $tot_indi);
-            $chd   .= $this->arrayToExtendedEncoding([$per]);
+            $chd .= $this->arrayToExtendedEncoding([$per]);
             $chl[] = $top_name . ' - ' . I18N::number($count_per);
         }
         $per   = intdiv(100 * ($tot_indi - $tot), $tot_indi);
-        $chd   .= $this->arrayToExtendedEncoding([$per]);
+        $chd .= $this->arrayToExtendedEncoding([$per]);
         $chl[] = I18N::translate('Other') . ' - ' . I18N::number($tot_indi - $tot);
 
         $chart_title = implode(I18N::$list_separator, $chl);
@@ -6029,11 +6029,11 @@ 
             } else {
                 $per = intdiv(100 * $count, $tot_indi);
             }
-            $chd   .= $this->arrayToExtendedEncoding([$per]);
+            $chd .= $this->arrayToExtendedEncoding([$per]);
             $chl[] = $givn . ' - ' . I18N::number($count);
         }
         $per   = intdiv(100 * ($tot_indi - $tot), $tot_indi);
-        $chd   .= $this->arrayToExtendedEncoding([$per]);
+        $chd .= $this->arrayToExtendedEncoding([$per]);
         $chl[] = I18N::translate('Other') . ' - ' . I18N::number($tot_indi - $tot);
 
         $chart_title = implode(I18N::$list_separator, $chl);