fisharebest / webtrees

app/Http/Controllers/AdminSiteController.php

Spacing +24 added lines, -24 removed lines

@@ -263,35 +263,35 @@ 
 
         $args = [];
         if ($search) {
-            $sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
             $args['search'] = $search;
         }
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 
@@ -317,7 +317,7 @@ 
         }
 
         if ($length) {
-            $sql            .= " LIMIT :limit OFFSET :offset";
+            $sql .= " LIMIT :limit OFFSET :offset";
             $args['limit']  = $length;
             $args['offset'] = $start;
         }
@@ -375,35 +375,35 @@ 
 
         $args = [];
         if ($search) {
-            $sql            .= " AND log_message LIKE CONCAT('%', :search, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :search, '%')";
             $args['search'] = $search;
         }
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 
@@ -436,31 +436,31 @@ 
 
         $args = [];
         if ($from) {
-            $sql          .= " AND log_time >= :from";
+            $sql .= " AND log_time >= :from";
             $args['from'] = $from;
         }
         if ($to) {
-            $sql        .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
+            $sql .= " AND log_time < TIMESTAMPADD(DAY, 1 , :to)"; // before end of the day
             $args['to'] = $to;
         }
         if ($type) {
-            $sql          .= " AND log_type = :type";
+            $sql .= " AND log_type = :type";
             $args['type'] = $type;
         }
         if ($text) {
-            $sql          .= " AND log_message LIKE CONCAT('%', :text, '%')";
+            $sql .= " AND log_message LIKE CONCAT('%', :text, '%')";
             $args['text'] = $text;
         }
         if ($ip) {
-            $sql        .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
+            $sql .= " AND ip_address LIKE CONCAT('%', :ip, '%')";
             $args['ip'] = $ip;
         }
         if ($username) {
-            $sql          .= " AND user_name LIKE CONCAT('%', :user, '%')";
+            $sql .= " AND user_name LIKE CONCAT('%', :user, '%')";
             $args['user'] = $username;
         }
         if ($gedc) {
-            $sql          .= " AND gedcom_name = :gedc";
+            $sql .= " AND gedcom_name = :gedc";
             $args['gedc'] = $gedc;
         }
 

app/Http/Controllers/AdminUsersController.php

Indentation +1 added lines, -1 removed lines

@@ -240,7 +240,7 @@
             // Link to send email to other users.
             if ($user_id != $user->getUserId()) {
                 $datum[4] = '<a href="' . e(route('message', ['to'  => $datum[2],
-                                                              'url' => route('admin-users'),
+                                                                'url' => route('admin-users'),
                     ])) . '">' . $datum[4] . '</a>';
             }
 

