fisharebest / webtrees

app/Http/Controllers/ListController.php

Spacing +6 added lines, -6 removed lines

@@ -145,7 +145,7 @@ 
                     'ged'      => $tree->name(),
                     'show_all' => 'yes',
                 ];
-                $show    = $request->get('show', 'surn');
+                $show = $request->get('show', 'surn');
             }
         } elseif ($surname) {
             $alpha    = $this->localization_service->initialLetter($surname); // so we can highlight the initial letter
@@ -520,7 +520,7 @@ 
     private function allMedia(Tree $tree, string $folder, string $subfolders, string $sort, string $filter, string $form_type): array
     {
         // All files in the folder, plus external files
-        $sql  =
+        $sql =
             "SELECT m_id AS xref, m_gedcom AS gedcom" .
             " FROM `##media`" .
             " JOIN `##media_file` USING (m_id, m_file)" .
@@ -539,11 +539,11 @@ 
         // Include / exclude subfolders (but always include external)
         switch ($subfolders) {
             case 'include':
-                $sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
+                $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') $sql_external)";
                 $args[] = Database::escapeLike($folder);
                 break;
             case 'exclude':
-                $sql    .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
+                $sql .= " AND (multimedia_file_refn LIKE CONCAT(?, '%') AND multimedia_file_refn NOT LIKE CONCAT(?, '%/%') $sql_external)";
                 $args[] = Database::escapeLike($folder);
                 $args[] = Database::escapeLike($folder);
                 break;
@@ -551,13 +551,13 @@ 
 
         // Apply search terms
         if ($filter) {
-            $sql    .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
+            $sql .= " AND (SUBSTRING_INDEX(multimedia_file_refn, '/', -1) LIKE CONCAT('%', ?, '%') OR descriptive_title LIKE CONCAT('%', ?, '%'))";
             $args[] = Database::escapeLike($filter);
             $args[] = Database::escapeLike($filter);
         }
 
         if ($form_type) {
-            $sql    .= " AND source_media_type = ?";
+            $sql .= " AND source_media_type = ?";
             $args[] = $form_type;
         }
 

Braces +3 added lines, -1 removed lines

@@ -219,7 +219,8 @@ 
                     <li class="wt-initials-list-item d-flex">
                         <?php if ($count > 0) : ?>
                             <a href="<?= e(route($route, ['alpha' => $letter, 'ged' => $tree->name()])) ?>" class="wt-initial<?= $letter === $alpha ? ' active' : '' ?> '" title="<?= I18N::number($count) ?>"><?= $this->surnameInitial((string) $letter) ?></a>
-                        <?php else : ?>
+                        <?php else {
+    : ?>
                             <span class="wt-initial text-muted"><?= $this->surnameInitial((string) $letter) ?></span>
 
                         <?php endif ?>
@@ -273,6 +274,7 @@ 
 
             if ($show === 'indi' || $show === 'surn') {
                 $surns = $this->individual_list_service->surnames($surname, $alpha, $show_marnm === 'yes', $families, WT_LOCALE, I18N::collation());
+}
                 if ($show === 'surn') {
                     // Show the surname list
                     switch ($tree->getPreference('SURNAME_LIST_STYLE')) {

app/Module/TopPageViewsModule.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
         $top10 = DB::table('hit_counter')
             ->where('gedcom_id', '=', $tree->id())
-            ->whereIn('page_name', ['individual.php','family.php','source.php','repo.php','note.php','mediaviewer.php'])
+            ->whereIn('page_name', ['individual.php', 'family.php', 'source.php', 'repo.php', 'note.php', 'mediaviewer.php'])
             ->orderByDesc('page_count')
             ->limit((int) $num)
             ->pluck('page_count', 'page_parameter');