From 1775da67cc373fcda3d6b8668c67f4868061c27f Mon Sep 17 00:00:00 2001
From: NoobishSVK <ardoniceksvk@gmail.com>
Date: Mon, 22 Apr 2024 21:44:39 +0200
Subject: [PATCH] bugfixes

---
 server/endpoints.js | 2 +-
 server/index.js     | 6 +++---
 web/js/3las/main.js | 4 ++--
 web/js/init.js      | 6 +++---
 web/setup.ejs       | 4 +++-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/server/endpoints.js b/server/endpoints.js
index 15ccae5..2b4bc41 100644
--- a/server/endpoints.js
+++ b/server/endpoints.js
@@ -16,7 +16,7 @@ const fmdxList = require('./fmdx_list');
 
 // Endpoints
 router.get('/', (req, res) => {
-    if(serverConfig.webserver.banlist.includes(req.connection.remoteAddress)) {
+    if(serverConfig.webserver.banlist.includes(req.connection.remoteAddress || req.headers['x-forwarded-for'])) {
         res.render('403');
         return;
     }
diff --git a/server/index.js b/server/index.js
index b941599..e9ee676 100644
--- a/server/index.js
+++ b/server/index.js
@@ -86,7 +86,7 @@ function connectToSerial() {
       serialport.write('F-1\n');
       serialport.write('W0\n');
       serialport.write('D0\n');
-      serialport.write('G11\n');
+      serialport.write('G00\n');
       serverConfig.audio.startupVolume ? serialport.write('Y' + (serverConfig.audio.startupVolume * 100).toFixed(0) + '\n') : serialport.write('Y100\n');
       
       serialport.on('data', (data) => {
@@ -277,7 +277,7 @@ wss.on('connection', (ws, request) => {
         return;
     }
 
-    if (command.includes("'")) {
+    if (command.includes("\'")) {
         return;
     }
 
@@ -448,4 +448,4 @@ httpServer.listen(serverConfig.webserver.webserverPort, serverConfig.webserver.w
   }
 });
 
-fmdxList.update();
+fmdxList.update();
\ No newline at end of file
diff --git a/web/js/3las/main.js b/web/js/3las/main.js
index 8d6ae5f..e2f9346 100644
--- a/web/js/3las/main.js
+++ b/web/js/3las/main.js
@@ -25,12 +25,12 @@ function OnPlayButtonClick(_ev) {
             Stream.Stop();
         } else {
             Stream.Start();
-            const $playbutton = $('.playbutton');
-            $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
             $playbutton.addClass('bg-gray').prop('disabled', true);
             setTimeout(() => {
                 $playbutton.removeClass('bg-gray').prop('disabled', false);
             }, 3000);
+            const $playbutton = $('.playbutton');
+            $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
         }
     } catch (error) {
         console.error(error);
diff --git a/web/js/init.js b/web/js/init.js
index f30b9a2..dbcd4a3 100644
--- a/web/js/init.js
+++ b/web/js/init.js
@@ -1,9 +1,9 @@
-var currentDate = new Date('April 6, 2024 01:00:00');
+var currentDate = new Date('April 22, 2024 22:00:00');
 var day = currentDate.getDate();
 var month = currentDate.getMonth() + 1; // Months are zero-indexed, so add 1
 var year = currentDate.getFullYear();
 var formattedDate = day + '/' + month + '/' + year;
-var currentVersion = 'v1.1.9b [' + formattedDate + ']';
+var currentVersion = 'v1.1.9c [' + formattedDate + ']';
 
 getInitialSettings();
 
@@ -25,4 +25,4 @@ function getInitialSettings() {
             console.error('Error:', error);
         }
     });
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/web/setup.ejs b/web/setup.ejs
index fb76fdb..db1ad20 100644
--- a/web/setup.ejs
+++ b/web/setup.ejs
@@ -59,6 +59,7 @@
                             <th>IP Address</th>
                             <th>Location</th>
                             <th>Online since</th>
+                            <th></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -68,11 +69,12 @@
                                     <td><%= user.ip %></td>
                                     <td><%= user.location %></td>
                                     <td><%= user.time %></td>
+                                    <td><a href="./kick?user=<% user.ip %>">Kick</a></td>
                                 </tr>
                             <% }); %>
                         <% } else { %>
                             <tr>
-                                <td colspan="3" style="text-align: center">No users online</td>
+                                <td colspan="4" style="text-align: center">No users online</td>
                             </tr>
                         <% } %>
                     </tbody>