move View::show* methods into template

dragonandy · Dec 9, 2021 · 9669dbe · 9669dbe
1 parent 66c18b1
commit 9669dbe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/sections/user/sessions.php b/sections/user/sessions.php
@@ -1,18 +1,18 @@
 <?php
 
 if (!isset($_GET['userid'])) {
-    $userId = $Viewer->id();
-} elseif (!check_perms('users_view_ips') || !check_perms('users_logout')) {
-        error(403);
+    $user = $Viewer;
 } else {
-    $userId = (int)$_GET['userid'];
-}
-$user = (new Gazelle\Manager\User)->findById($userId);
-if (is_null($user)) {
-    error(404);
+    if (!$Viewer->permitted('users_view_ips') || !$Viewer->permitted('users_logout')) {
+        error(403);
+    }
+    $user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+    if (is_null($user)) {
+        error(404);
+    }
 }
 
-$sessionMan = new Gazelle\Session($userId);
+$sessionMan = new Gazelle\Session($user->id());
 if (isset($_POST['all'])) {
     authorize();
     $sessionMan->dropAll();
@@ -22,11 +22,9 @@
     $sessionMan->drop($_POST['session']);
 }
 
-View::show_header($user->username().' &rsaquo; Sessions');
 echo $Twig->render('user/session.twig', [
     'auth'    => $Viewer->auth(),
     'current' => $SessionID,
     'session' => $sessionMan->loadSessions(),
     'user'    => $user,
 ]);
-View::show_footer();
diff --git a/templates/user/session.twig b/templates/user/session.twig
@@ -1,3 +1,4 @@
+{{ header(user.username ~' &rsaquo; Sessions') }}
 <div class="thin">
 <h2>{{ user.id|user_url }} &rsaquo; Sessions</h2>
     <div class="box pad">
@@ -38,3 +39,4 @@
         </table>
     </div>
 </div>
+{{ footer() }}