diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js index a8f85da5..e9f931c5 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js @@ -1,12 +1,12 @@ var minisrv_service_file = true; -if (socket.ssid != null && !ssid_sessions[socket.ssid].get("wtvsec_login")) { - var wtvsec_login = ssid_sessions[socket.ssid].createWTVSecSession(); +if (socket.ssid != null && !session_data.get("wtvsec_login")) { + var wtvsec_login = session_data.createWTVSecSession(); wtvsec_login.IssueChallenge(); if (request_headers["wtv-incarnation"]) wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); - ssid_sessions[socket.ssid].set("wtvsec_login", wtvsec_login); + session_data.set("wtvsec_login", wtvsec_login); } else if (socket.ssid != null) { - var wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login"); + var wtvsec_login = session_data.get("wtvsec_login"); } if (wtvsec_login) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index eedffaa9..b14eba97 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -3,21 +3,21 @@ var minisrv_service_file = true; var gourl = "wtv-head-waiter:/login?"; if (socket.ssid) { - if (ssid_sessions[socket.ssid].loadSessionData() == true) { + if (session_data.loadSessionData() == true) { console.log(" * Loaded session data from disk for", wtvshared.filterSSID(socket.ssid)) - ssid_sessions[socket.ssid].setSessionData("registered", (ssid_sessions[socket.ssid].getSessionData("registered") == true) ? true : false); + session_data.setSessionData("registered", (session_data.getSessionData("registered") == true) ? true : false); } else { - ssid_sessions[socket.ssid].session_data = {}; - ssid_sessions[socket.ssid].setSessionData("registered", false); + session_data.session_data = {}; + session_data.setSessionData("registered", false); } - if (ssid_sessions[socket.ssid].data_store) { - if (ssid_sessions[socket.ssid].data_store.sockets) { + if (session_data.data_store) { + if (session_data.data_store.sockets) { var i = 0; - ssid_sessions[socket.ssid].data_store.sockets.forEach(function (k) { + session_data.data_store.sockets.forEach(function (k) { if (typeof k != "undefined") { if (k != socket) { k.destroy(); - ssid_sessions[socket.ssid].data_store.sockets.delete(k); + session_data.data_store.sockets.delete(k); i++; } } @@ -25,14 +25,14 @@ if (socket.ssid) { if (i > 0 && minisrv_config.config.debug_flags.debug) console.log(" # Closed", i, "previous sockets for", wtvshared.filterSSID(socket.ssid)); } } - if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { + if (session_data.data_store.wtvsec_login) { if (minisrv_config.config.debug_flags.debug) console.log(" # Recreating primary WTVSec login instance for", wtvshared.filterSSID(socket.ssid)); - delete ssid_sessions[socket.ssid].data_store.wtvsec_login; + delete session_data.data_store.wtvsec_login; } - ssid_sessions[socket.ssid].data_store.wtvsec_login = ssid_sessions[socket.ssid].createWTVSecSession(); - ssid_sessions[socket.ssid].data_store.wtvsec_login.IssueChallenge(); - if (request_headers["wtv-incarnation"]) ssid_sessions[socket.ssid].data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); + session_data.data_store.wtvsec_login = session_data.createWTVSecSession(); + session_data.data_store.wtvsec_login.IssueChallenge(); + if (request_headers["wtv-incarnation"]) session_data.data_store.wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); } else { console.log(" * Something bad happened (we don't know the client ssid???)"); var errpage = wtvshared.doErrorPage(400) @@ -40,33 +40,33 @@ if (socket.ssid) { data = errpage[1]; } -if (request_headers.query.relogin && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "relogin=true"; -if (request_headers.query.reconnect && ssid_sessions[socket.ssid].getSessionData("registered")) gourl += "reconnect=true"; +if (request_headers.query.relogin && session_data.getSessionData("registered")) gourl += "relogin=true"; +if (request_headers.query.reconnect && session_data.getSessionData("registered")) gourl += "reconnect=true"; -if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { +if (session_data.data_store.wtvsec_login) { var prereg_contype = "text/html"; if (request_headers.query.relogin) { // relogin - ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64 = null; // clear old ticket + session_data.data_store.wtvsec_login.ticket_b64 = null; // clear old ticket } // if relogin and wtv-script-id != 0, skip tellyscript - ssid_sessions[socket.ssid].set("wtv-open-access", (request_headers['wtv-open-access'] == "true") ? true : false); + session_data.set("wtv-open-access", (request_headers['wtv-open-access'] == "true") ? true : false); var file_path = null; var bf0app_update = false; - var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); + var romtype = session_data.get("wtv-client-rom-type"); var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin); - var wtv_script_id = parseInt(ssid_sessions[socket.ssid].get("wtv-script-id")); - var bootrom = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version"); + var wtv_script_id = parseInt(session_data.get("wtv-script-id")); + var bootrom = session_data.get("wtv-client-bootrom-version"); if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false; if (send_tellyscript) { if (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist) { var send_telly_to_ssid = (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist.findIndex(element => element == socket.ssid) != -1) if (send_telly_to_ssid) { - romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); + romtype = session_data.get("wtv-client-rom-type"); } } else { - romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); + romtype = session_data.get("wtv-client-rom-type"); } var file_path = null; switch (romtype) { @@ -77,18 +77,18 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "US-WEBSTAR-disk-0MB-16MB-softmodem-CPU5230": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; break; case "US-DTV-disk-0MB-32MB-softmodem-CPU5230": - if (wtvshared.isMiniBrowser(ssid_sessions[socket.ssid])) { + if (wtvshared.isMiniBrowser(session_data)) { prereg_contype = "text/tellyscript"; - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_OpenISP_56k.tok"; else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/LC2/LC2_WTV_18006138199.tok"; } else { prereg_contype = "text/dialscript"; - if (ssid_sessions[socket.ssid].get("wtv-lan") == "true") { + if (session_data.get("wtv-lan") == "true") { file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/UTV/utv_hsd.tok"; } else { // todo OpenISP telly @@ -100,7 +100,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "bf0app": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok"; + if (session_data.get("wtv-open-access")) file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_OISP.tok"; else file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; break; @@ -109,7 +109,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { case "JP-Fiji": prereg_contype = "text/tellyscript"; // if wtv-open-access: true then client expects OpenISP - if (ssid_sessions[socket.ssid].get("wtv-open-access")) var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; + if (session_data.get("wtv-open-access")) var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; else var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/FIJI/dc_production_normal.tok"; break; @@ -131,7 +131,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { prereg_contype = "text/tellyscript"; var file_path = __dirname + "/ServiceDeps/wtv-1800/tellyscripts/bf0app/bf0app_WTV_18006138199.tok"; var bf0app_update = true; - ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); + session_data.set("bf0app_update", bf0app_update); } if (request_headers["wtv-ticket"] && !request_headers.query.reconnect) { @@ -153,7 +153,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { headers += "minisrv-no-mail-count: true\n"; if (bf0app_update) headers += "minisrv-use-carriage-return: false\n"; headers += "Connection: Keep-Alive\n"; - headers += "wtv-initial-key: " + ssid_sessions[socket.ssid].data_store.wtvsec_login.challenge_key.toString(CryptoJS.enc.Base64) + "\n"; + headers += "wtv-initial-key: " + session_data.data_store.wtvsec_login.challenge_key.toString(CryptoJS.enc.Base64) + "\n"; headers += "Content-Type: " + prereg_contype + "\n"; if (!request_headers.query.reconnect) headers += "wtv-service: reset\n"; if (!bf0app_update) headers += getServiceString('wtv-1800') + "\n"; @@ -163,8 +163,8 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { if (bf0app_update) headers += getServiceString('wtv-star', { "no_star_word": true }) + "\n"; else headers += getServiceString('wtv-star') + "\n"; - if (request_headers.query.reconnect && !ssid_sessions[socket.ssid].getSessionData("registered") && !ssid_sessions[socket.ssid].lockdown) headers += getServiceString('wtv-register') + "\n"; - if (!ssid_sessions[socket.ssid].lockdown) headers += getServiceString('wtv-flashrom') + "\n"; + if (request_headers.query.reconnect && !session_data.getSessionData("registered") && !session_data.lockdown) headers += getServiceString('wtv-register') + "\n"; + if (!session_data.lockdown) headers += getServiceString('wtv-flashrom') + "\n"; if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n"; else { headers += "wtv-boot-url: wtv-head-waiter:/relogin?relogin=true"; @@ -172,7 +172,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { headers += "\n"; } if (gourl != null) headers += "wtv-visit: " + gourl + "\n"; - if (!bf0app_update && ssid_sessions[socket.ssid].get("wtv-open-access")) headers += "wtv-open-isp-disabled: false\n"; + if (!bf0app_update && session_data.get("wtv-open-access")) headers += "wtv-open-isp-disabled: false\n"; headers += "wtv-client-time-zone: GMT -0000\n"; headers += "wtv-client-time-dst-rule: GMT\n" headers += "wtv-client-date: " + strftime("%a, %d %b %Y %H:%M:%S", new Date(new Date().toUTCString())) + " GMT"; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/unauthorized.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/unauthorized.js index b65d2d5a..32015ce9 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/unauthorized.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/unauthorized.js @@ -54,7 +54,7 @@ Access Denied -You are not authorized to use this service.

Reason: ${ssid_sessions[socket.ssid].lockdownReason} +You are not authorized to use this service.

Reason: ${session_data.lockdownReason} diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js index 4df04c97..526d7fd4 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/ban.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/ban.js index 21836a21..97b15351 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/ban.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/ban.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js index 8c102af6..71a7d395 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js index 78f16fb6..008a191c 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js index 23048614..738474fb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/polyzoot.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/polyzoot.js index fb855ba5..e8d5b612 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/polyzoot.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/polyzoot.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; @@ -80,7 +80,7 @@ data += `

` if (request_headers.query.username) { if (user_info && !request_headers.query.confirm && !request_headers.query.reset) { - if (user_info.username == ssid_sessions[socket.ssid].getSessionData("subscriber_username")) { + if (user_info.username == session_data.getSessionData("subscriber_username")) { data += `Are you sure you want to Polyzoot yourself?
Are you a masochist?`; } else { data += `Are you sure you want to Polyzoot ${user_info.username}?
Are you a sadist?`; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js index d361efe9..1593eb43 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js index 27bfdc72..016026b8 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js index e66a6d52..5197ec52 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); if (auth === true) { var password = null; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js index 23772edb..42097654 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; var WTVAdmin = require("./WTVAdmin.js"); -var wtva = new WTVAdmin(minisrv_config, ssid_sessions[socket.ssid], service_name); +var wtva = new WTVAdmin(minisrv_config, session_data, service_name); var auth = wtva.isAuthorized(); var ssids_removed = []; if (auth === true) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-chat/MakeChatPage.js b/zefie_wtvp_minisrv/ServiceVault/wtv-chat/MakeChatPage.js index bdecc0d2..d1c6921f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-chat/MakeChatPage.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-chat/MakeChatPage.js @@ -1,7 +1,7 @@ var minisrv_service_file = true; headers = "200 OK"; -if (request_headers.query.nick) headers += "\n" + ssid_sessions[socket.ssid].setIRCNick(request_headers.query.nick); +if (request_headers.query.nick) headers += "\n" + session_data.setIRCNick(request_headers.query.nick); headers += "\nContent-Type: text/html"; if (request_headers.query.host && request_headers.query.port && request_headers.query.channel) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-chat/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-chat/home.js index bc8e4ca3..542f211e 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-chat/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-chat/home.js @@ -2,11 +2,11 @@ var minisrv_service_file = true; var irc_nick = ""; headers = "200 OK"; -if (request_headers.query.nick) headers += "\n" + ssid_sessions[socket.ssid].setIRCNick(request_headers.query.nick); -else if (!ssid_sessions[socket.ssid].getSessionData("subscriber_irc_nick")) ssid_sessions[socket.ssid].getSessionData("subscriber_username") || ssid_sessions[socket.ssid].setIRCNick(minisrv_config.config.service_name + '_' + Math.floor(Math.random() * 100000)).substring(0, 16); +if (request_headers.query.nick) headers += "\n" + session_data.setIRCNick(request_headers.query.nick); +else if (!session_data.getSessionData("subscriber_irc_nick")) session_data.getSessionData("subscriber_username") || session_data.setIRCNick(minisrv_config.config.service_name + '_' + Math.floor(Math.random() * 100000)).substring(0, 16); headers += "\nContent-Type: text/html"; -var irc_nick = ssid_sessions[socket.ssid].getSessionData("subscriber_irc_nick") || ssid_sessions[socket.ssid].getSessionData("subscriber_username"); +var irc_nick = session_data.getSessionData("subscriber_irc_nick") || session_data.getSessionData("subscriber_username"); data = ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/add.js b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/add.js index 2c9df7f8..e6d9ba45 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/add.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/add.js @@ -2,8 +2,8 @@ var minisrv_service_file = true; if (socket.ssid) { if (request_headers.post_data) { - if (ssid_sessions[socket.ssid]) { - ssid_sessions[socket.ssid].addCookie(request_headers.query.domain,request_headers.query.path,request_headers.query.expires,request_headers.query.cookie); + if (session_data) { + session_data.addCookie(request_headers.query.domain,request_headers.query.path,request_headers.query.expires,request_headers.query.cookie); headers = "200 OK\n"; headers += "Content-Type: text/html"; } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js index 9ab5d993..dad24ebb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js @@ -3,8 +3,8 @@ var minisrv_service_file = true; if (request_headers.post_data) { if (request_headers.query.domain && request_headers.query.path) { if (socket.ssid) { - if (ssid_sessions[socket.ssid]) { - data = ssid_sessions[socket.ssid].getCookieString(request_headers.query.domain, request_headers.query.path); + if (session_data) { + data = session_data.getCookieString(request_headers.query.domain, request_headers.query.path); headers = "200 OK\n"; headers += "Content-Type: text/plain"; } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/list.js b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/list.js index 7c2141bb..351216a6 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/list.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/list.js @@ -1,9 +1,9 @@ var minisrv_service_file = true; if (socket.ssid) { - if (ssid_sessions[socket.ssid]) { + if (session_data) { - data = ssid_sessions[socket.ssid].listCookies(); + data = session_data.listCookies(); headers = "200 OK\n"; headers += "Content-Type: text/plain"; } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/reset.js b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/reset.js index c0d6fd0d..e82a7cdc 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/reset.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-cookie/reset.js @@ -1,8 +1,8 @@ var minisrv_service_file = true; if (socket.ssid) { - if (ssid_sessions[socket.ssid]) { - ssid_sessions[socket.ssid].resetCookies(); + if (session_data) { + session_data.resetCookies(); headers = "200 OK\n"; headers += "Content-Type: text/html"; data = ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/userstore.js b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/userstore.js index be483345..f257c06a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-disk/userstore.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-disk/userstore.js @@ -3,9 +3,9 @@ var minisrv_service_file = true; if (request_headers.post_data) { if (request_headers.query.partialPath || request_headers.query.path) { if (socket.ssid) { - if (ssid_sessions[socket.ssid]) { - if (ssid_sessions[socket.ssid].isRegistered()) { - var result = ssid_sessions[socket.ssid].storeUserStoreFile(request_headers.query.path || request_headers.query.partialPath, new Buffer.from(request_headers.post_data.toString(CryptoJS.enc.Hex), 'hex'), request_headers.query['last-modified-seconds'] || null, (request_headers.query.no_overwrite) ? false : true); + if (session_data) { + if (session_data.isRegistered()) { + var result = session_data.storeUserStoreFile(request_headers.query.path || request_headers.query.partialPath, new Buffer.from(request_headers.post_data.toString(CryptoJS.enc.Hex), 'hex'), request_headers.query['last-modified-seconds'] || null, (request_headers.query.no_overwrite) ? false : true); if (result) { headers = "200 OK\n"; headers += "Content-Type: text/plain"; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/add.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/add.js index d86e9209..cdd4beb4 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/add.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/add.js @@ -135,4 +135,4 @@ if (folder) folder = folder.replaceAll("+", " ") var imagetype = request_headers.query['favorite-thumbnail-type'] var favurl = request_headers.query['favorite-url']; -saveFavorite(ssid_sessions[socket.ssid].favstore, title, folder, imagetype, favurl); \ No newline at end of file +saveFavorite(session_data.favstore, title, folder, imagetype, favurl); \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-add-folder.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-add-folder.js index 81f45ac6..bb440e03 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-add-folder.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-add-folder.js @@ -1,22 +1,22 @@ var minisrv_service_file = true; var foldername = request_headers.query.new_folder_name; -var favstore_exists = ssid_sessions[socket.ssid].favstore.favstoreExists(); -var folder_exists = ssid_sessions[socket.ssid].favstore.folderExists(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var favstore_exists = session_data.favstore.favstoreExists(); +var folder_exists = session_data.favstore.folderExists(foldername); +var folder_array = session_data.favstore.getFolders(); if (foldername) { if (favstore_exists != true) - ssid_sessions[socket.ssid].favstore.createFavstore(); + session_data.favstore.createFavstore(); if (folder_exists != true) { if (folder_array.length < minisrv_config.services[service_name].max_folders) { - //if (ssid_sessions[socket.ssid].favstore.checkFolderName(foldername) == true) + //if (session_data.favstore.checkFolderName(foldername) == true) //{ - ssid_sessions[socket.ssid].favstore.createFolder(foldername); + session_data.favstore.createFolder(foldername); headers = `300 OK Connection: Keep-Alive Content-Type: text/html diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-arrange-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-arrange-favorites.js index 351c5580..0acaa300 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-arrange-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-arrange-favorites.js @@ -4,11 +4,11 @@ var with_pictures = request_headers.query.with_pictures if (with_pictures = "on") { - ssid_sessions[socket.ssid].setSessionData("subscriber_fav_images", true) + session_data.setSessionData("subscriber_fav_images", true) } else { - ssid_sessions[socket.ssid].setSessionData("subscriber_fav_images", false) + session_data.setSessionData("subscriber_fav_images", false) } -ssid_sessions[socket.ssid].saveSessionData(); +session_data.saveSessionData(); headers = `300 OK Location: wtv-favorite:/favorite` \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-favorites.js index c0d6e030..99f774b5 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-favorites.js @@ -25,7 +25,7 @@ Connection: Keep-Alive Content-Type: text/html Location: wtv-favorite:/serve-browser?favorite_folder_name=${folder}` } else if (strName != "getCaseInsensitiveKey") { -var favorite = ssid_sessions[socket.ssid].favstore.getFavorite(folder, strName); +var favorite = session_data.favstore.getFavorite(folder, strName); if (errpage) { headers = errpage[0]; @@ -62,9 +62,9 @@ Location: ${confirmAlert}` var gourl = `wtv-favorite:/serve-discard-favorites?favorite_folder_name=${folder}`; if (discardAll == "Discard All") { - ssid_sessions[socket.ssid].favstore.clearFolder(folder); + session_data.favstore.clearFolder(folder); } else { - ssid_sessions[socket.ssid].favstore.deleteFavorite(strName, folder); + session_data.favstore.deleteFavorite(strName, folder); } headers = `300 OK diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-folders.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-folders.js index 64198e59..7a00e752 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-folders.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-folders.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; var errpage; var query = request_headers.query -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var totalfavorites = folder_array.length; var strName, strValue ; @@ -21,8 +21,8 @@ Connection: Keep-Alive Content-Type: text/html Location: wtv-favorite:/favorite` } else if (strName != "getCaseInsensitiveKey") { -var folder = ssid_sessions[socket.ssid].favstore.getFolders(); -var folderdata = ssid_sessions[socket.ssid].favstore.listFavorites(strName); +var folder = session_data.favstore.getFolders(); +var folderdata = session_data.favstore.listFavorites(strName); var numoffavorites = Object.keys(folderdata).length; if (totalfavorites == 1) { @@ -59,7 +59,7 @@ Location: ${confirmAlert}` } else { var gourl = "wtv-favorite:/serve-discard-folders"; - ssid_sessions[socket.ssid].favstore.deleteFolder(strName); + session_data.favstore.deleteFolder(strName); headers = `300 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-move-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-move-favorites.js index 9617bb8b..a763f59a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-move-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-move-favorites.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; var favoritenum = 0; var folder = request_headers.query.favorite_folder_name || null; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(folder); +var favarray = session_data.favstore.listFavorites(folder); var error_occured = false; if (!folder) error_occured = true; else { @@ -12,14 +12,14 @@ else { // one favorite var favid = request_headers.query.favoriteid; var favfolder = request_headers.query.favoritefolder; - if (folder != favfolder) ssid_sessions[socket.ssid].favstore.moveFavorite(folder, favfolder, favid); + if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid); } else { if (request_headers.query.favoriteid.length == request_headers.query.favoritefolder.length) { // both queries should have the same number of entries Object.keys(request_headers.query.favoriteid).forEach(function (k) { var favid = request_headers.query.favoriteid[k]; var favfolder = request_headers.query.favoritefolder[k]; - if (folder != favfolder) ssid_sessions[socket.ssid].favstore.moveFavorite(folder, favfolder, favid); + if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid); }) } else { error_occured = true; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-rename-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-rename-favorites.js index 4337bd56..6f1ea484 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-rename-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-rename-favorites.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; var favoritenum = 0; var folder = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(folder); +var favarray = session_data.favstore.listFavorites(folder); favoritenum = Object.keys(favarray).length; @@ -81,7 +81,7 @@ for (let i = 0; i < favoritenum; i++) { var favname = request_headers.query.favorite17name; break; } - ssid_sessions[socket.ssid].favstore.changeFavoriteName(favid, folder, favname); + session_data.favstore.changeFavoriteName(favid, folder, favname); } var gourl = `wtv-favorite:/serve-browser?favorite_folder_name=${folder}`; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-samples-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-samples-page.js index c743330f..73bd906c 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-samples-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-samples-page.js @@ -8,29 +8,29 @@ var createMovies = request_headers.query.Movies; var createNews = request_headers.query.News; var createRecommended = request_headers.query.Recommended; var createReference = request_headers.query.Reference; -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); totalfavorites = folder_array.length; if (totalfavorites < 14) { if (createFun == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("Fun"); + session_data.favstore.createTemplateFolder("Fun"); if (createMoney == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("Money"); + session_data.favstore.createTemplateFolder("Money"); if (createMovies == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("Movies"); + session_data.favstore.createTemplateFolder("Movies"); if (createNews == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("News"); + session_data.favstore.createTemplateFolder("News"); if (createRecommended == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("Recommended"); + session_data.favstore.createTemplateFolder("Recommended"); console.log("FUGHFVJSGHJFDGIJUFDSHGFJDSKHJKLGFHJKHDJKHJKLGF " + createRecommended) if (createReference == "true") - ssid_sessions[socket.ssid].favstore.createTemplateFolder("Reference"); + session_data.favstore.createTemplateFolder("Reference"); headers = `300 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js index 4a34088c..093fb42f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js @@ -4,6 +4,6 @@ var folder = request_headers.query.favorite_folder_name; var key = request_headers.query.Choose; var id = request_headers.query.favoriteid; -ssid_sessions[socket.ssid].favstore.createShortcutKey(); -ssid_sessions[socket.ssid].favstore.updateShortcutKey("none", key, folder, id); +session_data.favstore.createShortcutKey(); +session_data.favstore.updateShortcutKey("none", key, folder, id); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite-index.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite-index.js index 8947febc..0098e04f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite-index.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite-index.js @@ -1,15 +1,15 @@ var minisrv_service_file = true; -var favstore_exists = ssid_sessions[socket.ssid].favstore.favstoreExists(); +var favstore_exists = session_data.favstore.favstoreExists(); if (favstore_exists != true) { - ssid_sessions[socket.ssid].favstore.createFavstore(); + session_data.favstore.createFavstore(); headers = `300 OK Location: wtv-favorite:/favorite` } else { -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var url = request_headers.request; var key = url.split('?')[1] diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite.js index bdfcb0bb..d61ce8bb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite.js @@ -1,15 +1,15 @@ var minisrv_service_file = true; -var favstore_exists = ssid_sessions[socket.ssid].favstore.favstoreExists(); +var favstore_exists = session_data.favstore.favstoreExists(); if (favstore_exists != true) { - ssid_sessions[socket.ssid].favstore.createFavstore(); + session_data.favstore.createFavstore(); headers = `300 OK Location: wtv-favorite:/favorite` } else { -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var totalfavorites = folder_array.length; var stopdrawing = false; @@ -129,7 +129,7 @@ Favorite folders Favorite folders -for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"} +for ${session_data.getSessionData("subscriber_username") || "You"} diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/get-thumbnail.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/get-thumbnail.js index b16eb4df..08cbaa24 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/get-thumbnail.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/get-thumbnail.js @@ -4,7 +4,7 @@ var errpage = null; var id = request_headers.query.id; var folder = request_headers.query.folder; -var favorite = ssid_sessions[socket.ssid].favstore.getFavorite(folder, id); +var favorite = session_data.favstore.getFavorite(folder, id); if (!favorite) errpage = wtvshared.doErrorPage(400, "Invalid favorite ID"); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/list-folders.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/list-folders.js index 13ed2b95..5ad37958 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/list-folders.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/list-folders.js @@ -1,13 +1,13 @@ var minisrv_service_file = true; -var favstore_exists = ssid_sessions[socket.ssid].favstore.favstoreExists(); +var favstore_exists = session_data.favstore.favstoreExists(); if (favstore_exists != true) { - ssid_sessions[socket.ssid].favstore.createFavstore(); + session_data.favstore.createFavstore(); } -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var data = ""; for (let i = 0; i < folder_array.length; i++) data += folder_array[i] + "\0"; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-arrange-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-arrange-favorites.js index 64caed6f..5e7640a9 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-arrange-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-arrange-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); @@ -192,7 +192,7 @@ by name only. diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-browser.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-browser.js index 05ac1a37..d1fac7f3 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-browser.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-browser.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); @@ -121,7 +121,7 @@ Favorites
-Favorites for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"} +Favorites for ${session_data.getSessionData("subscriber_username") || "You"}
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js index 75b8d315..a4353081 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); @@ -16,7 +16,7 @@ var numoffolders = folder_array.length; favoritenum = Object.keys(favarray).length; -var favoritedata = ssid_sessions[socket.ssid].favstore.getFavorite(foldername, favid); +var favoritedata = session_data.favstore.getFavorite(foldername, favid); headers = `200 OK diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-favorites.js index ca695dc8..c05f5dac 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-folders.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-folders.js index d1dd405f..523db003 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-folders.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-folders.js @@ -1,6 +1,6 @@ var minisrv_service_file = true; -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var totalfavorites = folder_array.length; headers = `200 OK diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-move-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-move-favorites.js index ecbca854..fc3cc4ea 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-move-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-move-favorites.js @@ -5,9 +5,9 @@ var foldernum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-organize-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-organize-favorites.js index 6980031d..1595dd3f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-organize-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-organize-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-rename-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-rename-favorites.js index b73b7284..e33c02c2 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-rename-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-rename-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-samples-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-samples-page.js index 5739915d..ba26d7f5 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-samples-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-samples-page.js @@ -104,7 +104,7 @@ by going to the folder and choosing Organize.
` -if (ssid_sessions[socket.ssid].favstore.folderExists("Fun") == true) +if (session_data.favstore.folderExists("Fun") == true) { data += ` @@ -124,7 +124,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Fun") == true)  Fun ` } -if (ssid_sessions[socket.ssid].favstore.folderExists("Money") == true) +if (session_data.favstore.folderExists("Money") == true) { data += ` @@ -147,7 +147,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Money") == true) ` -if (ssid_sessions[socket.ssid].favstore.folderExists("Movies") == true) +if (session_data.favstore.folderExists("Movies") == true) { data += ` @@ -167,7 +167,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Movies") == true)  Movies ` } -if (ssid_sessions[socket.ssid].favstore.folderExists("News") == true) +if (session_data.favstore.folderExists("News") == true) { data += ` @@ -191,7 +191,7 @@ data += ` ` -if (ssid_sessions[socket.ssid].favstore.folderExists("Recommended") == true) +if (session_data.favstore.folderExists("Recommended") == true) { data += ` @@ -211,7 +211,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Recommended") == true)  Recommended ` } -if (ssid_sessions[socket.ssid].favstore.folderExists("Reference") == true) +if (session_data.favstore.folderExists("Reference") == true) { data += ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js index 579648ae..6ea44797 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js @@ -4,9 +4,9 @@ var favoritenum = 0; var foldername = request_headers.query.favorite_folder_name; -var favarray = ssid_sessions[socket.ssid].favstore.listFavorites(foldername); +var favarray = session_data.favstore.listFavorites(foldername); -var folder_array = ssid_sessions[socket.ssid].favstore.getFolders(); +var folder_array = session_data.favstore.getFolders(); var folderid = folder_array.indexOf(foldername); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/sony.html b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/sony.html index b00f9400..9a7a3366 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/sony.html +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-favorite/sony.html @@ -102,7 +102,7 @@ Favorites
-Favorites for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"} +Favorites for ${session_data.getSessionData("subscriber_username") || "You"}
diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js index 1c30448d..e0dbb27a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js @@ -3,20 +3,20 @@ request_is_async = true; var bf0app_update = false; var request_path = request_headers.request_url.replace(service_name + ":/", ""); -var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); -var bootver = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") +var romtype = session_data.get("wtv-client-rom-type"); +var bootver = session_data.get("wtv-client-bootrom-version") if ((romtype == "bf0app" || !romtype) && (bootver == "105" || !bootver)) { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode bf0app_update = true; - ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); + session_data.set("bf0app_update", bf0app_update); } -if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { - ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); +if (!session_data.data_store.WTVFlashrom) { + session_data.data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); } -ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { +session_data.data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { sendToClient(socket, headers, data); }); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js index dfef8bf7..b86c2575 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js @@ -16,17 +16,17 @@ var bf0app_update = true; if (request_headers.query.path) request_path = request_headers.query.path; else request_path = default_build_to_send; -if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") == "105") { +if (session_data.get("wtv-client-rom-type") == "bf0app" && session_data.get("wtv-client-bootrom-version") == "105") { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode bf0app_update = true; - ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); + session_data.set("bf0app_update", bf0app_update); } -if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { - ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); +if (!session_data.data_store.WTVFlashrom) { + session_data.data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); } -ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { +session_data.data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { sendToClient(socket, headers, data); }); \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js index 5063b1c7..9f88d21a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js @@ -5,22 +5,22 @@ request_is_async = true; var bf0app_update = false; var request_path = request_headers.query.path; -var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); -var bootver = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") +var romtype = session_data.get("wtv-client-rom-type"); +var bootver = session_data.get("wtv-client-bootrom-version") if ((romtype == "bf0app" || !romtype) && (bootver == "105" || !bootver)) { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode bf0app_update = true; - ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); + session_data.set("bf0app_update", bf0app_update); } if (request_headers.query.raw || bf0app_update) { - if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { - ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); + if (!session_data.data_store.WTVFlashrom) { + session_data.data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, bf0app_update); } - ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { + session_data.data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { sendToClient(socket, headers, data); }); } else { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js index 6e67ca75..48a50cef 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -80,9 +80,9 @@ Updating now -Your ${ssid_sessions[socket.ssid].getBoxName()} is being
updated automatically. +Your ${session_data.getBoxName()} is being
updated automatically.

-This will take a while, and
then you can use your ${ssid_sessions[socket.ssid].getBoxName()} again. +This will take a while, and
then you can use your ${session_data.getBoxName()} again. `; if (flashrom_info.is_bootrom && flashrom_info.part_number == (flashrom_info.part_count - 1)) { data += `

diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js index 65a2d25b..a757e999 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; if (request_headers.query.path) { var url = service_name + ":/get-lc2-page?path=" + request_headers.query.path; -var romtype = ssid_sessions[socket.ssid].get("wtv-client-rom-type"); +var romtype = session_data.get("wtv-client-rom-type"); if (romtype == "bf0app") { url = "client:updateflash?ipaddr=" + minisrv_config.services[service_name].host + "&port=" + minisrv_config.services[service_name].port + "&path=" + escape(service_name + ":/" + request_headers.query.path); if (request_headers.query.numparts) url += escape("?numparts=" + request_headers.query.numparts); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-complete.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-complete.js index d1de7640..fbf033c8 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-complete.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-complete.js @@ -62,7 +62,7 @@ Updating complete The update is complete.

Choose Connect Now if you
want to connect to ${minisrv_config.config.service_name}. -

Press the power button to switch
off your ${ssid_sessions[socket.ssid].getBoxName()}. +

Press the power button to switch
off your ${session_data.getBoxName()}. diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-failed.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-failed.js index fba5eeb6..8159c2a4 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-failed.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-failed.js @@ -93,7 +93,7 @@ data = ` We ran into a technical problem while updating your unit. (Error: ${error}) Choose Try Again to try again now. -

Press the power button to switch off your ${ssid_sessions[socket.ssid].getBoxName()}. +

Press the power button to switch off your ${session_data.getBoxName()}. diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js index 489d9a21..00a43579 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js @@ -16,17 +16,17 @@ var bf0app_update = true; if (request_headers.query.path) request_path = request_headers.query.path; else request_path = default_build_to_send; -if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app" && ssid_sessions[socket.ssid].get("wtv-client-bootrom-version") == "105") { +if (session_data.get("wtv-client-rom-type") == "bf0app" && session_data.get("wtv-client-bootrom-version") == "105") { // assume old classic in flash mode, override user setting and send tellyscript // because it is required to proceed in flash mode bf0app_update = true; - ssid_sessions[socket.ssid].set("bf0app_update", bf0app_update); + session_data.set("bf0app_update", bf0app_update); } -if (!ssid_sessions[socket.ssid].data_store.WTVFlashrom) { - ssid_sessions[socket.ssid].data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, 0, minisrv_config.services[service_name].use_zefie_server, bf0app_update, minisrv_config.services[service_name].debug); +if (!session_data.data_store.WTVFlashrom) { + session_data.data_store.WTVFlashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, 0, minisrv_config.services[service_name].use_zefie_server, bf0app_update, minisrv_config.services[service_name].debug); } -ssid_sessions[socket.ssid].data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { +session_data.data_store.WTVFlashrom.getFlashRom(request_path, function (data, headers) { sendToClient(socket, headers, data); }); diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/willie.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/willie.js index b3a2fcee..3fce8e98 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/willie.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/willie.js @@ -20,7 +20,7 @@ if (!minisrv_config.services[service_name].use_zefie_server) { var options = { host: "wtv.zefie.com", - path: "/willie.php?minisrv=true&service_name="+escape(service_name)+"&pflash=" + ssid_sessions[socket.ssid].get("wtv-client-rom-type") + proxy_query, + path: "/willie.php?minisrv=true&service_name="+escape(service_name)+"&pflash=" + session_data.get("wtv-client-rom-type") + proxy_query, timeout: 5000, method: 'GET' } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js index a8de2505..7a321b17 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js @@ -10,17 +10,17 @@ Location: client:gototvhome wtv-visit: client:hangupphone` } else { - var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : ssid_sessions[socket.ssid].user_id; + var user_id = (request_headers.query.user_id) ? request_headers.query.user_id : session_data.user_id; - if (socket.ssid !== null && user_id !== null) ssid_sessions[socket.ssid].switchUserID(user_id); + if (socket.ssid !== null && user_id !== null) session_data.switchUserID(user_id); - if (socket.ssid !== null && !ssid_sessions[socket.ssid].get("wtvsec_login")) { + if (socket.ssid !== null && !session_data.get("wtvsec_login")) { wtvsec_login = new WTVSec(minisrv_config); wtvsec_login.IssueChallenge(); wtvsec_login.set_incarnation(request_headers["wtv-incarnation"]); - ssid_sessions[socket.ssid].set("wtvsec_login", wtvsec_login); + session_data.set("wtvsec_login", wtvsec_login); } else { - wtvsec_login = ssid_sessions[socket.ssid].get("wtvsec_login"); + wtvsec_login = session_data.get("wtvsec_login"); } if (socket.ssid !== null) { @@ -57,8 +57,8 @@ wtv-visit: client:hangupphone` headers = `403 Please enter your password and try again minisrv-no-mail-count: true `; - } else if (ssid_sessions[socket.ssid].validateUserPassword(request_headers.query.password)) { - ssid_sessions[socket.ssid].setUserLoggedIn(true); + } else if (session_data.validateUserPassword(request_headers.query.password)) { + session_data.setUserLoggedIn(true); headers = `200 OK minisrv-no-mail-count: true Content-Type: text/html @@ -70,14 +70,14 @@ minisrv-no-mail-count: true `; } } else { - if (ssid_sessions[socket.ssid].baddisk === true) { + if (session_data.baddisk === true) { gourl = "wtv-head-waiter:/bad-disk?" } - else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) { + else if (session_data.getNumberOfUserAccounts() > 1 && user_id === 0 && request_headers.query.initial_login) { gourl = "wtv-head-waiter:/choose-user?" } else { - var limitedLogin = (!ssid_sessions[socket.ssid].lockdown && (!ssid_sessions[socket.ssid].get('password_valid') && ssid_sessions[socket.ssid].getUserPasswordEnabled())); - var limitedLoginRegistered = (limitedLogin && ssid_sessions[socket.ssid].isRegistered()); + var limitedLogin = (!session_data.lockdown && (!session_data.get('password_valid') && session_data.getUserPasswordEnabled())); + var limitedLoginRegistered = (limitedLogin && session_data.isRegistered()); } headers = `200 OK wtv-connection-close: true @@ -87,7 +87,7 @@ Content-Type: text/html`; if (client_challenge_response) { headers += ` wtv-encrypted: true`; - if (wtvsec_login) ssid_sessions[socket.ssid].data_store.wtvsec_login.update_ticket = true; + if (wtvsec_login) session_data.data_store.wtvsec_login.update_ticket = true; } if (limitedLoginRegistered) gourl = "wtv-head-waiter:/password?"; headers += ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js index 193d51dd..b9ccba48 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js @@ -1,9 +1,9 @@ var minisrv_service_file = true; // remove restrictions once this page is shown, since the user will be 'trapped' anyway -ssid_sessions[socket.ssid].disableLockdown(); -ssid_sessions[socket.ssid].delete("wtv-my-disk-sucks-sucks-sucks"); -ssid_sessions[socket.ssid].baddisk = false; +session_data.disableLockdown(); +session_data.delete("wtv-my-disk-sucks-sucks-sucks"); +session_data.baddisk = false; headers = `200 OK Content-type: text/html`; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js index fb80cd6c..f6bd3f3d 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js @@ -1,6 +1,6 @@ var minisrv_service_file = true; -if (socket.ssid !== null) ssid_sessions[socket.ssid].switchUserID(0); +if (socket.ssid !== null) session_data.switchUserID(0); headers = `200 OK minisrv-no-mail-count: true @@ -74,7 +74,7 @@ Choose your name `; -var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers(); +var accounts = session_data.listPrimaryAccountUsers(); var accounts_listed = 0; for (const [key, value] of Object.entries(accounts)) { data += ""; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js index 9c9997d8..e74c4768 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -1,14 +1,14 @@ var minisrv_service_file = true; var gourl = null; -if (!ssid_sessions[socket.ssid].isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) gourl = "wtv-register:/splash?"; +if (!session_data.isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) gourl = "wtv-register:/splash?"; var home_url = "wtv-home:/home?"; if (gourl) { headers = `200 OK wtv-open-isp-disabled: false `; - if (!ssid_sessions[socket.ssid].isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) { + if (!session_data.isRegistered() && (!request_headers.query.guest_login || !minisrv_config.config.allow_guests)) { headers += `wtv-encrypted: true ${getServiceString('wtv-register')} ${getServiceString('wtv-head-waiter')} @@ -21,7 +21,7 @@ Content-type: text/html`; data = ''; } else { - if (ssid_sessions[socket.ssid].lockdown) { + if (session_data.lockdown) { home_url = minisrv_config.config.unauthorized_url; } else if (request_headers.query.guest_login && minisrv_config.config.allow_guests) { @@ -33,30 +33,30 @@ else { var messenger_authorized = 0; if (request_headers.query.skip_splash) gourl = "wtv-home:/home?"; else gourl = "wtv-home:/splash?"; - } else if (!ssid_sessions[socket.ssid].getSessionData("registered")) { + } else if (!session_data.getSessionData("registered")) { var errpage = wtvshared.doErrorPage(400); headers = errpage[0]; data = errpage[1]; } else { - var userid = ssid_sessions[socket.ssid].getSessionData("subscriber_userid") - var nickname = ssid_sessions[socket.ssid].getSessionData("subscriber_username"); - var human_name = ssid_sessions[socket.ssid].getSessionData("subscriber_name") || nickname; - var messenger_enabled = ssid_sessions[socket.ssid].getSessionData("messenger_enabled") || 0; - var messenger_authorized = ssid_sessions[socket.ssid].getSessionData("messenger_authorized") || 0; - var messenger_email = ssid_sessions[socket.ssid].getSessionData("messenger_email"); + var userid = session_data.getSessionData("subscriber_userid") + var nickname = session_data.getSessionData("subscriber_username"); + var human_name = session_data.getSessionData("subscriber_name") || nickname; + var messenger_enabled = session_data.getSessionData("messenger_enabled") || 0; + var messenger_authorized = session_data.getSessionData("messenger_authorized") || 0; + var messenger_email = session_data.getSessionData("messenger_email"); var gourl = "wtv-home:/splash?"; } - var limitedLogin = ssid_sessions[socket.ssid].lockdown; - var limitedLoginRegistered = (limitedLogin || (ssid_sessions[socket.ssid].isRegistered() && !ssid_sessions[socket.ssid].isUserLoggedIn())); + var limitedLogin = session_data.lockdown; + var limitedLoginRegistered = (limitedLogin || (session_data.isRegistered() && !session_data.isUserLoggedIn())); var offline_user_list = null; - if (ssid_sessions[socket.ssid].isRegistered()) { + if (session_data.isRegistered()) { // check for SMTP Password - if (ssid_sessions[socket.ssid].getSessionData("subscriber_smtp_password") === null) { - ssid_sessions[socket.ssid].setUserSMTPPassword(ssid_sessions[socket.ssid].generatePassword(16)); + if (session_data.getSessionData("subscriber_smtp_password") === null) { + session_data.setUserSMTPPassword(session_data.generatePassword(16)); } - if (ssid_sessions[socket.ssid].user_id == 0) { - var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers(); - var num_accounts = ssid_sessions[socket.ssid].getNumberOfUserAccounts(); + if (session_data.user_id == 0) { + var accounts = session_data.listPrimaryAccountUsers(); + var num_accounts = session_data.getNumberOfUserAccounts(); var offline_user_list_str = "\n"; var i = 0; Object.keys(accounts).forEach((k) => { @@ -96,14 +96,14 @@ wtv-ssl-timeout: 240 wtv-login-timeout: 7200 `; if (!limitedLogin && !limitedLoginRegistered) { - ssid_sessions[socket.ssid].assignMailStore(); + session_data.assignMailStore(); headers += getServiceString('all', { "exceptions": ["wtv-register"] }); if (offline_user_list) headers += "wtv-offline-user-list: " + offline_user_list + "\n"; headers += `wtv-messenger-authorized: ${messenger_authorized} wtv-messenger-enable: ${messenger_enabled} wtv-messagewatch-checktimeoffset: off wtv-messenger-server: msnmsgr.escargot.chat -wtv-user-name: ${ssid_sessions[socket.ssid].getSessionData("messenger_email")} +wtv-user-name: ${session_data.getSessionData("messenger_email")} wtv-messenger-login-url: wtv-passport:/messengerlogin `; } else { @@ -127,9 +127,9 @@ wtv-ssl-log-url: wtv-log:/log headers += `wtv-bypass-proxy: false user-id: ${userid} wtv-human-name: ${human_name} -${ssid_sessions[socket.ssid].setIRCNick(nickname)} -wtv-domain: ${ssid_sessions[socket.ssid].getSessionData("messenger_domain")} -passport-domain: ${ssid_sessions[socket.ssid].getSessionData("messenger_domain")} +${session_data.setIRCNick(nickname)} +wtv-domain: ${session_data.getSessionData("messenger_domain")} +passport-domain: ${session_data.getSessionData("messenger_domain")} wtv-mail-url: wtv-mail:/listmail wtv-favorite-url: wtv-favorite:/favorite wtv-favorites-folders-url: wtv-favorite:/list-folders @@ -164,7 +164,7 @@ wtv-inactive-timeout: 1440 headers += "\nwtv-home-url: " + home_url; } - if (ssid_sessions[socket.ssid].get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect && !limitedLogin && !limitedLoginRegistered) + if (session_data.get('wtv-need-upgrade') != 'true' && !request_headers.query.reconnect && !limitedLogin && !limitedLoginRegistered) headers += "\nwtv-settings-url: wtv-setup:/get\n"; if (!limitedLogin && !limitedLoginRegistered) { diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js index 706221e4..4351a0a4 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js @@ -1,8 +1,8 @@ var minisrv_service_file = true; -ssid_sessions[socket.ssid].setUserLoggedIn(false); +session_data.setUserLoggedIn(false); var challenge_response, challenge_header = ""; -if (socket.ssid !== null) ssid_sessions[socket.ssid].switchUserID(0); +if (socket.ssid !== null) session_data.switchUserID(0); var gourl = "wtv-head-waiter:/ValidateLogin?initial_login=true&"; if (request_headers.query.relogin) gourl += "relogin=true"; @@ -17,29 +17,29 @@ if (request_headers.query.guest_login) { var send_to_relogin = true; if (socket.ssid) { - if (ssid_sessions[socket.ssid]) { + if (session_data) { if (request_headers["wtv-ticket"]) { - if (ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64 == null) { + if (session_data.data_store.wtvsec_login.ticket_b64 == null) { if (request_headers["wtv-ticket"].length > 8) { - ssid_sessions[socket.ssid].data_store.wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]); - ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64 = request_headers["wtv-ticket"]; + session_data.data_store.wtvsec_login.DecodeTicket(request_headers["wtv-ticket"]); + session_data.data_store.wtvsec_login.ticket_b64 = request_headers["wtv-ticket"]; send_to_relogin = false; } } } else { - if (ssid_sessions[socket.ssid].data_store.wtvsec_login) { + if (session_data.data_store.wtvsec_login) { var client_challenge_response = request_headers["wtv-challenge-response"] || null; if (challenge_response && client_challenge_response) { if (challenge_response.toString(CryptoJS.enc.Base64).substring(0, 85) == client_challenge_response.substring(0, 85)) { console.log(" * wtv-challenge-response success for " + socket.ssid); - ssid_sessions[socket.ssid].data_store.wtvsec_login.PrepareTicket(); + session_data.data_store.wtvsec_login.PrepareTicket(); send_to_relogin = false; } else { - challenge_header = "wtv-challenge: " + ssid_sessions[socket.ssid].data_store.wtvsec_login.IssueChallenge(); + challenge_header = "wtv-challenge: " + session_data.data_store.wtvsec_login.IssueChallenge(); send_to_relogin = false; } } else { - challenge_header = "wtv-challenge: " + ssid_sessions[socket.ssid].data_store.wtvsec_login.IssueChallenge(); + challenge_header = "wtv-challenge: " + session_data.data_store.wtvsec_login.IssueChallenge(); send_to_relogin = false; } } diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/password.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/password.js index 0d82c1ef..b409ebeb 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/password.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/password.js @@ -37,7 +37,7 @@ text="AA9B4A" link=189cd6 vlink=189cd6 hspace=0 fontsize="large">

Password - + diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js index 27c69bfe..aa2f54e4 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js @@ -1,5 +1,5 @@ var minisrv_service_file = true; -ssid_sessions[socket.ssid].setUserLoggedIn(false); +session_data.setUserLoggedIn(false); var gourl = "wtv-1800:/preregister?"; if (request_headers.query.relogin) gourl += "relogin=true"; diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Legal.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Legal.js index 2e29d0b5..7baf7549 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Legal.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Legal.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; headers = `200 OK Connection: Keep-Alive -wtv-mail-count: ${ssid_sessions[socket.ssid].mailstore.countUnreadMessages(0)} +wtv-mail-count: ${session_data.mailstore.countUnreadMessages(0)} Content-Type: text/html` data = ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Privacy.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Privacy.js index d1a86b83..793feb27 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Privacy.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Privacy.js @@ -2,7 +2,7 @@ var minisrv_service_file = true; headers = `200 OK Connection: Keep-Alive -wtv-mail-count: ${ssid_sessions[socket.ssid].mailstore.countUnreadMessages(0)} +wtv-mail-count: ${session_data.mailstore.countUnreadMessages(0)} Content-Type: text/html` data = ` diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js index b712a669..6555744f 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js @@ -7,9 +7,9 @@ wtv-expire-all: wtv-flashrom: Content-type: text/html` if (request_headers.query.url) headers += "\nwtv-visit: " + request_headers.query.url; -var cryptstatus = ((socket_sessions[socket.id].secure === true) ? "Encrypted" : "Not Encrypted") +var cryptstatus = (wtv_encrypted ? "Encrypted" : "Not Encrypted") -var comp_type = wtvmime.shouldWeCompress(ssid_sessions[socket.ssid],'text/html'); +var comp_type = wtvmime.shouldWeCompress(session_data,'text/html'); var compstatus = "uncompressed"; switch (comp_type) { case 1: @@ -22,7 +22,7 @@ switch (comp_type) { data = ` -Home for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "minisrv"} +Home for ${session_data.getSessionData("subscriber_username") || "minisrv"} @@ -32,7 +32,7 @@ function go() { } Welcome to ${minisrv_config.config.service_name}`; -if (ssid_sessions[socket.ssid].getSessionData("registered")) data += ", " + ssid_sessions[socket.ssid].getSessionData("subscriber_username") + "!"; +if (session_data.getSessionData("registered")) data += ", " + session_data.getSessionData("subscriber_username") + "!"; data += `
@@ -45,19 +45,20 @@ minisrv v${minisrv_config.version}${(minisrv_config.config.git_commit) ? ' git-'
  • client:relog (direct)
    • -
  • Ultra Willies ~ Tricks
    • +
  • Ultra Willies ~ Tricks
  • Setup (Including BG Music)
  • Favorites new!
    • -
  • Mail (beta) +
  • wtv-admin new! +
  • Mail (beta)
  • Usenet (not ready) `; -if (ssid_sessions[socket.ssid].hasCap("client-can-do-chat")) { +if (session_data.hasCap("client-can-do-chat")) { data += "
  • IRC Chat Test
    • \n" } -if (ssid_sessions[socket.ssid].hasCap("client-has-disk")) { +if (session_data.hasCap("client-has-disk")) { // only show disk stuff if client has disk data += "
  • DiskHax ~ VFatHax
    • \n"; - if (ssid_sessions[socket.ssid].hasCap("client-can-do-macromedia-flash2")) { + if (session_data.hasCap("client-can-do-macromedia-flash2")) { // only show demo if client can do flash2 data += "
  • Old DealerDemo: Download ~ Access
    • \n"; } @@ -65,7 +66,7 @@ if (ssid_sessions[socket.ssid].hasCap("client-has-disk")) { data += `
  • DuckDuckGo Lite
    • ` -if (ssid_sessions[socket.ssid].hasCap("client-can-do-javascript")) { +if (session_data.hasCap("client-can-do-javascript")) { // URL access form requires javascript, hide if client does not support data += `
  • m-mail—with anyone who is on ${minisrv_config.config.service_name}, as well as anyone using other compatible MiniSrvs around the world. This is your m-mail address:
    -${ssid_sessions[socket.ssid].getSessionData("subscriber_username")}@${minisrv_config.config.service_name} +${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.service_name}
    Choose Begin to start using Mail.