Uppdaterade funktionalitet i admin panelen och fixade att /scoreboard inte visade användar sessioner

app/Http/Controllers/AuthController.php

···
         $ldap = ldap_connect('ldaps://ad.ssis.nu');
         if($ldap === false) // Skicka personen till hem sidan om ldapen är nere
         {
-            return view('pages.home', ['error' => 'Elev servern verkar vara nere. Kontakta ' . $_ENV['MAINTAINER_NAMN'] . '!']);
+            return view('pages.home', ['error' => 'Elev servern verkar vara nere. Kontakta ' . $_ENV['MAINTAINER_NAME'] . '!']);
         }
         $bind = ldap_bind($ldap, $username . "@ad.ssis.nu", $request->post('password'));
 
···
 
         if($userInfo['count'] == 0)
         {
-            return view('pages.home', ['error' => 'Kunde inte hitta dig i elev servern. Är du inte en elev? Kontakta ' . $_ENV['MAINTAINER_NAMN'] . ' om du vill ha tillgång.']);
+            return view('pages.home', ['error' => 'Kunde inte hitta dig i elev servern. Är du inte en elev? Kontakta ' . $_ENV['MAINTAINER_NAME'] . ' om du vill ha tillgång.']);
         }
         $userInfo = $userInfo[0];
 

app/Http/Controllers/EventsController.php

···
         return redirect("/admin/events/$eventId?success=Återupplivade användaren");
     }
 
+    function killUser(Request $request, $eventId)
+    {
+        // Kolla om eleven är admin
+        if(!isset($_SESSION['qrtag']['is_admin']) || !$_SESSION['qrtag']['is_admin'])
+        {
+            return view('pages.home');
+        }
+
+        // Kolla så att useridt gavs
+        $userId = $request->post('user_id');
+
+        if(is_null($userId))
+        {
+            return redirect("/admin/events/$eventId?error=Inget userid gavs.");
+        }
+
+        // Kolla så att eventet finns och är igång
+        $event = DB::table('events')
+            ->select('id', 'start_date', 'end_date', 'name', 'winner')
+            ->where('start_date', '<=', now())
+            ->where('end_date', '>', now())
+            ->where('id', $eventId)
+            ->orderBy('start_date', 'asc')
+            ->first();
+
+        if(is_null($event))
+        {
+            return redirect("/admin/events/$eventId?error=Eventet måste existera och vara igång för att man ska kunna återuppliva.");
+        }
+
+        // Kolla så att spelaren finns
+        $eventUser = DB::table('event_users')
+            ->where('user_id', $userId)
+            ->where('event_id', $eventId)
+            ->first();
+
+        if(is_null($eventUser))
+        {
+            return redirect("/admin/events/$eventId?error=Kunde $userId inte hitta en spelare med id:t i eventet.");
+        }
+
+        // Kolla så att man inte mördar en död spelare
+        if(!$eventUser->is_alive)
+        {
+            return redirect("/admin/events/$eventId?error=Spelaren är redan död.");
+        }
+
+        // Gör så att den som har spelaren som ska mördas som target får spelaren som ska mördas target
+        DB::table('event_users')
+            ->where('target_id', $userId)
+            ->update([
+                'target_id' => $eventUser->target_id
+            ]);
+
+        // Sätt spelaren till död
+        DB::table('event_users')
+            ->where('user_id', $userId)
+            ->update([
+                'is_alive' => false
+            ]);
+
+        $playersLeft = DB::table('event_users')->where('event_id', $eventId)->where('is_alive', true)->count();
+        if($playersLeft === 1)
+        {
+            $lastAlivePlayer = DB::table('event_users')->where('event_id', $eventId)->where('is_alive', true)->first();
+            DB::table('events')->where('id', $eventId)->update([
+                'winner' => $lastAlivePlayer->id
+            ]);
+
+            $message = $lastAlivePlayer->display_name . " har vunnit " . $event->name . "! Grattis!";
+
+            $options = array(
+                'http' => array(
+                    'header'  => "Content-type: application/x-www-form-urlencoded",
+                    'method'  => 'POST',
+                    'content' => http_build_query(array('content' => $message))
+                )
+            );
+            $context  = stream_context_create($options);
+            $result = file_get_contents($_ENV['DISCORD_WEBHOOK'], false, $context);
+        }
+
+        return redirect("/admin/events/$eventId?success=Dödade användaren");
+    }
+
     function reviveAll(Request $request, $eventId) {
         // Kolla om eleven är admin
         if(!isset($_SESSION['qrtag']['is_admin']) || !$_SESSION['qrtag']['is_admin'])

resources/views/layouts/base.blade.php

···
         @include('includes.header', ['items' => $header])
         <div class="row ms-sidebar">
             @yield('main')
+
+            @if(!isset($nofooter) || !$nofooter)
+                <div class="d-flex flex-column col-md-9 col-sm-12 mx-auto">
+                    <div class="py-5 mt-5 text-center w-100">
+                        <footer class="d-flex flex-wrap justify-content-between align-items-center py-3 mt-4 border-top">
+                            <div class="col-md-4 d-flex align-items-center w-100">
+                                <span class="text-body-secondary">Rapportera eventuella buggar till {{ $_ENV['MAINTAINER_NAME'] }}</span>
+                            </div>
+                        </footer>
+                    </div>
+                </div>
+            @endif
         </div>
     </div>
 

resources/views/pages/admin/event.blade.php

···
         ['!Event', '/admin/'],
         ['Användare', '/admin/users']
     ],
