fisharebest / webtrees

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/HomePageController.php

Spacing +23 added lines, -23 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function treePageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->treeBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -71,7 +71,7 @@ 
      */
     public function treePageBlockUpdate(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->treeBlock($request, $user);
 
         $block->configureBlock($tree, $block_id);
@@ -89,7 +89,7 @@ 
      */
     private function treeBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -125,7 +125,7 @@ 
      */
     public function userPageBlockEdit(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->userBlock($request, $user);
         $title    = $block->getTitle() . ' — ' . I18N::translate('Preferences');
 
@@ -148,7 +148,7 @@ 
      */
     public function userPageBlockUpdate(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
         $block    = $this->userBlock($request, $user);
 
         $block->configureBlock($tree, $block_id);
@@ -166,7 +166,7 @@ 
      */
     private function userBlock(Request $request, User $user): ModuleBlockInterface
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block_info = Database::prepare(
             "SELECT module_Name, user_id FROM `##block` WHERE block_id = :block_id"
@@ -184,7 +184,7 @@ 
             throw new NotFoundHttpException($block_info->module_name . ' is not a block');
         }
 
-        $block_owner_id = (int)$block_info->user_id;
+        $block_owner_id = (int) $block_info->user_id;
 
         if ($block_owner_id !== $user->getUserId() && !Auth::isAdmin()) {
             throw new AccessDeniedHttpException('You are not allowed to edit this block');
@@ -230,7 +230,7 @@ 
      */
     public function treePageBlock(Request $request, Tree $tree): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id = :tree_id AND user_id IS NULL"
@@ -296,8 +296,8 @@ 
      */
     public function treePageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateTreeBlocks(-1, $main_blocks, $side_blocks);
 
@@ -341,14 +341,14 @@ 
      */
     public function treePageUpdate(Request $request, Tree $tree): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForTreePage(-1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForTreePage(-1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateTreeBlocks($tree->getTreeId(), $main_blocks, $side_blocks);
@@ -395,7 +395,7 @@ 
      */
     public function userPageBlock(Request $request, Tree $tree, User $user): Response
     {
-        $block_id = (int)$request->get('block_id');
+        $block_id = (int) $request->get('block_id');
 
         $block = Database::prepare(
             "SELECT * FROM `##block` WHERE block_id = :block_id AND gedcom_id IS NULL AND user_id = :user_id"
@@ -460,8 +460,8 @@ 
      */
     public function userPageDefaultUpdate(Request $request): RedirectResponse
     {
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks(-1, $main_blocks, $side_blocks);
 
@@ -507,14 +507,14 @@ 
      */
     public function userPageUpdate(Request $request, Tree $tree, User $user): RedirectResponse
     {
-        $defaults = (bool)$request->get('defaults');
+        $defaults = (bool) $request->get('defaults');
 
         if ($defaults) {
             $main_blocks = $this->getBlocksForUserPage(-1, -1, AUth::PRIV_NONE, 'main');
             $side_blocks = $this->getBlocksForUserPage(-1, -1, Auth::PRIV_NONE, 'side');
         } else {
-            $main_blocks = (array)$request->get('main');
-            $side_blocks = (array)$request->get('side');
+            $main_blocks = (array) $request->get('main');
+            $side_blocks = (array) $request->get('side');
         }
 
         $this->updateUserBlocks($user->getUserId(), $main_blocks, $side_blocks);
@@ -531,7 +531,7 @@ 
      */
     public function userPageUserEdit(Request $request): Response
     {
-        $user_id     = (int)$request->get('user_id');
+        $user_id     = (int) $request->get('user_id');
         $user        = User::find($user_id);
         $main_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'main');
         $side_blocks = $this->getBlocksForUserPage(-1, $user_id, Auth::PRIV_NONE, 'side');
@@ -560,9 +560,9 @@ 
      */
     public function userPageUserUpdate(Request $request): RedirectResponse
     {
-        $user_id     = (int)$request->get('user_id');
-        $main_blocks = (array)$request->get('main');
-        $side_blocks = (array)$request->get('side');
+        $user_id     = (int) $request->get('user_id');
+        $main_blocks = (array) $request->get('main');
+        $side_blocks = (array) $request->get('side');
 
         $this->updateUserBlocks($user_id, $main_blocks, $side_blocks);
 

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/Tree.php

Spacing +1 added lines, -1 removed lines

@@ -294,7 +294,7 @@
     public static function getAll()
     {
         if (empty(self::$trees)) {
-            $rows        = Database::prepare(
+            $rows = Database::prepare(
                 "SELECT g.gedcom_id AS tree_id, g.gedcom_name AS tree_name, gs1.setting_value AS tree_title" .
                 " FROM `##gedcom` g" .
                 " LEFT JOIN `##gedcom_setting`      gs1 ON (g.gedcom_id=gs1.gedcom_id AND gs1.setting_name='title')" .

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/Http/Controllers/AdminUsersController.php

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/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/Functions/FunctionsDb.php

Spacing +10 added lines, -10 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 " : "";
@@ -259,7 +259,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(),
             ];
@@ -289,7 +289,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:
@@ -303,7 +303,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;
@@ -326,7 +326,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;
@@ -381,7 +381,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) {