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/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/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/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];

app/Http/Controllers/AdminMediaController.php

Spacing +9 added lines, -9 removed lines

@@ -119,8 +119,8 @@ 
         $files  = $request->get('files'); // local|external|unused
         $search = $request->get('search');
         $search = $search['value'];
-        $start  = (int)$request->get('start');
-        $length = (int)$request->get('length');
+        $start  = (int) $request->get('start');
+        $length = (int) $request->get('length');
 
         // family tree setting MEDIA_DIRECTORY
         $media_folders = $this->allMediaFolders();
@@ -156,7 +156,7 @@ 
                     "  OR   descriptive_title LIKE CONCAT('%', :search_2, '%'))" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS1   = [
+                $ARGS1 = [
                     'media_path_1' => $media_path,
                     'media_folder' => $media_folder,
                     'media_path_2' => Database::escapeLike($media_path),
@@ -173,7 +173,7 @@ 
                     " AND   multimedia_file_refn LIKE CONCAT(:media_path_3, '%')" .
                     " AND   multimedia_file_refn NOT LIKE 'http://%'" .
                     " AND   multimedia_file_refn NOT LIKE 'https://%'";
-                $ARGS2   = [
+                $ARGS2 = [
                     'media_folder' => $media_folder,
                     'media_path_3' => $media_path,
                 ];
@@ -185,7 +185,7 @@ 
                     $ARGS2['media_path_4'] = Database::escapeLike($media_path);
                 }
 
-                $order   = $request->get('order', []);
+                $order = $request->get('order', []);
                 $SELECT1 .= " ORDER BY ";
                 if ($order) {
                     foreach ($order as $key => $value) {
@@ -209,7 +209,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -242,7 +242,7 @@ 
                     " JOIN  `##media_file` USING (m_id, m_file)" .
                     " WHERE (multimedia_file_refn LIKE 'http://%' OR multimedia_file_refn LIKE 'https://%')" .
                     " AND   (multimedia_file_refn LIKE CONCAT('%', :search_1, '%') OR descriptive_title LIKE CONCAT('%', :search_2, '%'))";
-                $ARGS1   = [
+                $ARGS1 = [
                     'search_1' => Database::escapeLike($search),
                     'search_2' => Database::escapeLike($search),
                 ];
@@ -278,7 +278,7 @@ 
                 }
 
                 if ($length > 0) {
-                    $SELECT1         .= " LIMIT :length OFFSET :start";
+                    $SELECT1 .= " LIMIT :length OFFSET :start";
                     $ARGS1['length'] = $length;
                     $ARGS1['start']  = $start;
                 }
@@ -660,7 +660,7 @@ 
         $full_path = WT_DATA_DIR . $media_folder . $media_path . $file;
         try {
             $size = filesize($full_path);
-            $size = (int)(($size + 1023) / 1024); // Round up to next KB
+            $size = (int) (($size + 1023) / 1024); // Round up to next KB
             /* I18N: size of file in KB */
             $size = I18N::translate('%s KB', I18N::number($size));
             $html .= '<dt>' . I18N::translate('File size') . '</dt>';