-    'titleSuffix' => 'Admin'
+    'titleSuffix' => 'Admin',
+    'nofooter' => true
 ])
 @section('main')
 <style>
···
                     <th scope="col">Hemlis</th>
                     <th scope="col">Mål</th>
                     <th scope="col">Vid liv</th>
+                    <th scope="col"></th>
                 </tr>
             </thead>
             <tbody>
···
                         <th scope="row">{{ $user->id }}</th>
                         <td>{{ $user->display_name }}</td>
                         <td>{{ $user->class }}</td>
-                        <td>{{ $user->tags }}</td>
+                        <td>{{ $user->tag_count }}</td>
                         <td class="hide">{{ $user->secret }}</td>
                         <td class="hide">{{ $user->target_display_name }}</td>
                         @if($user->is_alive)
···
                         @else
                             <td>
                                 Nej
+                            </td>
+                        @endif
+                        @if($user->is_alive)
+                            <td>
+                                <form action="/api/events/{{ $eventId }}/kill" method="POST">
+                                    @method("PATCH")
+                                    <input type="hidden" id="custId" name="user_id" value="{{ $user->user_id }}">
+                                    <button class="btn btn-link">
+                                        Kill
+                                    </button>
+                                </form>
+                            </td>
+                        @else
+                            <td>
                                 <form action="/api/events/{{ $eventId }}/revive" method="POST">
                                     @method("PATCH")
                                     <input type="hidden" id="custId" name="user_id" value="{{ $user->user_id }}">

resources/views/pages/admin/events.blade.php

···
         ['!Event', '/admin/'],
         ['Användare', '/admin/users']
     ],
-    'titleSuffix' => 'Admin'
+    'titleSuffix' => 'Admin',
+    'nofooter' => true
 ])
 @section('main')
 <button class="btn btn-success position-fixed mt-2 ms-3" style="width: 150px" data-bs-toggle="modal" data-bs-target="#createEvent">

resources/views/pages/admin/users.blade.php

···
         ['Event', '/admin/'],
         ['!Användare', '/admin/users']
     ],
-    'titleSuffix' => 'Admin'
+    'titleSuffix' => 'Admin',
+    'nofooter' => true
 ])
 @section('main')
 <button class="btn btn-success position-fixed mt-2 ms-3" style="width: 150px" data-bs-toggle="modal" data-bs-target="#createUser">

routes/api.php

···
 Route::post('/events/{eventId}/players', [EventsController::class, 'addPlayer'])->where('eventId', '[0-9]+')->middleware(VerifySession::class);
 Route::patch('/events/{eventId}/change-target', [EventsController::class, 'changeTarget'])->where('eventId', '[0-9]+')->middleware(VerifySession::class);
 Route::patch('/events/{eventId}/revive', [EventsController::class, 'reviveUser'])->where('eventId', '[0-9]+')->middleware(VerifySession::class);
+Route::patch('/events/{eventId}/kill', [EventsController::class, 'killUser'])->where('eventId', '[0-9]+')->middleware(VerifySession::class);
 Route::patch('/events/{eventId}/revive-all', [EventsController::class, 'reviveAll'])->where('eventId', '[0-9]+')->middleware(VerifySession::class);
 
 Route::post('/users', [UsersController::class, 'store'])->middleware(VerifySession::class);

routes/web.php

···
         'players' => $players,
         'tags' => $tags
     ]);
-});
+})->middleware(VerifySession::class);;
 
 Route::prefix('admin')->group(function() {
     Route::get('/', function () {
···
     })->middleware(VerifySession::class);
 
     Route::get('/events/{eventId}', function (Request $request, $eventId) {
-        $participants = DB::table('event_users')
-            ->select(
-                'event_users.id as id',
-                'users.display_name as display_name',
-                'users.class as class',
-                'event_users.target_id',
-                'event_users.user_id',
-                DB::raw('(SELECT display_name FROM users WHERE users.id = event_users.target_id) as target_display_name'),
-                'event_users.secret',
-                'event_users.is_alive',
-                DB::raw('(SELECT COUNT(*) FROM event_tags WHERE user_id = users.id AND target_id = event_users.target_id AND event_id = ' . $eventId . ') as tags')
-            )
-            ->join('users', 'event_users.user_id', '=', 'users.id')
-            ->where('event_users.event_id', $eventId)
-            ->get();
+        $participants = DB::select("
+            SELECT 
+                event_users.id as id,
+                users.display_name as display_name,
+                users.class as class,
+                event_users.target_id,
+                event_users.user_id,
+                (SELECT display_name FROM users WHERE users.id = event_users.target_id) as target_display_name,
+                event_users.secret,
+                event_users.is_alive,
+                COALESCE(COUNT(`event_tags`.`event_id`), 0) AS tag_count
+            FROM event_users
+            LEFT JOIN users ON event_users.user_id = users.id
+            LEFT JOIN `event_tags` ON `users`.`id` = `event_tags`.`user_id` AND `event_tags`.`event_id` = " . $eventId . "
+            WHERE event_users.event_id = " . $eventId . "
+            GROUP BY id, display_name, class, target_id, user_id, target_display_name, secret, is_alive
+        ");
 
         $event = DB::table('events')
             ->where('id', $eventId)