diff --git a/src/modules/sub-web.js b/src/modules/sub-web.js
index bc12bfa..5bf5cf4 100644
--- a/src/modules/sub-web.js
+++ b/src/modules/sub-web.js
@@ -185,7 +185,11 @@ function IOConnection(io) {
var utoken = ucookies.token
const online_users_data = auth.getSimpleUser(utoken)
- usersOnline.push(online_users_data)
+ if(online_users_data) {
+
+ usersOnline.push(online_users_data)
+ }
+
}
io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline)
@@ -201,7 +205,10 @@ function IOConnection(io) {
var utoken = ucookies.token
const online_users_data = auth.getSimpleUser(utoken)
- usersOnline.splice(usersOnline.indexOf(online_users_data), 1)
+ if(online_users_data) {
+ usersOnline.splice(usersOnline.indexOf(online_users_data), 1)
+ }
+
}
io.sockets.emit("ALWAYS/ALL_CONNECTED_USER", usersOnline)
diff --git a/src/web/public/javascript/__index_script.js b/src/web/public/javascript/__index_script.js
index 2731fd8..31b50b9 100644
--- a/src/web/public/javascript/__index_script.js
+++ b/src/web/public/javascript/__index_script.js
@@ -53,6 +53,7 @@ const playlistContent = document.getElementById("playlist-content")
var wasOnPlaylist = false
+var wasOnHome = false
var playlistSelected = null
var playlistValue = null
@@ -127,6 +128,7 @@ function showToolTip(id, text, e) {
homeBtn.addEventListener("click", () => {
+ wasOnHome = true
loadHome()
})
@@ -151,22 +153,28 @@ function loadHome() {
socket.on("ALWAYS/ALL_CONNECTED_USER", (resp) => {
- const website_list = document.getElementById("website_list")
- const userToPush = new Array()
-
- userToPush.push("
Personnes en ligne
")
-
- for(var user of resp ) {
-
- userToPush.push(`${user.global_name}
${user.username}
`)
+ if(wasOnHome) {
+ const website_list = document.getElementById("website_list")
+ const userToPush = new Array()
+
+ userToPush.push(" Personnes en ligne
")
+
+ for(var user of resp ) {
+
+ userToPush.push(`${user.global_name}
${user.username}
`)
+
+ }
+
+ website_list.innerHTML = userToPush.join("")
}
-
- website_list.innerHTML = userToPush.join("")
+
})
socket.on("ALWAYS/ALL_RADIO", (resp) => {
+ if(wasOnHome) {
+
const radio_list = document.getElementById("radio_list")
const radioToPush = new Array()
@@ -210,6 +218,9 @@ socket.on("ALWAYS/ALL_RADIO", (resp) => {
radio_list.innerHTML = radioToPush.join("")
+ if(isAdmin) {
+
+
const radio_dialog = document.getElementById("radio_dialog")
const radio_close = document.getElementById("radio_close")
@@ -218,29 +229,35 @@ socket.on("ALWAYS/ALL_RADIO", (resp) => {
const radio_info = document.getElementById("radio_info")
const radio_host = document.getElementById("radio_host")
- radio_add.addEventListener("click", () => {
- radio_info.innerHTML = ""
- radio_host.value = ""
- radio_dialog.showModal()
- })
-
- radio_close.addEventListener("click", () => {
- radio_info.innerHTML = ""
- radio_dialog.close()
- })
-
- radio_send.addEventListener("click", () => {
- if(radio_host.value != '') {
-
- send("RADIO/ADD", radio_host.value)
+ if(radio_add) {
+ radio_add.addEventListener("click", () => {
+ radio_info.innerHTML = ""
+ radio_host.value = ""
+ radio_dialog.showModal()
+ })
+
+ radio_close.addEventListener("click", () => {
+ radio_info.innerHTML = ""
radio_dialog.close()
- } else {
-
- radio_info.innerHTML = "Remplissez une URL !"
- }
-
- })
+ })
+
+ radio_send.addEventListener("click", () => {
+ if(radio_host.value != '') {
+
+ send("RADIO/ADD", radio_host.value)
+ radio_dialog.close()
+ } else {
+
+ radio_info.innerHTML = "Remplissez une URL !"
+ }
+
+ })
+ }
+
+
+
+ }
for(var title of resp ) {
@@ -254,7 +271,7 @@ socket.on("ALWAYS/ALL_RADIO", (resp) => {
-
+ }
})
loadHome()
@@ -423,6 +440,8 @@ socket.on("ANSWER/GET/PLAYLIST", (data) => {
function loadPlaylist(key, value) {
+ wasOnHome = false
+
var playlistToPush = new Array()
var playlist_songs = new Array()
diff --git a/src/web/public/javascript/__settings_script.js b/src/web/public/javascript/__settings_script.js
index 9a10d60..0d6d2b5 100644
--- a/src/web/public/javascript/__settings_script.js
+++ b/src/web/public/javascript/__settings_script.js
@@ -2,6 +2,8 @@ var wasOnNodes = false
settingsBtn.addEventListener("click", () => {
+ wasOnHome = false
+
mainView.innerHTML = `