fisharebest / webtrees

app/Http/Controllers/AutocompleteController.php

Spacing +10 added lines, -10 removed lines

@@ -84,7 +84,7 @@ 
         $pages = [];
 
         // Escape the query for MySQL and PHP, converting spaces to wildcards.
-        $like_query  = strtr($query, [
+        $like_query = strtr($query, [
             '_' => '\\_',
             '%' => '\\%',
             ' ' => '%',
@@ -206,7 +206,7 @@ 
      */
     public function select2Family(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::familySearch($tree, $page, $query));
@@ -220,7 +220,7 @@ 
     public function select2Flag(Request $request): JsonResponse
     {
         $page  = $request->get('page');
-        $query = (int)$request->get('q');
+        $query = (int) $request->get('q');
 
         return new JsonResponse(Select2::flagSearch($page, $query));
     }
@@ -233,7 +233,7 @@ 
      */
     public function select2Individual(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::individualSearch($tree, $page, $query));
@@ -247,7 +247,7 @@ 
      */
     public function select2MediaObject(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::mediaObjectSearch($tree, $page, $query));
@@ -261,7 +261,7 @@ 
      */
     public function select2Note(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::noteSearch($tree, $page, $query));
@@ -275,7 +275,7 @@ 
      */
     public function select2Place(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::placeSearch($tree, $page, $query, true));
@@ -289,7 +289,7 @@ 
      */
     public function select2Repository(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::repositorySearch($tree, $page, $query));
@@ -303,7 +303,7 @@ 
      */
     public function select2Source(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::sourceSearch($tree, $page, $query));
@@ -317,7 +317,7 @@ 
      */
     public function select2Submitter(Request $request, Tree $tree): JsonResponse
     {
-        $page  = (int)$request->get('page');
+        $page  = (int) $request->get('page');
         $query = $request->get('q');
 
         return new JsonResponse(Select2::submitterSearch($tree, $page, $query));

app/Http/Controllers/PendingChangesController.php

Spacing +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         $changes = Database::prepare(
             "SELECT change_id, xref, old_gedcom, new_gedcom" .
@@ -204,7 +204,7 @@ 
     {
         $url       = $request->get('url', '');
         $xref      = $request->get('xref', '');
-        $change_id = (int)$request->get('change_id');
+        $change_id = (int) $request->get('change_id');
 
         // Reject a change, and subsequent changes to the same record
         Database::prepare(

app/Module/UserMessagesModule.php

Spacing +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function postDeleteMessageAction(Request $request, Tree $tree): Response
     {
-        $message_ids = (array)$request->get('message_id', []);
+        $message_ids = (array) $request->get('message_id', []);
 
         $stmt = Database::prepare("DELETE FROM `##message` WHERE user_id = :user_id AND message_id = :message_id");
 
@@ -100,7 +100,7 @@ 
 
         $content = '';
         if (!empty($users)) {
-            $url     = route('user-page', ['ged' => $tree->getName()]);
+            $url = route('user-page', ['ged' => $tree->getName()]);
             $content .= '<form onsubmit="return $(&quot;#to&quot;).val() !== &quot;&quot;">';
             $content .= '<input type="hidden" name="route" value="message">';
             $content .= '<input type="hidden" name="ged" value="' . e($tree->getName()) . '">';
@@ -136,7 +136,7 @@ 
                 $content .= '<td class="list_value_wrap"><a href="#" onclick="return expand_layer(\'message' . $message->message_id . '\');"><i id="message' . $message->message_id . '_img" class="icon-plus"></i> <b dir="auto">' . e($message->subject) . '</b></a></td>';
                 $content .= '<td class="list_value_wrap">' . FunctionsDate::formatTimestamp($message->created + WT_TIMESTAMP_OFFSET) . '</td>';
                 $content .= '<td class="list_value_wrap">';
-                $user    = User::findByIdentifier($message->sender);
+                $user = User::findByIdentifier($message->sender);
                 if ($user) {
                     $content .= '<span dir="auto">' . e($user->getRealName()) . '</span> - <span dir="auto">' . $user->getEmail() . '</span>';
                 } else {
@@ -158,7 +158,7 @@ 
                         'subject' => $message->subject,
                         'ged'     => $tree->getName(),
                     ]);
-                    $content   .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
+                    $content .= '<a class="btn btn-primary" href="' . e($reply_url) . '" title="' . I18N::translate('Reply') . '">' . I18N::translate('Reply') . '</a> ';
                 }
                 $content .= '<button type="button" class="btn btn-danger" data-confirm="' . I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.') . '" onclick="if (confirm(this.dataset.confirm)) {$(\'#messageform :checkbox\').prop(\'checked\', false); $(\'#cb_message' . $message->message_id . '\').prop(\'checked\', true); document.messageform.submit();}">' . I18N::translate('Delete') . '</button></div></td></tr>';
             }

app/Module/UserFavoritesModule.php

Spacing +1 added lines, -1 removed lines

@@ -191,7 +191,7 @@
      */
     public function postDeleteFavoriteAction(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $favorite_id = (int)$request->get('favorite_id');
+        $favorite_id = (int) $request->get('favorite_id');
 
         if (Auth::check()) {
             Database::prepare(

app/Module/FrequentlyAskedQuestionsModule.php

Spacing +6 added lines, -6 removed lines

@@ -156,7 +156,7 @@ 
      */
     public function postAdminDeleteAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         Database::prepare(
             "DELETE FROM `##block_setting` WHERE block_id = :block_id"
@@ -184,7 +184,7 @@ 
      */
     public function postAdminMoveDownAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -237,7 +237,7 @@ 
      */
     public function postAdminMoveUpAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_order = Database::prepare(
             "SELECT block_order FROM `##block` WHERE block_id = :block_id"
@@ -292,7 +292,7 @@ 
     {
         $this->layout = 'layouts/administration';
 
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         if ($block_id === 0) {
             // Creating a new faq
@@ -303,7 +303,7 @@ 
             )->execute([
                 'module_name' => $this->getName(),
             ])->fetchOne();
-            $languages   = [];
+            $languages = [];
 
             $title = I18N::translate('Add an FAQ');
         } else {
@@ -340,7 +340,7 @@ 
      */
     public function postAdminEditAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id  = (int)$request->get('block_id');
+        $block_id  = (int) $request->get('block_id');
         $faqbody   = $request->get('faqbody', '');
         $header    = $request->get('header', '');
         $languages = $request->get('languages', []);

app/Module/FamilyTreeFavoritesModule.php

Spacing +1 added lines, -1 removed lines

@@ -190,7 +190,7 @@
      */
     public function postDeleteFavoriteAction(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $favorite_id = (int)$request->get('favorite_id');
+        $favorite_id = (int) $request->get('favorite_id');
 
         if (Auth::isManager($tree, $user)) {
             Database::prepare(

app/Module/StoriesModule.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
             // Only show this block for certain languages
             $languages = $this->getBlockSetting($block_id, 'languages', '');
             if ($languages === '' || in_array(WT_LOCALE, explode(',', $languages))) {
-                $stories[] = (object)[
+                $stories[] = (object) [
                     'block_id'   => $block_id,
                     'title'      => $this->getBlockSetting($block_id, 'title'),
                     'story_body' => $this->getBlockSetting($block_id, 'story_body'),
@@ -211,7 +211,7 @@ 
     {
         $this->layout = 'layouts/administration';
 
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         if ($block_id === 0) {
             // Creating a new story
@@ -256,7 +256,7 @@ 
      */
     public function postAdminEditAction(Request $request, Tree $tree): RedirectResponse
     {
-        $block_id    = (int)$request->get('block_id');
+        $block_id    = (int) $request->get('block_id');
         $xref        = $request->get('xref', '');
         $story_body  = $request->get('story_body', '');
         $story_title = $request->get('story_title', '');
@@ -302,7 +302,7 @@ 
      */
     public function postAdminDeleteAction(Request $request, Tree $tree): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         Database::prepare(
             "DELETE FROM `##block_setting` WHERE block_id = :block_id"

app/Http/Controllers/AdminTreesController.php

Spacing +33 added lines, -33 removed lines

@@ -407,9 +407,9 @@ 
     public function exportClient(Request $request, Tree $tree): Response
     {
         // Validate user parameters
-        $convert          = (bool)$request->get('convert');
-        $zip              = (bool)$request->get('zip');
-        $media            = (bool)$request->get('media');
+        $convert          = (bool) $request->get('convert');
+        $zip              = (bool) $request->get('zip');
+        $media            = (bool) $request->get('media');
         $media_path       = $request->get('media-path');
         $privatize_export = $request->get('privatize_export');
 
@@ -539,8 +539,8 @@ 
     public function importAction(Request $request, Tree $tree): RedirectResponse
     {
         $source             = $request->get('source');
-        $keep_media         = (bool)$request->get('keep_media');
-        $WORD_WRAPPED_NOTES = (bool)$request->get('WORD_WRAPPED_NOTES');
+        $keep_media         = (bool) $request->get('keep_media');
+        $WORD_WRAPPED_NOTES = (bool) $request->get('WORD_WRAPPED_NOTES');
         $GEDCOM_MEDIA_PATH  = $request->get('GEDCOM_MEDIA_PATH');
 
         // Save these choices as defaults
@@ -603,7 +603,7 @@ 
      */
     public function index(Tree $tree = null): Response
     {
-        $multiple_tree_threshold = (int)Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD);
+        $multiple_tree_threshold = (int) Site::getPreference('MULTIPLE_TREE_THRESHOLD', self::MULTIPLE_TREE_THRESHOLD);
         $gedcom_files            = $this->gedcomFiles(WT_DATA_DIR);
 
         $all_trees = Tree::getAll();
@@ -1034,16 +1034,16 @@ 
     public function preferencesUpdate(Request $request, Tree $tree): RedirectResponse
     {
         // Coming soon
-        if ((bool)$request->get('all_trees')) {
+        if ((bool) $request->get('all_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for all family trees have been updated.'), 'success');
         }
-        if ((bool)$request->get('new_trees')) {
+        if ((bool) $request->get('new_trees')) {
             FlashMessages::addMessage(I18N::translate('The preferences for new family trees have been updated.'), 'success');
         }
 
         $tree->setPreference('ADVANCED_NAME_FACTS', implode(',', $request->get('ADVANCED_NAME_FACTS', [])));
         $tree->setPreference('ADVANCED_PLAC_FACTS', implode(',', $request->get('ADVANCED_PLAC_FACTS', [])));
-        $tree->setPreference('ALLOW_THEME_DROPDOWN', (string)(bool)$request->get('ALLOW_THEME_DROPDOWN'));
+        $tree->setPreference('ALLOW_THEME_DROPDOWN', (string) (bool) $request->get('ALLOW_THEME_DROPDOWN'));
         // For backwards compatibility with webtrees 1.x we store the two calendar formats in one variable
         // e.g. "gregorian_and_jewish"
         $tree->setPreference('CALENDAR_FORMAT', implode('_and_', array_unique([
@@ -1052,57 +1052,57 @@ 
         ])));
         $tree->setPreference('CHART_BOX_TAGS', implode(',', $request->get('CHART_BOX_TAGS', [])));
         $tree->setPreference('CONTACT_USER_ID', $request->get('CONTACT_USER_ID'));
-        $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string)(int)$request->get('DEFAULT_PEDIGREE_GENERATIONS'));
-        $tree->setPreference('EXPAND_NOTES', (string)(bool)$request->get('EXPAND_NOTES'));
-        $tree->setPreference('EXPAND_SOURCES', (string)(bool)$request->get('EXPAND_SOURCES'));
+        $tree->setPreference('DEFAULT_PEDIGREE_GENERATIONS', (string) (int) $request->get('DEFAULT_PEDIGREE_GENERATIONS'));
+        $tree->setPreference('EXPAND_NOTES', (string) (bool) $request->get('EXPAND_NOTES'));
+        $tree->setPreference('EXPAND_SOURCES', (string) (bool) $request->get('EXPAND_SOURCES'));
         $tree->setPreference('FAM_FACTS_ADD', implode(',', $request->get('FAM_FACTS_ADD', [])));
         $tree->setPreference('FAM_FACTS_QUICK', implode(',', $request->get('FAM_FACTS_QUICK', [])));
         $tree->setPreference('FAM_FACTS_UNIQUE', implode(',', $request->get('FAM_FACTS_UNIQUE', [])));
-        $tree->setPreference('FULL_SOURCES', (string)(bool)$request->get('FULL_SOURCES'));
+        $tree->setPreference('FULL_SOURCES', (string) (bool) $request->get('FULL_SOURCES'));
         $tree->setPreference('FORMAT_TEXT', $request->get('FORMAT_TEXT'));
-        $tree->setPreference('GENERATE_UIDS', (string)(bool)$request->get('GENERATE_UIDS'));
+        $tree->setPreference('GENERATE_UIDS', (string) (bool) $request->get('GENERATE_UIDS'));
         $tree->setPreference('GEONAMES_ACCOUNT', $request->get('GEONAMES_ACCOUNT'));
-        $tree->setPreference('HIDE_GEDCOM_ERRORS', (string)(bool)$request->get('HIDE_GEDCOM_ERRORS'));
+        $tree->setPreference('HIDE_GEDCOM_ERRORS', (string) (bool) $request->get('HIDE_GEDCOM_ERRORS'));
         $tree->setPreference('INDI_FACTS_ADD', implode(',', $request->get('INDI_FACTS_ADD', [])));
         $tree->setPreference('INDI_FACTS_QUICK', implode(',', $request->get('INDI_FACTS_QUICK', [])));
         $tree->setPreference('INDI_FACTS_UNIQUE', implode(',', $request->get('INDI_FACTS_UNIQUE', [])));
         $tree->setPreference('LANGUAGE', $request->get('LANGUAGE'));
-        $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string)(int)$request->get('MAX_DESCENDANCY_GENERATIONS'));
-        $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string)(int)$request->get('MAX_PEDIGREE_GENERATIONS'));
+        $tree->setPreference('MAX_DESCENDANCY_GENERATIONS', (string) (int) $request->get('MAX_DESCENDANCY_GENERATIONS'));
+        $tree->setPreference('MAX_PEDIGREE_GENERATIONS', (string) (int) $request->get('MAX_PEDIGREE_GENERATIONS'));
         $tree->setPreference('MEDIA_UPLOAD', $request->get('MEDIA_UPLOAD'));
         $tree->setPreference('META_DESCRIPTION', $request->get('META_DESCRIPTION'));
         $tree->setPreference('META_TITLE', $request->get('META_TITLE'));
-        $tree->setPreference('NO_UPDATE_CHAN', (string)(bool)$request->get('NO_UPDATE_CHAN'));
-        $tree->setPreference('PEDIGREE_LAYOUT', (string)(bool)$request->get('PEDIGREE_LAYOUT'));
+        $tree->setPreference('NO_UPDATE_CHAN', (string) (bool) $request->get('NO_UPDATE_CHAN'));
+        $tree->setPreference('PEDIGREE_LAYOUT', (string) (bool) $request->get('PEDIGREE_LAYOUT'));
         $tree->setPreference('PEDIGREE_ROOT_ID', $request->get('PEDIGREE_ROOT_ID', WT_REGEX_XREF));
-        $tree->setPreference('PEDIGREE_SHOW_GENDER', (string)(bool)$request->get('PEDIGREE_SHOW_GENDER'));
+        $tree->setPreference('PEDIGREE_SHOW_GENDER', (string) (bool) $request->get('PEDIGREE_SHOW_GENDER'));
         $tree->setPreference('PREFER_LEVEL2_SOURCES', $request->get('PREFER_LEVEL2_SOURCES'));
         $tree->setPreference('QUICK_REQUIRED_FACTS', implode(',', $request->get('QUICK_REQUIRED_FACTS', [])));
         $tree->setPreference('QUICK_REQUIRED_FAMFACTS', implode(',', $request->get('QUICK_REQUIRED_FAMFACTS', [])));
         $tree->setPreference('REPO_FACTS_ADD', implode(',', $request->get('REPO_FACTS_ADD', [])));
         $tree->setPreference('REPO_FACTS_QUICK', implode(',', $request->get('REPO_FACTS_QUICK', [])));
         $tree->setPreference('REPO_FACTS_UNIQUE', implode(',', $request->get('REPO_FACTS_UNIQUE', [])));
-        $tree->setPreference('SHOW_COUNTER', (string)(bool)$request->get('SHOW_COUNTER'));
-        $tree->setPreference('SHOW_EST_LIST_DATES', (string)(bool)$request->get('SHOW_EST_LIST_DATES'));
-        $tree->setPreference('SHOW_FACT_ICONS', (string)(bool)$request->get('SHOW_FACT_ICONS'));
-        $tree->setPreference('SHOW_GEDCOM_RECORD', (string)(bool)$request->get('SHOW_GEDCOM_RECORD'));
-        $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string)(bool)$request->get('SHOW_HIGHLIGHT_IMAGES'));
-        $tree->setPreference('SHOW_LAST_CHANGE', (string)(bool)$request->get('SHOW_LAST_CHANGE'));
-        $tree->setPreference('SHOW_LDS_AT_GLANCE', (string)(bool)$request->get('SHOW_LDS_AT_GLANCE'));
+        $tree->setPreference('SHOW_COUNTER', (string) (bool) $request->get('SHOW_COUNTER'));
+        $tree->setPreference('SHOW_EST_LIST_DATES', (string) (bool) $request->get('SHOW_EST_LIST_DATES'));
+        $tree->setPreference('SHOW_FACT_ICONS', (string) (bool) $request->get('SHOW_FACT_ICONS'));
+        $tree->setPreference('SHOW_GEDCOM_RECORD', (string) (bool) $request->get('SHOW_GEDCOM_RECORD'));
+        $tree->setPreference('SHOW_HIGHLIGHT_IMAGES', (string) (bool) $request->get('SHOW_HIGHLIGHT_IMAGES'));
+        $tree->setPreference('SHOW_LAST_CHANGE', (string) (bool) $request->get('SHOW_LAST_CHANGE'));
+        $tree->setPreference('SHOW_LDS_AT_GLANCE', (string) (bool) $request->get('SHOW_LDS_AT_GLANCE'));
         $tree->setPreference('SHOW_MEDIA_DOWNLOAD', $request->get('SHOW_MEDIA_DOWNLOAD'));
         $tree->setPreference('SHOW_NO_WATERMARK', $request->get('SHOW_NO_WATERMARK'));
-        $tree->setPreference('SHOW_PARENTS_AGE', (string)(bool)$request->get('SHOW_PARENTS_AGE'));
+        $tree->setPreference('SHOW_PARENTS_AGE', (string) (bool) $request->get('SHOW_PARENTS_AGE'));
         $tree->setPreference('SHOW_PEDIGREE_PLACES', $request->get('SHOW_PEDIGREE_PLACES'));
-        $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string)(bool)$request->get('SHOW_PEDIGREE_PLACES_SUFFIX'));
+        $tree->setPreference('SHOW_PEDIGREE_PLACES_SUFFIX', (string) (bool) $request->get('SHOW_PEDIGREE_PLACES_SUFFIX'));
         $tree->setPreference('SHOW_RELATIVES_EVENTS', implode(',', $request->get('SHOW_RELATIVES_EVENTS', [])));
         $tree->setPreference('SOUR_FACTS_ADD', implode(',', $request->get('SOUR_FACTS_ADD', [])));
         $tree->setPreference('SOUR_FACTS_QUICK', implode(',', $request->get('SOUR_FACTS_QUICK', [])));
         $tree->setPreference('SOUR_FACTS_UNIQUE', implode(',', $request->get('SOUR_FACTS_UNIQUE', [])));
-        $tree->setPreference('SUBLIST_TRIGGER_I', (string)(int)$request->get('SUBLIST_TRIGGER_I', 200));
+        $tree->setPreference('SUBLIST_TRIGGER_I', (string) (int) $request->get('SUBLIST_TRIGGER_I', 200));
         $tree->setPreference('SURNAME_LIST_STYLE', $request->get('SURNAME_LIST_STYLE'));
         $tree->setPreference('SURNAME_TRADITION', $request->get('SURNAME_TRADITION'));
         $tree->setPreference('THEME_DIR', $request->get('THEME_DIR'));
-        $tree->setPreference('USE_SILHOUETTE', (string)(bool)$request->get('USE_SILHOUETTE'));
+        $tree->setPreference('USE_SILHOUETTE', (string) (bool) $request->get('USE_SILHOUETTE'));
         $tree->setPreference('WEBMASTER_USER_ID', $request->get('WEBMASTER_USER_ID'));
         $tree->setPreference('WEBTREES_EMAIL', $request->get('WEBTREES_EMAIL'));
         $tree->setPreference('title', $request->get('title'));
@@ -1607,7 +1607,7 @@ 
 
         foreach ($gedcom_files as $gedcom_file) {
             // Only import files that have changed
-            $filemtime = (string)filemtime(WT_DATA_DIR . $gedcom_file);
+            $filemtime = (string) filemtime(WT_DATA_DIR . $gedcom_file);
 
             $tree = Tree::findByName($gedcom_file) ?? Tree::create($gedcom_file, $gedcom_file);
 
@@ -1640,7 +1640,7 @@ 
      */
     public function unconnected(Request $request, Tree $tree, User $user): Response
     {
-        $associates = (bool)$request->get('associates');
+        $associates = (bool) $request->get('associates');
 
         if ($associates) {
             $sql = "SELECT l_from, l_to FROM `##link` WHERE l_file = :tree_id AND l_type IN ('FAMS', 'FAMC', 'ASSO', '_ASSO')";

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;
         }