user kick, plugins, bugfixes

web/js/3las/main.js

@@ -20,6 +20,8 @@ function OnConnectivityCallback(isConnected) {
 }
 
 function OnPlayButtonClick(_ev) {
+    const $playbutton = $('.playbutton');
+    $playbutton.find('.fa-solid').toggleClass('fa-play fa-stop');
     try {
         if (Stream.ConnectivityFlag) {
             Stream.Stop();
@@ -29,8 +31,6 @@ function OnPlayButtonClick(_ev) {
             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);

web/js/confighandler.js

@@ -11,6 +11,7 @@ function submitData() {
     const defaultTheme = themeDataValue;
 
     const bgImage = $("#bg-image").val() || '';
+    const rdsMode = $('#rds-mode').is(":checked") || false;
     
     const ant1enabled = $('#ant1-enabled').is(":checked") || false;
     const ant2enabled = $('#ant2-enabled').is(":checked") || false;
@@ -71,6 +72,11 @@ function submitData() {
     const tunePass = $('#tune-pass').val();
     const adminPass = $('#admin-pass').val();
 
+    let plugins = [];
+    $('#plugin-list option:selected').each(function() {
+      plugins.push($(this).data('name'));
+  });
+
     const publicTuner = $("#tuner-public").is(":checked");
     const lockToAdmin = $("#tuner-lock").is(":checked");
     const autoShutdown = $("#shutdown-tuner").is(":checked") || false;
@@ -88,7 +94,8 @@ function submitData() {
         defaultTheme,
         presets,
         banlist,
-        bgImage
+        bgImage,
+        rdsMode,
       },
       antennas: {
         enabled: antennasEnabled,
@@ -136,6 +143,7 @@ function submitData() {
         tunePass,
         adminPass,
       },
+      plugins,
       device,
       publicTuner, 
       lockToAdmin,
@@ -181,6 +189,7 @@ function submitData() {
         $("#chat-switch").prop("checked", data.webserver.chatEnabled || false);
 
         $('#selected-theme').val(data.webserver.defaultTheme || 'Default');
+        $('#rds-mode').prop("checked", data.webserver.rdsMode || false);
 
         var selectedTheme = $(".option[data-value='" + data.webserver.defaultTheme + "']");
         
@@ -273,6 +282,14 @@ function submitData() {
         $("#shutdown-tuner").prop("checked", data.autoShutdown);
         $("#antenna-switch").prop("checked", data.antennas?.enabled);
 
+        data.plugins.forEach(function(name) {
+          // Find the option with the corresponding data-name attribute and mark it as selected
+          $('#plugin-list option[data-name="' + name + '"]').prop('selected', true);
+        });
+      
+        // Update the multi-select element to reflect the changes
+        $('#plugin-list').trigger('change');
+
         // Check if latitude and longitude are present in the data
         if (data.identification.lat && data.identification.lon) {
           // Set the map's center to the received coordinates

web/js/dropdown.js

@@ -54,3 +54,18 @@ const closeDropdownFromOutside = (event) => {
 $(document).on('click', closeDropdownFromOutside);
 $listOfOptions.on('click', selectOption);
 $dropdowns.on('click', toggleDropdown);
+
+// MULTISELECT
+$('.multiselect option').mousedown(function(e) {
+  e.preventDefault();
+  var originalScrollTop = $(this).parent().scrollTop();
+  console.log(originalScrollTop);
+  $(this).prop('selected', $(this).prop('selected') ? false : true);
+  var self = this;
+  $(this).parent().focus();
+  setTimeout(function() {
+      $(self).parent().scrollTop(originalScrollTop);
+  }, 0);
+  
+  return false;
+});

web/js/init.js

@@ -3,7 +3,7 @@ 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.9c [' + formattedDate + ']';
+var currentVersion = 'v1.2.0 [' + formattedDate + ']';
 
 getInitialSettings();
 
@@ -20,6 +20,7 @@ function getInitialSettings() {
             localStorage.setItem('preset3', data.presets[2]);
             localStorage.setItem('preset4', data.presets[3]);
             localStorage.setItem('bgImage', data.bgImage);
+            localStorage.setItem('rdsMode', data.rdsMode);
         },
         error: function (error) {
             console.error('Error:', error);

web/js/main.js

@@ -25,6 +25,8 @@ const usa_programmes = [
     "Spanish Talk", "Spanish Music", "Hip Hop", "", "", "Weather", "Emergency Test", "Emergency" 
 ];
 
+const rdsMode = localStorage.getItem('rdsMode');
+
 $(document).ready(function () {
     var canvas = $('#signal-canvas')[0];
 
@@ -359,7 +361,16 @@ function updateCanvas(parsedData, signalChart) {
 }
 
 socket.onmessage = (event) => {
+    if (event.data == 'KICK') {
+        console.log('Kick iniitiated.')
+        setTimeout(() => {
+          window.location.href = '/403';
+        }, 500); // Adjust the delay as needed
+        return;
+    }
+
     parsedData = JSON.parse(event.data);
+
     updatePanels(parsedData);
     if(localStorage.getItem("smoothSignal") == 'true') {
         const sum = signalData.reduce((acc, strNum) => acc + parseFloat(strNum), 0);
@@ -701,7 +712,7 @@ const updateDataElements = throttle(function(parsedData) {
     updateHtmlIfChanged($dataRt0, processString(parsedData.rt0, parsedData.rt0_errors));
     updateHtmlIfChanged($dataRt1, processString(parsedData.rt1, parsedData.rt1_errors));
 
-    updateTextIfChanged($dataPty, europe_programmes[parsedData.pty]);
+    updateTextIfChanged($dataPty, rdsMode == 'true' ? usa_programmes[parsedData.pty] : europe_programmes[parsedData.pty]);
 
     if (parsedData.rds === true) {
         $flagDesktopCointainer.css('background-color', 'var(--color-2)');