fisharebest / webtrees

app/Report/ReportHtml.php

Spacing +3 added lines, -3 removed lines

@@ -145,7 +145,7 @@ 
             $this->pageh = $tmpw;
         }
         // Store the pagewidth without margins
-        $this->noMarginWidth = (int)($this->pagew - $this->leftmargin - $this->rightmargin);
+        $this->noMarginWidth = (int) ($this->pagew - $this->leftmargin - $this->rightmargin);
         // If RTL
         if ($this->rtl) {
             $this->alignRTL  = 'right';
@@ -727,14 +727,14 @@ 
     public function textWrap($str, $width): string
     {
         // Calculate the line width
-        $lw = (int)($width / ($this->getCurrentStyleHeight() / 2));
+        $lw = (int) ($width / ($this->getCurrentStyleHeight() / 2));
         // Wordwrap each line
         $lines = explode("\n", $str);
         // Line Feed counter
         $lfct     = count($lines);
         $wraptext = '';
         foreach ($lines as $line) {
-            $wtext    = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
+            $wtext = FunctionsRtl::utf8WordWrap($line, $lw, "\n", true);
             $wraptext .= $wtext;
             // Add a new line as long as it’s not the last line
             if ($lfct > 1) {

app/Module/PlacesModule.php

Spacing +2 added lines, -2 removed lines

@@ -141,7 +141,7 @@ 
      */
     private function getPersonalFacts(Individual $individual): array
     {
-        $facts      = $individual->getFacts();
+        $facts = $individual->getFacts();
         foreach ($individual->getSpouseFamilies() as $family) {
             $facts = array_merge($facts, $family->getFacts());
             // Add birth of children from this family to the facts array
@@ -215,7 +215,7 @@ 
                     'provider' => 'openstreetmap',
                     'style'    => 'mapnik',
                 ];
-                self::$map_providers  = [
+                self::$map_providers = [
                     'openstreetmap' => [
                         'name'   => 'OpenStreetMap',
                         'styles' => ['mapnik' => 'Mapnik'],

app/Individual.php

Spacing +8 added lines, -8 removed lines

@@ -123,7 +123,7 @@ 
         // Dead people...
         if ($this->tree->getPreference('SHOW_DEAD_PEOPLE') >= $access_level && $this->isDead()) {
             $keep_alive             = false;
-            $KEEP_ALIVE_YEARS_BIRTH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
+            $KEEP_ALIVE_YEARS_BIRTH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_BIRTH');
             if ($KEEP_ALIVE_YEARS_BIRTH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_BIRT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -134,7 +134,7 @@ 
                     }
                 }
             }
-            $KEEP_ALIVE_YEARS_DEATH = (int)$this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
+            $KEEP_ALIVE_YEARS_DEATH = (int) $this->tree->getPreference('KEEP_ALIVE_YEARS_DEATH');
             if ($KEEP_ALIVE_YEARS_DEATH) {
                 preg_match_all('/\n1 (?:' . WT_EVENTS_DEAT . ').*(?:\n[2-9].*)*(?:\n2 DATE (.+))/', $this->gedcom, $matches, PREG_SET_ORDER);
                 foreach ($matches as $match) {
@@ -150,7 +150,7 @@ 
             }
         }
         // Consider relationship privacy (unless an admin is applying download restrictions)
-        $user_path_length = (int)$this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
+        $user_path_length = (int) $this->tree->getUserPreference(Auth::user(), 'RELATIONSHIP_PATH_LENGTH');
         $gedcomid         = $this->tree->getUserPreference(Auth::user(), 'gedcomid');
         if ($gedcomid !== '' && $user_path_length > 0) {
             return self::isRelated($this, $user_path_length);
@@ -322,7 +322,7 @@ 
      */
     public function isDead(): bool
     {
-        $MAX_ALIVE_AGE = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+        $MAX_ALIVE_AGE = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
 
         // "1 DEAT Y" or "1 DEAT/2 DATE" or "1 DEAT/2 PLAC"
         if (preg_match('/\n1 (?:' . WT_EVENTS_DEAT . ')(?: Y|(?:\n[2-9].+)*\n2 (DATE|PLAC) )/', $this->gedcom)) {
@@ -711,7 +711,7 @@ 
                 if ($min && $max) {
                     $gregorian_calendar = new GregorianCalendar();
 
-                    list($year) = $gregorian_calendar->jdToYmd((int)((max($min) + min($max)) / 2));
+                    list($year) = $gregorian_calendar->jdToYmd((int) ((max($min) + min($max)) / 2));
                     $this->estimated_birth_date = new Date('EST ' . $year);
                 } else {
                     $this->estimated_birth_date = new Date(''); // always return a date object
@@ -738,7 +738,7 @@ 
             }
             if ($this->estimated_death_date === null) {
                 if ($this->getEstimatedBirthDate()->minimumJulianDay()) {
-                    $max_alive_age              = (int)$this->tree->getPreference('MAX_ALIVE_AGE');
+                    $max_alive_age              = (int) $this->tree->getPreference('MAX_ALIVE_AGE');
                     $this->estimated_death_date = $this->getEstimatedBirthDate()->addYears($max_alive_age, 'BEF');
                 } else {
                     $this->estimated_death_date = new Date(''); // always return a date object
@@ -1106,7 +1106,7 @@ 
         if ($display) {
             $txt .= ' style="display:' . $display . '"';
         }
-        $txt  .= '>';
+        $txt .= '>';
         $husb = $fam->getHusband();
         if ($husb) {
             // Temporarily reset the 'prefered' display name, as we always
@@ -1173,7 +1173,7 @@ 
         // Extract the structured name parts - use for "sortable" names and indexes
         ////////////////////////////////////////////////////////////////////////////
 
-        $sublevel = 1 + (int)$gedcom[0];
+        $sublevel = 1 + (int) $gedcom[0];
         $NPFX     = preg_match("/\n{$sublevel} NPFX (.+)/", $gedcom, $match) ? $match[1] : '';
         $GIVN     = preg_match("/\n{$sublevel} GIVN (.+)/", $gedcom, $match) ? $match[1] : '';
         $SURN     = preg_match("/\n{$sublevel} SURN (.+)/", $gedcom, $match) ? $match[1] : '';

app/Theme/AbstractTheme.php

Spacing +3 added lines, -3 removed lines

@@ -214,7 +214,7 @@ 
     {
         if ($analytics_id) {
             // Add extra dimensions (i.e. filtering categories)
-            $dimensions = (object)[
+            $dimensions = (object) [
                 'dimension1' => $this->tree ? $this->tree->getName() : '-',
                 'dimension2' => $this->tree ? Auth::accessLevel($this->tree) : '-',
             ];
@@ -276,7 +276,7 @@ 
         if ($project_id && $security_id) {
             return
                 '<script>' .
-                'var sc_project=' . (int)$project_id . ',sc_invisible=1,sc_security="' . $security_id .
+                'var sc_project=' . (int) $project_id . ',sc_invisible=1,sc_security="' . $security_id .
                 '",scJsHost = (("https:"===document.location.protocol)?"https://secure.":"http://www.");' .
                 'document.write("<sc"+"ript src=\'"+scJsHost+"statcounter.com/counter/counter.js\'></"+"script>");' .
                 '</script>';
@@ -1798,7 +1798,7 @@ 
     public function menuSearchPhonetic(): Menu
     {
         /* I18N: search using “sounds like”, rather than exact spelling */
-        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex',]), 'menu-search-soundex', ['rel' => 'nofollow']);
+        return new Menu(I18N::translate('Phonetic search'), route('search-phonetic', ['ged'    => $this->tree->getName(), 'action' => 'soundex', ]), 'menu-search-soundex', ['rel' => 'nofollow']);
     }
 
     /**

app/Module/AbstractModule.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
             return $this->defaultAccessLevel();
         }
 
-        return (int)$access_level;
+        return (int) $access_level;
     }
 
     /**

app/Census/CensusColumnAgeMale.php

Spacing +1 added lines, -1 removed lines

@@ -38,6 +38,6 @@
             return '';
         }
 
-        return (string)Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
+        return (string) Date::getAge($individual->getEstimatedBirthDate(), $this->date(), 0);
     }
 }

app/Census/CensusColumnAgeMale5Years.php

Spacing +1 added lines, -1 removed lines

@@ -43,6 +43,6 @@
             $years -= $years % 5;
         }
 
-        return (string)$years;
+        return (string) $years;
     }
 }

app/Census/CensusColumnYearsMarried.php

Spacing +1 added lines, -1 removed lines

@@ -48,6 +48,6 @@
             return '';
         }
 
-        return (string)Date::getAge($marriage_date, $this->date(), 0);
+        return (string) Date::getAge($marriage_date, $this->date(), 0);
     }
 }

app/Http/Controllers/SearchController.php

Spacing +46 added lines, -46 removed lines

@@ -163,11 +163,11 @@ 
         $query = $request->get('query', '');
 
         // What type of records to search?
-        $search_individuals  = (bool)$request->get('search_individuals');
-        $search_families     = (bool)$request->get('search_families');
-        $search_repositories = (bool)$request->get('search_repositories');
-        $search_sources      = (bool)$request->get('search_sources');
-        $search_notes        = (bool)$request->get('search_notes');
+        $search_individuals  = (bool) $request->get('search_individuals');
+        $search_families     = (bool) $request->get('search_families');
+        $search_repositories = (bool) $request->get('search_repositories');
+        $search_sources      = (bool) $request->get('search_sources');
+        $search_notes        = (bool) $request->get('search_notes');
 
         // Default to individuals only
         if (!$search_individuals && !$search_families && !$search_repositories && !$search_sources && !$search_notes) {
@@ -184,7 +184,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -290,7 +290,7 @@ 
             $all_trees = [$tree];
         }
 
-        $search_tree_names = (array)$request->get('search_trees', []);
+        $search_tree_names = (array) $request->get('search_trees', []);
 
         $search_trees = array_filter($all_trees, function (Tree $tree) use ($search_tree_names): bool {
             return in_array($tree->getName(), $search_tree_names);
@@ -640,7 +640,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND f_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -688,7 +688,7 @@ 
      */
     private function searchFamilyNames(array $search_terms, array $search_trees): array
     {
-        $sql  =
+        $sql =
             "SELECT DISTINCT f_id AS xref, f_file AS gedcom_id, f_gedcom AS gedcom" .
             " FROM `##families`" .
             " LEFT JOIN `##name` husb ON f_husb = husb.n_id AND f_file = husb.n_file" .
@@ -697,7 +697,7 @@ 
         $args = [];
 
         foreach ($search_terms as $n => $q) {
-            $sql                        .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
+            $sql .= " AND (husb.n_full COLLATE :husb_collate_" . $n . " LIKE CONCAT('%', :husb_query_" . $n . ", '%') OR wife.n_full COLLATE :wife_collate_" . $n . " LIKE CONCAT('%', :wife_query_" . $n . ", '%'))";
             $args['husb_collate_' . $n] = I18N::collation();
             $args['husb_query_' . $n]   = Database::escapeLike($q);
             $args['wife_collate_' . $n] = I18N::collation();
@@ -749,7 +749,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND i_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -896,7 +896,7 @@ 
         }
 
         // Add the where clause
-        $sql    .= " WHERE ind.i_file=?";
+        $sql .= " WHERE ind.i_file=?";
         $bind[] = $tree->getTreeId();
 
         foreach ($fields as $field_name => $field_value) {
@@ -907,15 +907,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_givn=?";
+                                $sql .= " AND i_n.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -929,7 +929,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -945,7 +945,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -954,15 +954,15 @@ 
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND i_n.n_surname=?";
+                                $sql .= " AND i_n.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND i_n.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -976,7 +976,7 @@ 
                                     $sql .= " AND (" . implode(' OR ', $sdx) . ")";
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -994,7 +994,7 @@ 
                                 }
 
 // No phonetic content? Use a substring match
-                            $sql    .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
+                            $sql .= " AND i_n.n_surn LIKE CONCAT('%', ?, '%')";
                             $bind[] = $field_value;
                         }
                         break;
@@ -1002,7 +1002,7 @@ 
                     case '_MARNM':
                     case '_HEB':
                     case '_AKA':
-                        $sql    .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
+                        $sql .= " AND i_n.n_type=? AND i_n.n_full LIKE CONCAT('%', ?, '%')";
                         $bind[] = $parts[1];
                         $bind[] = $field_value;
                         break;
@@ -1012,7 +1012,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * ($modifiers[$field_name] ?? 0);
-                    $sql    .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
+                    $sql .= " AND i_d.d_fact=? AND i_d.d_julianday1>=? AND i_d.d_julianday2<=?";
                     $bind[] = $parts[0];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1022,7 +1022,7 @@ 
                 $date = new Date($field_value);
                 if ($date->isOK()) {
                     $delta  = 365 * $modifiers[$field_name];
-                    $sql    .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
+                    $sql .= " AND f_d.d_fact=? AND f_d.d_julianday1>=? AND f_d.d_julianday2<=?";
                     $bind[] = $parts[1];
                     $bind[] = $date->minimumJulianDay() - $delta;
                     $bind[] = $date->maximumJulianDay() + $delta;
@@ -1030,12 +1030,12 @@ 
             } elseif ($parts[1] === 'PLAC') {
                 // *:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND i_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMS' && $parts[2] === 'PLAC') {
                 // FAMS:*:PLAC
                 // SQL can only link a place to a person/family, not to an event.
-                $sql    .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
+                $sql .= " AND f_p.place LIKE CONCAT('%', ?, '%')";
                 $bind[] = $field_value;
             } elseif ($parts[0] === 'FAMC' && $parts[2] === 'NAME') {
                 $table = $parts[1] === 'HUSB' ? 'f_n' : 'm_n';
@@ -1044,15 +1044,15 @@ 
                     case 'GIVN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_givn=?";
+                                $sql .= " AND {$table}.n_givn=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1066,7 +1066,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1084,22 +1084,22 @@ 
                                 }
 
 // No phonetic content? Use a substring match
-                            $sql    .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
+                            $sql .= " AND {$table}.n_givn LIKE CONCAT('%', ?, '%')";
                             $bind[] = $field_value;
                         }
                         break;
                     case 'SURN':
                         switch ($modifiers[$field_name]) {
                             case 'EXACT':
-                                $sql    .= " AND {$table}.n_surname=?";
+                                $sql .= " AND {$table}.n_surname=?";
                                 $bind[] = $field_value;
                                 break;
                             case 'BEGINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT(?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'CONTAINS':
-                                $sql    .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
+                                $sql .= " AND {$table}.n_surname LIKE CONCAT('%', ?, '%')";
                                 $bind[] = $field_value;
                                 break;
                             case 'SDX_STD':
@@ -1113,7 +1113,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1129,7 +1129,7 @@ 
                                     $sql .= ' AND (' . implode(' OR ', $sdx) . ')';
                                 } else {
                                     // No phonetic content? Use a substring match
-                                    $sql    .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
+                                    $sql .= " AND {$table}.n_surn LIKE CONCAT('%', ?, '%')";
                                     $bind[] = $field_value;
                                 }
                                 break;
@@ -1138,17 +1138,17 @@ 
                 }
             } elseif ($parts[0] === 'FAMS') {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND fam.f_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[1];
                 $bind[] = $field_value;
             } elseif ($parts[1] === 'TYPE') {
                 // e.g. FACT:TYPE or EVEN:TYPE
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n1 ', ?, '.*(\n[2-9] .*)*\n2 TYPE .*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             } else {
                 // e.g. searches for occupation, religion, note, etc.
-                $sql    .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
+                $sql .= " AND ind.i_gedcom REGEXP CONCAT('\n[0-9] ', ?, '(.*\n[0-9] CONT)* [^\n]*', ?)";
                 $bind[] = $parts[0];
                 $bind[] = $field_value;
             }
@@ -1227,7 +1227,7 @@ 
         $sql .= ")";
 
         if ($givn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $givn_sdx = explode(':', $givn_sdx);
             foreach ($givn_sdx as $n => $sdx) {
                 $sql .= $n > 0 ? " OR " : "";
@@ -1245,7 +1245,7 @@ 
         }
 
         if ($surn_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $surn_sdx = explode(':', $surn_sdx);
             foreach ($surn_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1263,7 +1263,7 @@ 
         }
 
         if ($plac_sdx !== '') {
-            $sql      .= " AND (";
+            $sql .= " AND (";
             $plac_sdx = explode(':', $plac_sdx);
             foreach ($plac_sdx as $n => $sdx) {
                 $sql .= $n ? " OR " : "";
@@ -1310,7 +1310,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1366,7 +1366,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND o_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }
@@ -1422,7 +1422,7 @@ 
 
         foreach ($search_terms as $n => $q) {
             $queryregex[]          = preg_quote(I18N::strtoupper($q), '/');
-            $sql                   .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
+            $sql .= " AND s_gedcom COLLATE :collate_" . $n . " LIKE CONCAT('%', :query_" . $n . ", '%')";
             $args['collate_' . $n] = I18N::collation();
             $args['query_' . $n]   = Database::escapeLike($q);
         }