fisharebest / webtrees

app/Census/CensusColumnAgeMale.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         if ($individual->getSex() === 'F') {
             return '';
         } else {
-            return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+            return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
         }
     }
 }

app/User.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function __construct(stdClass $user)
     {
-        $this->user_id = (int)$user->user_id;
+        $this->user_id = (int) $user->user_id;
         $this->user_name = $user->user_name;
         $this->real_name = $user->real_name;
         $this->email = $user->email;
@@ -105,7 +105,7 @@ 
         Database::prepare("DELETE `##block_setting` FROM `##block_setting` JOIN `##block` USING (block_id) WHERE user_id=?")->execute([$this->user_id]);
         Database::prepare("DELETE FROM `##block` WHERE user_id=?")->execute([$this->user_id]);
         Database::prepare("DELETE FROM `##user_gedcom_setting` WHERE user_id=?")->execute([$this->user_id]);
-        Database::prepare("DELETE FROM `##gedcom_setting` WHERE setting_value=? AND setting_name IN ('CONTACT_USER_ID', 'WEBMASTER_USER_ID')")->execute([(string)$this->user_id]);
+        Database::prepare("DELETE FROM `##gedcom_setting` WHERE setting_value=? AND setting_name IN ('CONTACT_USER_ID', 'WEBMASTER_USER_ID')")->execute([(string) $this->user_id]);
         Database::prepare("DELETE FROM `##user_setting` WHERE user_id=?")->execute([$this->user_id]);
         Database::prepare("DELETE FROM `##message` WHERE user_id=?")->execute([$this->user_id]);
         Database::prepare("DELETE FROM `##user` WHERE user_id=?")->execute([$this->user_id]);

app/Place.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
      */
     public function getShortName()
     {
-        $SHOW_PEDIGREE_PLACES = (int)$this->tree->getPreference('SHOW_PEDIGREE_PLACES');
+        $SHOW_PEDIGREE_PLACES = (int) $this->tree->getPreference('SHOW_PEDIGREE_PLACES');
 
         if ($SHOW_PEDIGREE_PLACES >= count($this->gedcom_place)) {
             // A short place name - no need to abbreviate

app/Functions/FunctionsPrint.php

Spacing +7 added lines, -7 removed lines

@@ -139,7 +139,7 @@ 
                     if ($note->canShow()) {
                         $noterec = $note->getGedcom();
                         $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>';
@@ -385,35 +385,35 @@ 
                 if (preg_match_all('/\n3 (?:_HEB|ROMN) (.+)/', $placerec, $matches)) {
                     foreach ($matches[1] as $match) {
                         $wt_place = new Place($match, $tree);
-                        $html     .= ' - ' . $wt_place->getFullName();
+                        $html .= ' - ' . $wt_place->getFullName();
                     }
                 }
                 $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
                     $map_long = trim(strtr($map_long, 'NSEW,�', ' - -. ')); // E3.456� ==> 3.456
-                    $html     .= FontAwesome::linkIcon('google-maps', I18N::translate('Google Maps™'), [
+                    $html .= FontAwesome::linkIcon('google-maps', I18N::translate('Google Maps™'), [
                         'class' => 'btn btn-link',
                         'url'   => 'https://maps.google.com/maps?q=' . $map_lati . ',' . $map_long,
                         'rel'   => 'nofollow',
                     ]);
-                    $html     .= FontAwesome::linkIcon('bing-maps', I18N::translate('Bing Maps™'), [
+                    $html .= FontAwesome::linkIcon('bing-maps', I18N::translate('Bing Maps™'), [
                         'class' => 'btn btn-link',
                         'url'   => 'https://www.bing.com/maps/?lvl=15&cp=' . $map_lati . '~' . $map_long,
                         'rel'   => 'nofollow',
                     ]);
-                    $html     .= FontAwesome::linkIcon('openstreetmap', I18N::translate('OpenStreetMap™'), [
+                    $html .= FontAwesome::linkIcon('openstreetmap', I18N::translate('OpenStreetMap™'), [
                         'class' => 'btn btn-link',
                         'url'   => 'https://www.openstreetmap.org/#map=15/' . $map_lati . '/' . $map_long,
                         'rel'   => 'nofollow',

Indentation +4 added lines, -4 removed lines

@@ -345,10 +345,10 @@
         }
         // print gedcom ages
         foreach ([
-             I18N::translate('Age')     => $fact_age,
-             I18N::translate('Husband') => $husb_age,
-             I18N::translate('Wife')    => $wife_age,
-         ] as $label => $age) {
+                I18N::translate('Age')     => $fact_age,
+                I18N::translate('Husband') => $husb_age,
+                I18N::translate('Wife')    => $wife_age,
+            ] as $label => $age) {
             if ($age != '') {
                 $html .= ' <span class="label">' . $label . ':</span> <span class="age">' . FunctionsDate::getAgeAtEvent($age) . '</span>';
             }

app/Functions/FunctionsPrintFacts.php

Spacing +4 added lines, -4 removed lines

@@ -175,14 +175,14 @@ 
         switch ($fact->getTag()) {
             case '_BIRT_CHIL':
                 $children[$fact->getParent()->getXref()] = true;
-                $label                                   .= '<br>' . /* I18N: Abbreviation for "number %s" */
+                $label .= '<br>' . /* I18N: Abbreviation for "number %s" */
                     I18N::translate('#%s', count($children));
                 break;
             case '_BIRT_GCHI':
             case '_BIRT_GCH1':
             case '_BIRT_GCH2':
                 $grandchildren[$fact->getParent()->getXref()] = true;
-                $label                                        .= '<br>' . /* I18N: Abbreviation for "number %s" */
+                $label .= '<br>' . /* I18N: Abbreviation for "number %s" */
                     I18N::translate('#%s', count($grandchildren));
                 break;
         }
@@ -577,7 +577,7 @@ 
         for ($j = 0; $j < $ct; $j++) {
             if (strpos($match[$j][1], '@') === false) {
                 $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
@@ -595,7 +595,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">';
                     $elementID = Uuid::uuid4()->toString();
                     if ($tree->getPreference('EXPAND_SOURCES')) {
                         $plusminus = 'icon-minus';

Indentation +15 added lines, -15 removed lines

@@ -192,23 +192,23 @@
             <?= $label ?>
 					<div class="editfacts">
               <?= FontAwesome::linkIcon('edit', I18N::translate('Edit'), [
-                  'class' => 'btn btn-link',
-                  'href'  => route('edit-fact', [
-                      'xref'    => $parent->getXref(),
-                      'fact_id' => $fact->getFactId(),
-                      'ged' . $tree->getName(),
-                  ]),
-              ]) ?>
+                    'class' => 'btn btn-link',
+                    'href'  => route('edit-fact', [
+                        'xref'    => $parent->getXref(),
+                        'fact_id' => $fact->getFactId(),
+                        'ged' . $tree->getName(),
+                    ]),
+                ]) ?>
               <?= FontAwesome::linkIcon('copy', I18N::translate('Copy'), [
-                  'class'   => 'btn btn-link',
-                  'href'    => '#',
-                  'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
-              ]) ?>
+                    'class'   => 'btn btn-link',
+                    'href'    => '#',
+                    'onclick' => 'return copy_fact("' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
+                ]) ?>
               <?= FontAwesome::linkIcon('delete', I18N::translate('Delete'), [
-                  'class'   => 'btn btn-link',
-                  'href'    => '#',
-                  'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
-              ]) ?>
+                    'class'   => 'btn btn-link',
+                    'href'    => '#',
+                    'onclick' => 'return delete_fact("' . I18N::translate('Are you sure you want to delete this fact?') . '", "' . e($tree->getName()) . '", "' . e($parent->getXref()) . '", "' . $fact->getFactId() . '");',
+                ]) ?>
 					</div>
             <?php
         } else {

app/Functions/FunctionsEdit.php

Spacing +2 added lines, -2 removed lines

@@ -525,7 +525,7 @@ 
         if ($islink) {
             $value = trim($value, '@');
         } else {
-            $value = (string)substr($tag, strlen($fact) + 3);
+            $value = (string) substr($tag, strlen($fact) + 3);
         }
         if ($fact === 'REPO' || $fact === 'SOUR' || $fact === 'OBJE' || $fact === 'FAMC') {
             $islink = true;
@@ -813,7 +813,7 @@ 
             $html .= '<p class="small text-muted">' . I18N::translate('Use this image for charts and on the individual’s page.') . '</p>';
         } elseif ($fact === 'TYPE' && $level === '3') {
             //-- Build the selector for the Media 'TYPE' Fact
-            $html          .= '<select name="text[]"><option selected value="" ></option>';
+            $html .= '<select name="text[]"><option selected value="" ></option>';
             $selectedValue = strtolower($value);
             if (!array_key_exists($selectedValue, GedcomTag::getFileFormTypes())) {
                 $html .= '<option selected value="' . e($value) . '" >' . e($value) . '</option>';

app/Functions/FunctionsDb.php

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
 
         // Convert the query into a SQL expression
         foreach ($query as $n => $q) {
-            $sql                   .= " AND n_full COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND n_full COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -88,7 +88,7 @@ 
             $sql                   .= ":tree_id_" . $n;
             $args['tree_id_' . $n] = $tree->getTreeId();
         }
-        $sql  .= ")";
+        $sql .= ")";
         $list = [];
         $rows = Database::prepare($sql)->execute($args)->fetchAll();
         foreach ($rows as $row) {
@@ -164,7 +164,7 @@ 
         $sql .= ")";
 
         if ($givn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $givn_sdx = explode(':', $givn_sdx);
             foreach ($givn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -182,7 +182,7 @@ 
         }
 
         if ($surn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $surn_sdx = explode(':', $surn_sdx);
             foreach ($surn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -200,7 +200,7 @@ 
         }
 
         if ($plac_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $plac_sdx = explode(':', $plac_sdx);
             foreach ($plac_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -260,7 +260,7 @@ 
     {
         // Use n_surn, rather than n_surname, as it is used to generate URLs for
         // the indi-list, etc.
-        $max = (int)$max;
+        $max = (int) $max;
         if ($max == 0) {
             return
                 Database::prepare(
@@ -318,7 +318,7 @@ 
                 "SELECT DISTINCT f_id AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
                 " FROM `##dates` JOIN `##families` ON d_gid = f_id AND d_file = f_file" .
                 " WHERE d_type = :type AND d_file = :tree_id";
-            $args    = [
+            $args = [
                 'type'    => $anniv->format('%@'),
                 'tree_id' => $tree->getTreeId(),
             ];
@@ -348,7 +348,7 @@ 
                     $where       .= " AND d_day = :day";
                     $args['day'] = $anniv->d;
                 }
-                $where         .= " AND d_mon = :month";
+                $where .= " AND d_mon = :month";
                 $args['month'] = $anniv->m;
             } else {
                 // SPECIAL CASES:
@@ -362,7 +362,7 @@ 
                         } elseif ($anniv->d === 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 2";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 2";
+                            $where .= " AND d_day = :day AND d_mon = 2";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -385,7 +385,7 @@ 
                         } elseif ($anniv->d == 29 && $anniv->daysInMonth() === 29) {
                             $where .= " AND (d_day = 29 OR d_day > 30) AND d_mon = 3";
                         } else {
-                            $where       .= " AND d_day = :day AND d_mon = 3";
+                            $where .= " AND d_day = :day AND d_mon = 3";
                             $args['day'] = $anniv->d;
                         }
                         break;
@@ -440,7 +440,7 @@ 
                 }
             }
             // Only events in the past (includes dates without a year)
-            $where        .= " AND d_year <= :year";
+            $where .= " AND d_year <= :year";
             $args['year'] = $anniv->y;
 
             if ($facts) {
@@ -617,7 +617,7 @@ 
     public static function isMediaUsedInOtherTree($file_name, $ged_id)
     {
         return
-            (bool)Database::prepare(
+            (bool) Database::prepare(
                 "SELECT COUNT(*) FROM `##media_file`" .
                 " WHERE multimedia_file_refn LIKE :search AND m_file <> :tree_id"
             )->execute([

Indentation +13 added lines, -13 removed lines

@@ -302,13 +302,13 @@ 
     {
         $found_facts = [];
         foreach ([
-             new GregorianDate($jd),
-             new JulianDate($jd),
-             new FrenchDate($jd),
-             new JewishDate($jd),
-             new HijriDate($jd),
-             new JalaliDate($jd),
-         ] as $anniv) {
+                new GregorianDate($jd),
+                new JulianDate($jd),
+                new FrenchDate($jd),
+                new JewishDate($jd),
+                new HijriDate($jd),
+                new JalaliDate($jd),
+            ] as $anniv) {
             // Build a SQL where clause to match anniversaries in the appropriate calendar.
             $ind_sql =
                 "SELECT DISTINCT i_id AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact" .
@@ -462,9 +462,9 @@ 
 
             // Now fetch these anniversaries
             foreach ([
-                 'INDI' => $ind_sql . $where . $order_by,
-                 'FAM'  => $fam_sql . $where . $order_by,
-             ] as $type => $sql) {
+                    'INDI' => $ind_sql . $where . $order_by,
+                    'FAM'  => $fam_sql . $where . $order_by,
+                ] as $type => $sql) {
                 $rows = Database::prepare($sql)->execute($args)->fetchAll();
                 foreach ($rows as $row) {
                     if ($type === 'INDI') {
@@ -522,9 +522,9 @@ 
         $ind_sql = "SELECT d_gid AS xref, i_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##individuals` {$where} AND d_gid=i_id AND d_file=i_file ORDER BY d_julianday1";
         $fam_sql = "SELECT d_gid AS xref, f_gedcom AS gedcom, d_type, d_day, d_month, d_year, d_fact, d_type FROM `##dates`, `##families`    {$where} AND d_gid=f_id AND d_file=f_file ORDER BY d_julianday1";
         foreach ([
-             'INDI' => $ind_sql,
-             'FAM'  => $fam_sql,
-         ] as $type => $sql) {
+                'INDI' => $ind_sql,
+                'FAM'  => $fam_sql,
+            ] as $type => $sql) {
             $rows = Database::prepare($sql)->fetchAll();
             foreach ($rows as $row) {
                 if ($type === 'INDI') {

app/Functions/Functions.php

Spacing +3 added lines, -3 removed lines

@@ -307,17 +307,17 @@
             return false;
         }
 
-        $spouse_codes  = [
+        $spouse_codes = [
             'M' => 'hus',
             'F' => 'wif',
             'U' => 'spo',
         ];
-        $parent_codes  = [
+        $parent_codes = [
             'M' => 'fat',
             'F' => 'mot',
             'U' => 'par',
         ];
-        $child_codes   = [
+        $child_codes = [
             'M' => 'son',
             'F' => 'dau',
             'U' => 'chi',

app/Functions/FunctionsExport.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
                         break;
                     }
                     $newrec .= mb_substr($line, 0, $pos) . Gedcom::EOL;
-                    $line   = $level . ' CONC ' . mb_substr($line, $pos);
+                    $line = $level . ' CONC ' . mb_substr($line, $pos);
                 } while (mb_strlen($line) > Gedcom::LINE_LENGTH);
             }
             $newrec .= $line . Gedcom::EOL;