Apply fixes from StyleCI (#1941)

fisharebest · Oct 4, 2018 · 33f2f1a · 33f2f1a
1 parent 9e7023a
commit 33f2f1a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 32 deletions.
diff --git a/app/Http/Controllers/ListController.php b/app/Http/Controllers/ListController.php
@@ -207,9 +207,7 @@ public function individualList(Request $request, Tree $tree, User $user): Respon
             $title = I18N::translate('Families') . ' — ' . $legend;
         } else {
             $title = I18N::translate('Individuals') . ' — ' . $legend;
-        }
-
-        ?>
+        } ?>
         <div class="d-flex flex-column wt-page-options wt-page-options-individual-list d-print-none">
             <ul class="d-flex flex-wrap wt-initials-list">
 
@@ -227,47 +225,45 @@ public function individualList(Request $request, Tree $tree, User $user): Respon
                     echo '</li>';
                 }
 
-                // Search spiders don't get the "show all" option as the other links give them everything.
-                if (Session::has('initiated')) {
-                    echo '<li class="wt-initials-list-item">';
-                    echo '<a class="wt-initial' . ($show_all === 'yes' ? ' active' : '') . '" href="' . e(route($route, ['show_all' => 'yes'] + $params)) . '">';
-                    echo I18N::translate('All');
-                    echo '</a>';
-                    echo '</li>';
-                }
-                echo '</ul>';
+        // Search spiders don't get the "show all" option as the other links give them everything.
+        if (Session::has('initiated')) {
+            echo '<li class="wt-initials-list-item">';
+            echo '<a class="wt-initial' . ($show_all === 'yes' ? ' active' : '') . '" href="' . e(route($route, ['show_all' => 'yes'] + $params)) . '">';
+            echo I18N::translate('All');
+            echo '</a>';
+            echo '</li>';
+        }
+        echo '</ul>';
 
-                // Search spiders don't get an option to show/hide the surname sublists,
-                // nor does it make sense on the all/unknown/surname views
-                if (Session::has('initiated') && $show !== 'none') {
-                    if ($show_marnm === 'yes') {
-                        echo '<p><a href="', e(route($route, [
+        // Search spiders don't get an option to show/hide the surname sublists,
+        // nor does it make sense on the all/unknown/surname views
+        if (Session::has('initiated') && $show !== 'none') {
+            if ($show_marnm === 'yes') {
+                echo '<p><a href="', e(route($route, [
                                 'show'       => $show,
                                 'show_marnm' => 'no',
                             ] + $params)), '">', I18N::translate('Exclude individuals with “%s” as a married name', $legend), '</a></p>';
-                    } else {
-                        echo '<p><a href="', e(route($route, [
+            } else {
+                echo '<p><a href="', e(route($route, [
                                 'show'       => $show,
                                 'show_marnm' => 'yes',
                             ] + $params)), '">', I18N::translate('Include individuals with “%s” as a married name', $legend), '</a></p>';
-                    }
+            }
 
-                    if ($alpha !== '@' && $alpha !== ',' && !$surname) {
-                        if ($show === 'surn') {
-                            echo '<p><a href="', e(route($route, [
+            if ($alpha !== '@' && $alpha !== ',' && !$surname) {
+                if ($show === 'surn') {
+                    echo '<p><a href="', e(route($route, [
                                     'show'       => 'indi',
                                     'show_marnm' => 'no',
                                 ] + $params)), '">', I18N::translate('Show the list of individuals'), '</a></p>';
-                        } else {
-                            echo '<p><a href="', e(route($route, [
+                } else {
+                    echo '<p><a href="', e(route($route, [
                                     'show'       => 'surn',
                                     'show_marnm' => 'no',
                                 ] + $params)), '">', I18N::translate('Show the list of surnames'), '</a></p>';
-                        }
-                    }
                 }
-
-                ?>
+            }
+        } ?>
         </div>
         <div class="wt-page-content">
             <?php
@@ -355,8 +351,7 @@ public function individualList(Request $request, Tree $tree, User $user): Respon
                         }
                     }
                 }
-            }
-            ?>
+            } ?>
         </div>
         <?php
 

diff --git a/app/Stats.php b/app/Stats.php
@@ -6494,7 +6494,6 @@ public function webtreesVersion(): string
      */
     private function hitCountQuery($page_name, string $page_parameter = ''): string
     {
-
         if ($page_name === '') {
             // index.php?ctype=gedcom
             $page_name      = 'index.php';