Spacing +27 added lines, -27 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function cleanup(Request $request): Response
     {
-        $months = (int)$request->get('months', 6);
+        $months = (int) $request->get('months', 6);
 
         $inactive_threshold   = time() - $months * 30 * self::SECONDS_PER_DAY;
         $unverified_threshold = time() - 7 * self::SECONDS_PER_DAY;
@@ -59,9 +59,9 @@ 
 
         $inactive_users = array_filter($users, function (User $user) use ($inactive_threshold): bool {
             if ($user->getPreference('sessiontime') === '0') {
-                $datelogin = (int)$user->getPreference('reg_timestamp');
+                $datelogin = (int) $user->getPreference('reg_timestamp');
             } else {
-                $datelogin = (int)$user->getPreference('sessiontime');
+                $datelogin = (int) $user->getPreference('sessiontime');
             }
 
             return $datelogin < $inactive_threshold && $user->getPreference('verified');
@@ -69,9 +69,9 @@ 
 
         $unverified_users = array_filter($users, function (User $user) use ($unverified_threshold): bool {
             if ($user->getPreference('sessiontime') === '0') {
-                $datelogin = (int)$user->getPreference('reg_timestamp');
+                $datelogin = (int) $user->getPreference('reg_timestamp');
             } else {
-                $datelogin = (int)$user->getPreference('sessiontime');
+                $datelogin = (int) $user->getPreference('sessiontime');
             }
 
             return $datelogin < $unverified_threshold && !$user->getPreference('verified');
@@ -98,7 +98,7 @@ 
     public function cleanupAction(Request $request): RedirectResponse
     {
         foreach (User::all() as $user) {
-            if ((bool)$request->get('del_' . $user->getUserId())) {
+            if ((bool) $request->get('del_' . $user->getUserId())) {
                 Log::addAuthenticationLog('Deleted user: ' . $user->getUserName());
                 $user->delete();
 
@@ -123,7 +123,7 @@ 
 
         $all_users = User::all();
 
-        $page_size = (int)$user->getPreference(' admin_users_page_size', 10);
+        $page_size = (int) $user->getPreference(' admin_users_page_size', 10);
 
         $title = I18N::translate('User administration');
 
@@ -145,10 +145,10 @@ 
     public function data(Request $request, User $user): JsonResponse
     {
         $search = $request->get('search')['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
         $order  = $request->get('order', []);
-        $draw   = (int)$request->get('draw');
+        $draw   = (int) $request->get('draw');
 
         $sql_select =
             "SELECT SQL_CALC_FOUND_ROWS u.user_id, user_name, real_name, email, us1.setting_value AS language, us2.setting_value AS registered_at, us3.setting_value AS active_at, us4.setting_value AS verified, us5.setting_value AS verified_by_admin" .
@@ -163,7 +163,7 @@ 
         $args = [];
 
         if ($search) {
-            $sql_select       .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
+            $sql_select .= " AND (user_name LIKE CONCAT('%', :search_1, '%') OR real_name LIKE CONCAT('%', :search_2, '%') OR email LIKE CONCAT('%', :search_3, '%'))";
             $args['search_1'] = $search;
             $args['search_2'] = $search;
             $args['search_3'] = $search;
@@ -192,7 +192,7 @@ 
 
         if ($length) {
             $user->setPreference('admin_users_page_size', $length);
-            $sql_select     .= " LIMIT :limit OFFSET :offset";
+            $sql_select .= " LIMIT :limit OFFSET :offset";
             $args['limit']  = $length;
             $args['offset'] = $start;
         }
@@ -200,8 +200,8 @@ 
         $rows = Database::prepare($sql_select)->execute($args)->fetchAll();
 
         // Total filtered/unfiltered rows
-        $recordsFiltered = (int)Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
-        $recordsTotal    = (int)Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne();
+        $recordsFiltered = (int) Database::prepare("SELECT FOUND_ROWS()")->fetchOne();
+        $recordsTotal    = (int) Database::prepare("SELECT COUNT(*) FROM `##user` WHERE user_id > 0")->fetchOne();
 
         $installed_languages = [];
         foreach (I18N::installedLocales() as $installed_locale) {
@@ -289,7 +289,7 @@ 
      */
     public function edit(Request $request): Response
     {
-        $user_id = (int)$request->get('user_id');
+        $user_id = (int) $request->get('user_id');
         $user    = User::find($user_id);
 
         if ($user === null) {
@@ -372,7 +372,7 @@ 
      */
     public function update(Request $request, User $user): RedirectResponse
     {
-        $user_id        = (int)$request->get('user_id');
+        $user_id        = (int) $request->get('user_id');
         $username       = $request->get('username');
         $real_name      = $request->get('real_name');
         $email          = $request->get('email');
@@ -382,11 +382,11 @@ 
         $timezone       = $request->get('timezone');
         $contact_method = $request->get('contact_method');
         $comment        = $request->get('comment');
-        $auto_accept    = (bool)$request->get('auto_accept');
-        $canadmin       = (bool)$request->get('canadmin');
-        $visible_online = (bool)$request->get('visible_online');
-        $verified       = (bool)$request->get('verified');
-        $approved       = (bool)$request->get('approved');
+        $auto_accept    = (bool) $request->get('auto_accept');
+        $canadmin       = (bool) $request->get('canadmin');
+        $visible_online = (bool) $request->get('visible_online');
+        $verified       = (bool) $request->get('verified');
+        $approved       = (bool) $request->get('approved');
 
         $edit_user = User::find($user_id);
 
@@ -403,10 +403,10 @@ 
             ->setPreference('TIMEZONE', $timezone)
             ->setPreference('contactmethod', $contact_method)
             ->setPreference('comment', $comment)
-            ->setPreference('auto_accept', (string)$auto_accept)
-            ->setPreference('visibleonline', (string)$visible_online)
-            ->setPreference('verified', (string)$verified)
-            ->setPreference('verified_by_admin', (string)$approved);
+            ->setPreference('auto_accept', (string) $auto_accept)
+            ->setPreference('visibleonline', (string) $visible_online)
+            ->setPreference('verified', (string) $verified)
+            ->setPreference('verified_by_admin', (string) $approved);
 
         if ($pass1 !== '') {
             $edit_user->setPassword($pass1);
@@ -418,7 +418,7 @@ 
         }
 
         foreach (Tree::getAll() as $tree) {
-            $path_length = (int)$request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId());
+            $path_length = (int) $request->get('RELATIONSHIP_PATH_LENGTH' . $tree->getTreeId());
             $gedcom_id   = $request->get('gedcomid' . $tree->getTreeId(), '');
             $can_edit    = $request->get('canedit' . $tree->getTreeId(), '');
 
@@ -429,7 +429,7 @@ 
 
             $tree->setUserPreference($edit_user, 'gedcomid', $gedcom_id);
             $tree->setUserPreference($edit_user, 'canedit', $can_edit);
-            $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string)$path_length);
+            $tree->setUserPreference($edit_user, 'RELATIONSHIP_PATH_LENGTH', (string) $path_length);
         }
 
         $url = route('admin-users');

app/Http/Controllers/TimelineChartController.php

Spacing +9 added lines, -9 removed lines

@@ -60,11 +60,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
         $xrefs = array_filter($xrefs, function (string $xref) use ($tree): bool {
             $individual = Individual::getInstance($xref, $tree);
@@ -100,14 +100,14 @@ 
 
         $zoom_in_url = route('timeline', [
             'ged'   => $tree->getName(),
-            'scale' => min(self::SCALE_MAX, $scale + (int)($scale * 0.2 + 1)),
+            'scale' => min(self::SCALE_MAX, $scale + (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
         $zoom_out_url = route('timeline', [
             'route' => 'timeline',
             'ged'   => $tree->getName(),
-            'scale' => max(self::SCALE_MIN, $scale - (int)($scale * 0.2 + 1)),
+            'scale' => max(self::SCALE_MIN, $scale - (int) ($scale * 0.2 + 1)),
             'xrefs' => $xrefs,
         ]);
 
@@ -132,11 +132,11 @@ 
     {
         $this->checkModuleIsActive($tree, 'timeline_chart');
 
-        $scale = (int)$request->get('scale', self::SCALE_DEFAULT);
+        $scale = (int) $request->get('scale', self::SCALE_DEFAULT);
         $scale = min($scale, self::SCALE_MAX);
         $scale = max($scale, self::SCALE_MIN);
 
-        $xrefs = (array)$request->get('xrefs', []);
+        $xrefs = (array) $request->get('xrefs', []);
         $xrefs = array_unique($xrefs);
 
         /** @var Individual[] $individuals */
@@ -148,7 +148,7 @@ 
             return $individual !== null && $individual->canShow();
         });
 
-        $baseyear    = (int)date('Y');
+        $baseyear    = (int) date('Y');
         $topyear     = 0;
         $indifacts   = [];
         $birthyears  = [];
@@ -183,7 +183,7 @@ 
                         $topyear  = max($topyear, $date->y);
 
                         if (!$individual->isDead()) {
-                            $topyear = max($topyear, (int)date('Y'));
+                            $topyear = max($topyear, (int) date('Y'));
                         }
 
                         // do not add the same fact twice (prevents marriages from being added multiple times)
@@ -196,7 +196,7 @@ 
         }
 
         if ($scale === 0) {
-            $scale = (int)(($topyear - $baseyear) / 20 * count($indifacts) / 4);
+            $scale = (int) (($topyear - $baseyear) / 20 * count($indifacts) / 4);
             if ($scale < 6) {
                 $scale = 6;
             }

app/Services/UpgradeService.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
     {
         $latest_version = $this->fetchLatestVersion();
 
-        list(, , $url) = explode('|', $latest_version . '||');
+        list(,, $url) = explode('|', $latest_version . '||');
 
         return $url;
     }

app/Functions/FunctionsPrintLists.php

Spacing +3 added lines, -3 removed lines

@@ -53,7 +53,7 @@ 
                 } else {
                     $size = 75.0 + 125.0 * ($count - $minimum) / ($maximum - $minimum);
                 }
-                $url  = route($route, [
+                $url = route($route, [
                     'surname' => $surn,
                     'ged'     => $tree->getName(),
                 ]);
@@ -130,13 +130,13 @@ 
                 }
                 $newcol = ceil($count / $col);
                 $html2  = '<table class="list_table"><tr>';
-                $html2  .= '<td class="list_value" style="padding: 14px;">';
+                $html2 .= '<td class="list_value" style="padding: 14px;">';
 
                 foreach ($html as $surns) {
                     $html2 .= $surns . '<br>';
                     $i++;
                     if ($i == $newcol && $i < $count) {
-                        $html2  .= '</td><td class="list_value" style="padding: 14px;">';
+                        $html2 .= '</td><td class="list_value" style="padding: 14px;">';
                         $newcol = $i + ceil($count / $col);
                     }
                 }

app/Module/TopSurnamesModule.php

Indentation +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
         extract($cfg, EXTR_OVERWRITE);
 
-         // Use the count of base surnames.
+            // Use the count of base surnames.
         $top_surnames = Database::prepare(
             "SELECT n_surn FROM `##name`" .
             " WHERE n_file = :tree_id AND n_type != '_MARNM' AND n_surn NOT IN ('@N.N.', '')" .

app/Http/Controllers/Auth/ForgotPasswordController.php

Spacing +2 added lines, -2 removed lines

@@ -69,7 +69,7 @@ 
 
             Log::addAuthenticationLog('Password request was sent to user: ' . $user->getUserName());
 
-            $sender = new User((object)[
+            $sender = new User((object) [
                 'user_id'   => null,
                 'user_name' => '',
                 'real_name' => $tree->getTitle(),
@@ -104,7 +104,7 @@ 
         $max       = strlen($passchars) - 1;
 
         for ($i = 0; $i < 8; $i++) {
-            $index    = random_int(0, $max);
+            $index = random_int(0, $max);
             $password .= $passchars{$index};
         }
 

app/I18N.php

Spacing +5 added lines, -5 removed lines

@@ -841,23 +841,23 @@
         $year   = 365 * $day;
 
         if ($seconds > $year) {
-            $years = (int)($seconds / $year);
+            $years = (int) ($seconds / $year);
 
             return self::plural('%s year ago', '%s years ago', $years, self::number($years));
         } elseif ($seconds > $month) {
-            $months = (int)($seconds / $month);
+            $months = (int) ($seconds / $month);
 
             return self::plural('%s month ago', '%s months ago', $months, self::number($months));
         } elseif ($seconds > $day) {
-            $days = (int)($seconds / $day);
+            $days = (int) ($seconds / $day);
 
             return self::plural('%s day ago', '%s days ago', $days, self::number($days));
         } elseif ($seconds > $hour) {
-            $hours = (int)($seconds / $hour);
+            $hours = (int) ($seconds / $hour);
 
             return self::plural('%s hour ago', '%s hours ago', $hours, self::number($hours));
         } elseif ($seconds > $minute) {
-            $minutes = (int)($seconds / $minute);
+            $minutes = (int) ($seconds / $minute);
 
             return self::plural('%s minute ago', '%s minutes ago', $minutes, self::number($minutes));
         } else {

app/Report/ReportParserGenerate.php

Spacing +9 added lines, -9 removed lines

@@ -1843,7 +1843,7 @@ 
         // Some filters/sorts can be applied using SQL, while others require PHP
         switch ($listname) {
             case 'pending':
-                $rows       = Database::prepare(
+                $rows = Database::prepare(
                     "SELECT xref, CASE new_gedcom WHEN '' THEN old_gedcom ELSE new_gedcom END AS gedcom" .
                     " FROM `##change`" . " WHERE (xref, change_id) IN (" .
                     "  SELECT xref, MAX(change_id)" .
@@ -1882,7 +1882,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = "";
+                                $sortby = "";
                                 $sql_order_by .= ($sql_order_by ? ", " : " ORDER BY ") . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1894,13 +1894,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1917,7 +1917,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND i_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];
@@ -1959,7 +1959,7 @@ 
                                 $sql_params[$attr . 'date'] = $date->minimumJulianDay();
                             }
                             if ($sortby == $match[1]) {
-                                $sortby       = '';
+                                $sortby = '';
                                 $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.d_julianday1";
                             }
                             unset($attrs[$attr]); // This filter has been fully processed
@@ -1976,13 +1976,13 @@ 
                                 if ($match[1] != '') {
                                     $names = explode(' ', $match[1]);
                                     foreach ($names as $n => $name) {
-                                        $sql_where                       .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
+                                        $sql_where .= " AND {$attr}.n_full LIKE CONCAT('%', :{$attr}name{$n}, '%')";
                                         $sql_params[$attr . 'name' . $n] = $name;
                                     }
                                 }
                                 // Let the DB do the name sorting even when no name was entered
                                 if ($sortby == 'NAME') {
-                                    $sortby       = '';
+                                    $sortby = '';
                                     $sql_order_by .= ($sql_order_by ? ', ' : ' ORDER BY ') . "{$attr}.n_sort";
                                 }
                             }
@@ -1994,7 +1994,7 @@ 
                             $sql_params[$attr . 'place'] = $match[1];
                             // Don't unset this filter. This is just initial filtering
                         } elseif (preg_match('/^(\w*):*(\w*) CONTAINS (.+)$/', $value, $match)) {
-                            $sql_where                       .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
+                            $sql_where .= " AND f_gedcom LIKE CONCAT('%', :{$attr}contains1, '%', :{$attr}contains2, '%', :{$attr}contains3, '%')";
                             $sql_params[$attr . 'contains1'] = $match[1];
                             $sql_params[$attr . 'contains2'] = $match[2];
                             $sql_params[$attr . 'contains3'] = $match[3];