zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BREAKING CHANGES: (for SeCuRiTy):

Browse Source 
By default:
- `ssid_sessions[socket.ssid]` is now `session_data`
- `require` is no longer allowed in user scripts

To access global `socket_sessions` and `ssid_sessions`, as well as `require` additional modules, you must set `privileged: true` for the specific service. See `config.json`.
This commit is contained in:
zefie
2022-10-09 13:26:14 -04:00
parent 2491f62b89
commit 37f1ab67ad
118 changed files with 577 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zefie_wtvp_minisrv/ServiceVault/wtv-1800/noflash.js
View File

@@ -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) {

68
zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js
View File

@@ -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";

2
zefie_wtvp_minisrv/ServiceVault/wtv-1800/unauthorized.js
View File

@@ -54,7 +54,7 @@ Access Denied
<td width=104 valign=middle align=center>
<td width=20 valign=middle align=center>
<td colspan=9 width=100 height=258 valign=top align=left>
<font size=-1>You are not authorized to use this service. <p>Reason: ${ssid_sessions[socket.ssid].lockdownReason}</font>
<font size=-1>You are not authorized to use this service. <p>Reason: ${session_data.lockdownReason}</font>
<tr>
<td width=104 valign=middle align=center>
<td width=20 valign=middle align=center>

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/admin.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/ban.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteaccount.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/deleteuser.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/findaccount.js
View File

@@ -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;

4
zefie_wtvp_minisrv/ServiceVault/wtv-admin/polyzoot.js
View File

@@ -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 += `
</form><br><br>`
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 <b>yourself</b>?<br>Are you a masochist?`;
} else {
data += `Are you sure you want to Polyzoot <b>${user_info.username}</b>?<br>Are you a sadist?`;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/regenfavs.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/reloadconfig.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/removeuserpasswd.js
View File

@@ -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;

2
zefie_wtvp_minisrv/ServiceVault/wtv-admin/unban.js
View File

@@ -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) {

2
zefie_wtvp_minisrv/ServiceVault/wtv-chat/MakeChatPage.js
View File

@@ -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) {

6
zefie_wtvp_minisrv/ServiceVault/wtv-chat/home.js
View File

@@ -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 = `<html>
<head>

4
zefie_wtvp_minisrv/ServiceVault/wtv-cookie/add.js
View File

@@ -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";
}

4
zefie_wtvp_minisrv/ServiceVault/wtv-cookie/get.js
View File

@@ -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";
}

4
zefie_wtvp_minisrv/ServiceVault/wtv-cookie/list.js
View File

@@ -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";
}

4
zefie_wtvp_minisrv/ServiceVault/wtv-cookie/reset.js
View File

@@ -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 = `<html>

6
zefie_wtvp_minisrv/ServiceVault/wtv-disk/userstore.js
View File

@@ -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";

2
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/add.js
View File

@@ -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);
saveFavorite(session_data.favstore, title, folder, imagetype, favurl);

12
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-add-folder.js
View File

@@ -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

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-arrange-favorites.js
View File

@@ -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`

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-favorites.js
View File

@@ -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

8
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-discard-folders.js
View File

@@ -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

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-move-favorites.js
View File

@@ -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;

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-rename-favorites.js
View File

@@ -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}`;

14
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-samples-page.js
View File

@@ -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

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js
View File

@@ -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);

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite-index.js
View File

@@ -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]

8
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/favorite.js
View File

@@ -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
<tbody><tr><td align="left">
<shadow><blackface><font color="e7ce4a">
Favorite folders
for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"}
for ${session_data.getSessionData("subscriber_username") || "You"}
</font><blackface><shadow>
</shadow></blackface></blackface></shadow></td></tr></tbody></table>
</td></tr><tr>

2
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/get-thumbnail.js
View File

@@ -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");

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/list-folders.js
View File

@@ -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";

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-arrange-favorites.js
View File

@@ -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.
<td valign=top>
<input type=hidden name=autosubmit autosubmit=onleave>
<INPUT TYPE="checkbox" NAME="with_pictures" `
if (ssid_sessions[socket.ssid].getSessionData("subscriber_fav_images") == "true")
if (session_data.getSessionData("subscriber_fav_images") == "true")
console.log("SELECTED")
data += "checked"
data += ` selected>

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-browser.js
View File

@@ -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
</td><td><table width="428" cellspacing="0" cellpadding="0">
<tbody><tr>
<td align="left">
<shadow><blackface><font color="e7ce4a">Favorites for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"}
<shadow><blackface><font color="e7ce4a">Favorites for ${session_data.getSessionData("subscriber_username") || "You"}
</font><shadow><blackface>
</blackface></shadow></blackface></shadow></td></tr></tbody></table>
</td></tr><tr>

6
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js
View File

@@ -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

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-favorites.js
View File

@@ -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);

2
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-discard-folders.js
View File

@@ -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

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-move-favorites.js
View File

@@ -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);

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-organize-favorites.js
View File

@@ -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);

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-rename-favorites.js
View File

@@ -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);

12
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-samples-page.js
View File

@@ -104,7 +104,7 @@ by going to the folder and choosing <b>Organize</b>.<br>
<td width=25>
<tr>
<td width=25>`
if (ssid_sessions[socket.ssid].favstore.folderExists("Fun") == true)
if (session_data.favstore.folderExists("Fun") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>
@@ -124,7 +124,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Fun") == true)
<input type="checkbox" name="Fun" value="true"> &nbsp;Fun
</font>`
}
if (ssid_sessions[socket.ssid].favstore.folderExists("Money") == true)
if (session_data.favstore.folderExists("Money") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>
@@ -147,7 +147,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Money") == true)
<td width=25>
<tr>
<td width=25>`
if (ssid_sessions[socket.ssid].favstore.folderExists("Movies") == true)
if (session_data.favstore.folderExists("Movies") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>
@@ -167,7 +167,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Movies") == true)
<input type="checkbox" name="Movies" value="true"> &nbsp;Movies
</font>`
}
if (ssid_sessions[socket.ssid].favstore.folderExists("News") == true)
if (session_data.favstore.folderExists("News") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>
@@ -191,7 +191,7 @@ data += `
<td width=25>
<tr>
<td width=25>`
if (ssid_sessions[socket.ssid].favstore.folderExists("Recommended") == true)
if (session_data.favstore.folderExists("Recommended") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>
@@ -211,7 +211,7 @@ if (ssid_sessions[socket.ssid].favstore.folderExists("Recommended") == true)
<input type="checkbox" name="Recommended" value="true"> &nbsp;Recommended
</font>`
}
if (ssid_sessions[socket.ssid].favstore.folderExists("Reference") == true)
if (session_data.favstore.folderExists("Reference") == true)
{
data += `
<td width=50% absheight=30 align=left valign=middle>

4
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js
View File

@@ -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);

2
zefie_wtvp_minisrv/ServiceVault/wtv-favorite/sony.html
View File

@@ -102,7 +102,7 @@ Favorites
</td><td><table width="428" cellspacing="0" cellpadding="0">
<tbody><tr>
<td align="left">
<shadow><blackface><font color="e7ce4a">Favorites for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"}
<shadow><blackface><font color="e7ce4a">Favorites for ${session_data.getSessionData("subscriber_username") || "You"}
</font><shadow><blackface>
</blackface></shadow></blackface></shadow></td></tr></tbody></table>
</td></tr><tr>

12
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/content/content-serve.js
View File

@@ -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);
});

10
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/current-noflash.js
View File

@@ -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);
});

12
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-by-path.js
View File

@@ -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 {

4
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js
View File

@@ -80,9 +80,9 @@ Updating now
<td width=20 valign=middle align=center>
<td colspan=9 width=100 height=258 valign=top align=left>
<font size=+1>
Your ${ssid_sessions[socket.ssid].getBoxName()} is being<br>updated automatically.
Your ${session_data.getBoxName()} is being<br>updated automatically.
<p> <font size=+1>
This will take a while, and<br>then you can use your ${ssid_sessions[socket.ssid].getBoxName()} again.
This will take a while, and<br>then you can use your ${session_data.getBoxName()} again.
`;
if (flashrom_info.is_bootrom && flashrom_info.part_number == (flashrom_info.part_count - 1)) {
data += `<p>

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/initiate-lc2-download.js
View File

@@ -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);

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-complete.js
View File

@@ -62,7 +62,7 @@ Updating complete
<font size=+1>
The update is complete.<br>
<p><font size=+1>Choose <b>Connect Now</b> if you<br>want to connect to ${minisrv_config.config.service_name}.
<p><font size=+1>Press the <b>power</b> button to switch<br>off your ${ssid_sessions[socket.ssid].getBoxName()}.
<p><font size=+1>Press the <b>power</b> button to switch<br>off your ${session_data.getBoxName()}.
</font>
<tr>
<td width=104 valign=middle align=center>

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/lc2-download-failed.js
View File

@@ -93,7 +93,7 @@ data = `<html>
We ran into a technical problem while updating
your unit. (Error: ${error})
Choose <b>Try Again</b> to try again now.
<p><font size=+1>Press the <b>power</b> button to switch off your ${ssid_sessions[socket.ssid].getBoxName()}.
<p><font size=+1>Press the <b>power</b> button to switch off your ${session_data.getBoxName()}.
<tr>
<td width=104 valign=middle align=center>
<td width=20 valign=middle align=center>

10
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/noflash.js
View File

@@ -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);
});

2
zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/willie.js
View File

@@ -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'
}

24
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/ValidateLogin.js
View File

@@ -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 += `

6
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/bad-disk.js
View File

@@ -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`;

4
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/choose-user.js
View File

@@ -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
<tr><td absheight=2>
<tr>`;
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 += "<td absheight=37><td valign=middle abswidth=50% maxlines=1>";

48
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login-stage-two.js
View File

@@ -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 = "<user-list>\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) {

20
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/login.js
View File

@@ -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;
}
}

2
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/password.js
View File

@@ -37,7 +37,7 @@ text="AA9B4A" link=189cd6 vlink=189cd6 hspace=0 fontsize="large"> <form action=/
<td height=125 valign=center>
<font size=+1 color=42bd52>Password
<img src="ROMCache/Spacer.gif" width=4 height=1> <input type=password size=26 maxlength="${minisrv_config.config.passwords.max_length}" name="password" bgcolor=#444444 text=#ffdd33 cursor=#cc9933 id="password" selected >
<input type=hidden name="user_id" id="user_id" value=${ssid_sessions[socket.ssid].user_id}> <tr> <td>
<input type=hidden name="user_id" id="user_id" value=${session_data.user_id}> <tr> <td>
<td>
<tr>
<td>

2
zefie_wtvp_minisrv/ServiceVault/wtv-head-waiter/relogin.js
View File

@@ -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";

2
zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Legal.js
View File

@@ -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 = `

2
zefie_wtvp_minisrv/ServiceVault/wtv-home/Credits-Privacy.js
View File

@@ -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 = `

21
zefie_wtvp_minisrv/ServiceVault/wtv-home/home.js
View File

@@ -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 = `<html>
<head>
<title>Home for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "minisrv"}</title>
<title>Home for ${session_data.getSessionData("subscriber_username") || "minisrv"}</title>
<DISPLAY NoLogo>
</head>
<body bgcolor="black" link="gold" vlink="gold" alink="gold" text="gold">
@@ -32,7 +32,7 @@ function go() {
}
</script>
<b>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 += `</b><br>
<div width="540" align="right">
<font size="-4"><i>
@@ -45,19 +45,20 @@ minisrv v${minisrv_config.version}${(minisrv_config.config.git_commit) ? ' git-'
<form name=access onsubmit="go()">
<ul>
<li><a href="client:relog">client:relog (direct)</a></li>
<li><a href="wtv-flashrom:/willie" selected>Ultra Willies</a> ~ <a href="wtv-tricks:/tricks">Tricks</a></li>
<li><a href="wtv-flashrom:/willie">Ultra Willies</a> ~ <a href="wtv-tricks:/tricks">Tricks</a></li>
<li><a href="wtv-setup:/setup">Setup (Including BG Music)</a></li>
<li><a href="wtv-favorite:/favorite">Favorites</a> <sup>new!</sup></li>
<li><a href="${ssid_sessions[socket.ssid].mailstore.checkMailIntroSeen() ? 'wtv-mail:/listmail' : 'wtv-mail:/DiplomaMail'}">Mail (beta)</a>
<li><a href="wtv-admin:/admin">wtv-admin</a> <sup>new!</sup>
<li><a href="${session_data.mailstore.checkMailIntroSeen() ? 'wtv-mail:/listmail' : 'wtv-mail:/DiplomaMail'}">Mail (beta)</a>
<li><a href="wtv-news:/lobby">Usenet (not ready)</a>
`;
if (ssid_sessions[socket.ssid].hasCap("client-can-do-chat")) {
if (session_data.hasCap("client-can-do-chat")) {
data += "<li><a href=\"wtv-chat:/home\">IRC Chat Test</a></li>\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 += "<li><a href=\"client:diskhax\">DiskHax</a> ~ <a href=\"client:vfathax\">VFatHax</a></li>\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 += "<li>Old DealerDemo: <a href=\"wtv-disk:/sync?group=DealerDemo&diskmap=DealerDemo\">Download</a> ~ <a href=\"file://Disk/Demo/index.html\">Access</a></li>\n";
}
@@ -65,7 +66,7 @@ if (ssid_sessions[socket.ssid].hasCap("client-has-disk")) {
data += `<li><a href="http://duckduckgo.com/lite/">DuckDuckGo Lite</a></li>`
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 += `<li><input name=url `;

2
zefie_wtvp_minisrv/ServiceVault/wtv-mail/DiplomaMail.js
View File

@@ -56,7 +56,7 @@ Welcome to Mail&nbsp;
In Mail, you can exchange typed messages&#151;called
<i>m-mail</i>&#151;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:
<blockquote>
<b>${ssid_sessions[socket.ssid].getSessionData("subscriber_username")}@${minisrv_config.config.service_name}</b>
<b>${session_data.getSessionData("subscriber_username")}@${minisrv_config.config.service_name}</b>
</blockquote>
Choose <b>Begin</b> to start using Mail. <!-- Or to learn more,
choose this link:

14
zefie_wtvp_minisrv/ServiceVault/wtv-mail/addressbook.js
View File

@@ -11,12 +11,12 @@ if (request_headers.query.action == "editfromheader") {
}
var addresstoadd = parseAddress()
if (ssid_sessions[socket.ssid].getSessionData("address_book")) {
ssid_sessions[socket.ssid].setSessionData("address_book", ssid_sessions[socket.ssid].getSessionData("address_book") + addresstoadd);
ssid_sessions[socket.ssid].saveSessionData();
if (session_data.getSessionData("address_book")) {
session_data.setSessionData("address_book", session_data.getSessionData("address_book") + addresstoadd);
session_data.saveSessionData();
} else {
ssid_sessions[socket.ssid].setSessionData("address_book", addresstoadd);
ssid_sessions[socket.ssid].saveSessionData();
session_data.setSessionData("address_book", addresstoadd);
session_data.saveSessionData();
}
@@ -117,10 +117,10 @@ label="View saved messages">
<TABLE CELLSPACING=0 CELLPADDING=0>
<TR><TD COLSPAN=3 HEIGHT=12VALIGN=TOP ALIGN=LEFT>
<TR><TD COLSPAN=3 HEIGHT=35 VALIGN=TOP><FONT SIZE=+3 COLOR="E7CE4A"><B><SHADOW><BLACKFACE>Buddies for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"}</BLACKFACE></SHADOW></B></FONT>
<TR><TD COLSPAN=3 HEIGHT=35 VALIGN=TOP><FONT SIZE=+3 COLOR="E7CE4A"><B><SHADOW><BLACKFACE>Buddies for ${session_data.getSessionData("subscriber_username") || "You"}</BLACKFACE></SHADOW></B></FONT>
<TR><TD COLSPAN=3 HEIGHT=25 VALIGN=TOP>
<TABLE CELLSPACING=0 CELLPADDING=0>
<TD WIDTH=400>Your address is ${ssid_sessions[socket.ssid].getSessionData("messenger_email") || "unlinked"}@${ssid_sessions[socket.ssid].getSessionData("messenger_domain") || "escargot.chat"}
<TD WIDTH=400>Your address is ${session_data.getSessionData("messenger_email") || "unlinked"}@${session_data.getSessionData("messenger_domain") || "escargot.chat"}
<TD ALIGN=RIGHT>
</TABLE>
</TABLE>

2
zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-attachment.js
View File

@@ -6,7 +6,7 @@ var messageid = request_headers.query.message_id;
var attachment_id = request_headers.query.attachment_id;
if (!attachment_id && attachment_id != 0) errpage = wtvshared.doErrorPage(400, "Attachment ID required.");
else {
var message = ssid_sessions[socket.ssid].mailstore.getMessageByID(messageid);
var message = session_data.mailstore.getMessageByID(messageid);
if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID");
else {
if (!message.attachments) message.attachments = []; // backwards compat

4
zefie_wtvp_minisrv/ServiceVault/wtv-mail/get-signature.js
View File

@@ -5,10 +5,10 @@ var errpage = null;
var messageid = request_headers.query.message_id || null;
if (!messageid) {
// get user signature
data = ssid_sessions[socket.ssid].getSessionData("subscriber_signature");
data = session_data.getSessionData("subscriber_signature");
} else {
// get message signature
var message = ssid_sessions[socket.ssid].mailstore.getMessageByID(messageid);
var message = session_data.mailstore.getMessageByID(messageid);
if (!message) errpage = wtvshared.doErrorPage(400, "Invalid Message ID");
data = message.signature
}

26
zefie_wtvp_minisrv/ServiceVault/wtv-mail/listmail.js
View File

@@ -8,20 +8,20 @@ function mail_end_error(msg) {
data = errpage[1];
}
var intro_seen = ssid_sessions[socket.ssid].mailstore.checkMailIntroSeen();
var intro_seen = session_data.mailstore.checkMailIntroSeen();
if (!intro_seen && !request_headers.query.intro_seen) {
// user is trying to bypass the intro screen
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail";
} else {
if (!intro_seen && request_headers.query.intro_seen) {
// User has come from intro
ssid_sessions[socket.ssid].mailstore.setMailIntroSeen(true);
session_data.mailstore.setMailIntroSeen(true);
}
// check if mailstore exists (returns null if guest)
mailstore_exists = ssid_sessions[socket.ssid].mailstore.mailstoreExists();
mailstore_exists = session_data.mailstore.mailstoreExists();
// create mailstore if it doesnt exist (also returns null if guest)
if (!mailstore_exists) mailstore_exists = ssid_sessions[socket.ssid].mailstore.createMailstore();
if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore();
if (mailstore_exists) {
// mailstore exists and user is not guest
@@ -33,29 +33,29 @@ if (!intro_seen && !request_headers.query.intro_seen) {
var page = (request_headers.query.page) ? parseInt(request_headers.query.page) : 0;
// get mailbox name
var mailbox_name = ssid_sessions[socket.ssid].mailstore.getMailboxById(parseInt(mailbox));
var mailbox_name = session_data.mailstore.getMailboxById(parseInt(mailbox));
// if false or null, then mailbox is invalid
if (!mailbox_name) {
mail_end_error("Invalid Mailbox ID");
} else {
// mailboxid is ok
if (!ssid_sessions[socket.ssid].mailstore.mailboxExists(mailbox)) {
if (!session_data.mailstore.mailboxExists(mailbox)) {
// mailbox does not yet exist, create it
var mailbox_exists = ssid_sessions[socket.ssid].mailstore.createMailbox(mailbox);
var mailbox_exists = session_data.mailstore.createMailbox(mailbox);
if (!mailbox_exists) {
// failed to create mailbox for some reason
mail_end_error();
} else {
if (mailbox === 0) {
// Just created Inbox for the first time, so create the welcome message
ssid_sessions[socket.ssid].mailstore.createWelcomeMessage();
session_data.mailstore.createWelcomeMessage();
}
}
}
var message_list = ssid_sessions[socket.ssid].mailstore.listMessages(mailbox, limit, reverse_sort, (page * limit))
var total_message_count = ssid_sessions[socket.ssid].mailstore.countMessages(mailbox);
var total_unread_message_count = ssid_sessions[socket.ssid].mailstore.countUnreadMessages(mailbox);
var message_list = session_data.mailstore.listMessages(mailbox, limit, reverse_sort, (page * limit))
var total_message_count = session_data.mailstore.countMessages(mailbox);
var total_unread_message_count = session_data.mailstore.countUnreadMessages(mailbox);
var message_list_string = null;
if (total_message_count == 0) {
@@ -69,7 +69,7 @@ if (!intro_seen && !request_headers.query.intro_seen) {
}
}
var username = ssid_sessions[socket.ssid].getSessionData("subscriber_username");
var username = session_data.getSessionData("subscriber_username");
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "This feature is not available.",
@@ -204,7 +204,7 @@ label="View saved e-mail messages">
var icon_image = null;
switch (mailbox_name) {
case "Inbox":
icon_image = ssid_sessions[socket.ssid].mailstore.getMailboxIcon();
icon_image = session_data.mailstore.getMailboxIcon();
break;
case "Sent":
icon_image = "MailboxSent.gif";

10
zefie_wtvp_minisrv/ServiceVault/wtv-mail/readmail.js
View File

@@ -8,7 +8,7 @@ function mail_end_error(msg) {
data = errpage[1];
}
var intro_seen = ssid_sessions[socket.ssid].mailstore.checkMailIntroSeen();
var intro_seen = session_data.mailstore.checkMailIntroSeen();
if (!intro_seen && !request_headers.query.intro_seen) {
// user is trying to bypass the intro screen
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail";
@@ -17,11 +17,11 @@ if (!intro_seen && !request_headers.query.intro_seen) {
mail_end_error("Message ID Required");
} else {
var messageid = request_headers.query.message_id;
var message = ssid_sessions[socket.ssid].mailstore.getMessageByID(messageid);
var message = session_data.mailstore.getMessageByID(messageid);
if (!message) {
mail_end_error("Invalid Message ID");
} else {
ssid_sessions[socket.ssid].mailstore.setMessageReadStatus(messageid);
session_data.mailstore.setMessageReadStatus(messageid);
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
'message': "This feature is not available.",
@@ -31,7 +31,7 @@ if (!intro_seen && !request_headers.query.intro_seen) {
}).getURL();
if (request_headers.query.message_delete) {
ssid_sessions[socket.ssid].mailstore.deleteMessage(messageid);
session_data.mailstore.deleteMessage(messageid);
headers = `300 OK
wtv-expire: wtv-mail:/listmail
Location: wtv-mail:/listmail`;
@@ -39,7 +39,7 @@ Location: wtv-mail:/listmail`;
headers = `200 OK
Content-type: text/html`;
var message_colors = ssid_sessions[socket.ssid].mailstore.getSignatureColors(message.signature);
var message_colors = session_data.mailstore.getSignatureColors(message.signature);
if (typeof message.subject == "object" && message.subject) message.subject = wtvshared.decodeBufferText(message.subject);
data = `<wtvnoscript>

52
zefie_wtvp_minisrv/ServiceVault/wtv-mail/sendmail.js
View File

@@ -2,7 +2,7 @@ var minisrv_service_file = true;
var message_snapshot_data = null;
var message_voicemail_data = null;
var intro_seen = ssid_sessions[socket.ssid].mailstore.checkMailIntroSeen();
var intro_seen = session_data.mailstore.checkMailIntroSeen();
if (!intro_seen && !request_headers.query.intro_seen) {
// user is trying to bypass the intro screen
headers = "300 OK\nLocation: wtv-mail:/DiplomaMail";
@@ -20,8 +20,8 @@ if (!intro_seen && !request_headers.query.intro_seen) {
}
if (request_headers.query.clear == "true") {
ssid_sessions[socket.ssid].deleteSessionData("mail_draft");
ssid_sessions[socket.ssid].deleteSessionData("mail_draft_attachments");
session_data.deleteSessionData("mail_draft");
session_data.deleteSessionData("mail_draft_attachments");
headers = `300 OK
wtv-expire: wtv-mail:/listmail
wtv-expire: wtv-mail:/sendmail
@@ -29,7 +29,7 @@ Location: wtv-mail:/sendmail`;
}
var newsgroup = null;
if (parseBool(request_headers.query.discuss)) {
if (wtvshared.parseBool(request_headers.query.discuss)) {
newsgroup = request_headers.query.group || request_headers.query.message_to || null;
}
@@ -48,10 +48,10 @@ Location: wtv-mail:/sendmail`;
var msg_url_title = request_headers.query.message_title || null;
var no_signature = false;
var mail_draft_data = ssid_sessions[socket.ssid].getSessionData("mail_draft");
var mail_draft_attachments = ssid_sessions[socket.ssid].getSessionData("mail_draft_attachments") || {};
var mail_draft_data = session_data.getSessionData("mail_draft");
var mail_draft_attachments = session_data.getSessionData("mail_draft_attachments") || {};
if (mail_draft_data) {
ssid_sessions[socket.ssid].deleteSessionData("mail_draft");
session_data.deleteSessionData("mail_draft");
if (mail_draft_data.to_addr) to_addr = mail_draft_data.to_addr;
if (mail_draft_data.msg_subject) msg_subject = mail_draft_data.msg_subject;
if (mail_draft_data.msg_body) msg_body = mail_draft_data.msg_body;
@@ -81,8 +81,8 @@ Content-Type: audio/wav`;
data = message_voicemail_data;
} else {
var username = ssid_sessions[socket.ssid].getSessionData("subscriber_username");
var userdisplayname = wtvshared.htmlEntitize(ssid_sessions[socket.ssid].getSessionData("subscriber_name"));
var username = session_data.getSessionData("subscriber_username");
var userdisplayname = wtvshared.htmlEntitize(session_data.getSessionData("subscriber_name"));
var address = username + "@" + minisrv_config.config.domain_name
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
@@ -94,7 +94,7 @@ Content-Type: audio/wav`;
if ((typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) || request_headers.query.saveoff || request_headers.query.get_snap || request_headers.query.get_gab) {
var from_addr = address;
var signature = ssid_sessions[socket.ssid].getSessionData("subscriber_signature") || null;
var signature = session_data.getSessionData("subscriber_signature") || null;
if (typeof request_headers.query.sendoff !== 'undefined' && request_headers.query.sendoff != false) {
var attachments = [];
@@ -140,7 +140,7 @@ Content-Type: audio/wav`;
'From': from_addr,
'Newsgroups': newsgroup,
'Subject': msg_subject || "(No subject)",
'Message-ID': "<"+ssid_sessions[socket.ssid].generatePassword(16) + "@" + minisrv_config.config.domain_name+">",
'Message-ID': "<"+session_data.generatePassword(16) + "@" + minisrv_config.config.domain_name+">",
'Date': strftime('%A, %d-%b-%y %k:%M:%S %z', new Date())
}
if (msg_body) {
@@ -175,14 +175,14 @@ Location: wtv-news:/news?group=${newsgroup}`;
});
}
} else {
var messagereturn = ssid_sessions[socket.ssid].mailstore.sendMessageToAddr(from_addr, to_addr, msg_body, msg_subject, userdisplayname, to_name, signature, attachments, msg_url, msg_url_title);
var messagereturn = session_data.mailstore.sendMessageToAddr(from_addr, to_addr, msg_body, msg_subject, userdisplayname, to_name, signature, attachments, msg_url, msg_url_title);
if (messagereturn !== true) {
var errpage = wtvshared.doErrorPage(400, messagereturn);
headers = errpage[0];
data = errpage[1];
} else {
ssid_sessions[socket.ssid].deleteSessionData("mail_draft");
ssid_sessions[socket.ssid].deleteSessionData("mail_draft_attachments");
session_data.deleteSessionData("mail_draft");
session_data.deleteSessionData("mail_draft_attachments");
headers = `300 OK
wtv-expire: wtv-mail:/listmail
wtv-expire: wtv-mail:/sendmail
@@ -200,7 +200,7 @@ Location: wtv-mail:/listmail`;
msg_url_title: msg_url_title,
newsgroup: newsgroup
}
ssid_sessions[socket.ssid].setSessionData("mail_draft", mail_draft_data);
session_data.setSessionData("mail_draft", mail_draft_data);
headers = `200 OK
Content-type: text/html
wtv-expire: wtv-mail:/sendmail`;
@@ -209,31 +209,31 @@ wtv-expire: wtv-mail:/sendmail`;
headers = `200 OK
Content-type: text/html`;
var mail_draft_data = ssid_sessions[socket.ssid].getSessionData("mail_draft_attachments") || {};
var mail_draft_data = session_data.getSessionData("mail_draft_attachments") || {};
if (request_headers.query.snapping == "false") {
headers += "\nwtv-expire: cache:snapshot.jpg";
if (mail_draft_data.message_snapshot_data) mail_draft_data.message_snapshot_data = null;
ssid_sessions[socket.ssid].setSessionData("mail_draft_attachments", mail_draft_data);
session_data.setSessionData("mail_draft_attachments", mail_draft_data);
}
if (request_headers.query.gabbing == "false") {
headers += "\nwtv-expire: cache:voicemail.wav";
if (mail_draft_data.message_voicemail_data) mail_draft_data.message_voicemail_data = null;
ssid_sessions[socket.ssid].setSessionData("mail_draft_attachments", mail_draft_data);
session_data.setSessionData("mail_draft_attachments", mail_draft_data);
}
if (request_headers.query.message_snapshot_data) {
mail_draft_data.message_snapshot_data = request_headers.query.message_snapshot_data
ssid_sessions[socket.ssid].setSessionData("mail_draft_attachments", mail_draft_data);
session_data.setSessionData("mail_draft_attachments", mail_draft_data);
}
if (request_headers.query.message_voicemail_data) {
mail_draft_data.message_voicemail_data = request_headers.query.message_voicemail_data
ssid_sessions[socket.ssid].setSessionData("mail_draft_attachments", mail_draft_data);
session_data.setSessionData("mail_draft_attachments", mail_draft_data);
}
var message_colors = null;
if (no_signature) message_colors = ssid_sessions[socket.ssid].mailstore.getSignatureColors(null, true);
else message_colors = ssid_sessions[socket.ssid].mailstore.getSignatureColors(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"), true);
if (no_signature) message_colors = session_data.mailstore.getSignatureColors(null, true);
else message_colors = session_data.mailstore.getSignatureColors(session_data.getSessionData("subscriber_signature"), true);
data = `<HTML>
<head>
@@ -379,7 +379,7 @@ data += `
<spacer type=horizontal size=13>
<td height=80>
<img src="wtv-mail:/content/images/Mail.gif" width=87 height=45>
<img src="wtv-mail:/content/images/${ssid_sessions[socket.ssid].mailstore.getMailboxIcon()}" width=74 height=45 transparency=60>
<img src="wtv-mail:/content/images/${session_data.mailstore.getMailboxIcon()}" width=74 height=45 transparency=60>
<td width=250 align=left><font sizerange=small>
</table>
<tr>
@@ -513,8 +513,8 @@ link=${message_colors.link}
vlink=${message_colors.vlink}
vspace=0
hspace=0>`;
if (ssid_sessions[socket.ssid].getSessionData("subscriber_signature") && ssid_sessions[socket.ssid].getSessionData("subscriber_signature") != "" && !no_signature) {
data += wtvshared.sanitizeSignature(ssid_sessions[socket.ssid].getSessionData("subscriber_signature"));
if (session_data.getSessionData("subscriber_signature") && session_data.getSessionData("subscriber_signature") != "" && !no_signature) {
data += wtvshared.sanitizeSignature(session_data.getSessionData("subscriber_signature"));
}
if (msg_url) {
data += `<input type="hidden" name="message_url" value="${msg_url}">
@@ -538,7 +538,7 @@ Included Page: <a href="${msg_url}">${wtvshared.htmlEntitize(msg_url_title).repl
<table cellspacing=0 cellpadding=0 border=0>
<tr>
<td width=305 valign=top>`;
if (!ssid_sessions[socket.ssid].getSessionData("subscriber_signature") || ssid_sessions[socket.ssid].getSessionData("subscriber_signature") == "") {
if (!session_data.getSessionData("subscriber_signature") || session_data.getSessionData("subscriber_signature") == "") {
data += `<input type = hidden name = "togglesign" value = "false"> <td abswidth=13 > `;
} else if (no_signature) {
data += `<a href="javascript:Signing('true')">

2
zefie_wtvp_minisrv/ServiceVault/wtv-news/news.js
View File

@@ -295,7 +295,7 @@ async function WebTVShowMessage(client, group, article) {
headers = `200 OK
Content-type: text/html`;
var message_colors = ssid_sessions[socket.ssid].mailstore.defaultColors;
var message_colors = session_data.mailstore.defaultColors;
data = `<head>
<sendpanel

4
zefie_wtvp_minisrv/ServiceVault/wtv-passport/messengerlogin.js
View File

@@ -5,8 +5,8 @@ Expires: Wed, 09 Oct 1991 22:00:00 GMT
Content-Type: text/plain`
var email = ssid_sessions[socket.ssid].getSessionData("messenger_email") + "%40" + ssid_sessions[socket.ssid].getSessionData("messenger_domain");
var password = ssid_sessions[socket.ssid].decryptPassword(ssid_sessions[socket.ssid].getSessionData("messenger_password"));
var email = session_data.getSessionData("messenger_email") + "%40" + session_data.getSessionData("messenger_domain");
var password = session_data.decryptPassword(session_data.getSessionData("messenger_password"));
var challenge = request_headers.request.split('?')[1];
if (request_headers.request.split('?')[1].substring(0, 3) != "ct=") {

8
zefie_wtvp_minisrv/ServiceVault/wtv-register/BeMyGuest.js
View File

@@ -6,10 +6,10 @@ Connection: Close
wtv-noback-all: wtv-register:
wtv-expire-all: wtv-`;
if (socket.ssid) {
if (ssid_sessions[socket.ssid]) {
if (ssid_sessions[socket.ssid].data_store) {
if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
headers += "\nwtv-ticket: " + ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64;
if (session_data) {
if (session_data.data_store) {
if (session_data.data_store.wtvsec_login) {
headers += "\nwtv-ticket: " + session_data.data_store.wtvsec_login.ticket_b64;
}
}
}

2
zefie_wtvp_minisrv/ServiceVault/wtv-register/FinishRegistration.js
View File

@@ -4,7 +4,7 @@ headers = `300 Moved
Connection: Close
wtv-noback-all: wtv-register:
wtv-expire-all: wtv-
wtv-ticket: ${ssid_sessions[socket.ssid].data_store.wtvsec_login.ticket_b64}
wtv-ticket: ${session_data.data_store.wtvsec_login.ticket_b64}
wtv-service: reset
${getServiceString('wtv-1800')}
${getServiceString('wtv-head-waiter')}

2
zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAccountInfo.js
View File

@@ -28,7 +28,7 @@ if (!request_headers.query.registering) {
wtv-noback-all: wtv-register:
Content-Type: text/html`;
var title = "Account Review";
var isOldBuild = wtvshared.isOldBuild(ssid_sessions[socket.ssid]);
var isOldBuild = wtvshared.isOldBuild(session_data);
var main_data = '';
if (!isOldBuild) main_data += `<table cellspacing=0 cellpadding=0 border=0 width=560 bgcolor=#171726>
<tr><td>`;

2
zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateAgreement.js
View File

@@ -52,5 +52,5 @@ AutoCaps selected>
</shadow>
</font>
</form>`;
data = wtvr.getHTMLTemplate(minisrv_config.config.service_name + " Account Setup", main_data, form_data, wtvshared.isOldBuild(ssid_sessions[socket.ssid]));
data = wtvr.getHTMLTemplate(minisrv_config.config.service_name + " Account Setup", main_data, form_data, wtvshared.isOldBuild(session_data));
}

28
zefie_wtvp_minisrv/ServiceVault/wtv-register/ValidateReviewAccountInfo.js
View File

@@ -5,34 +5,34 @@ if (!request_headers.query.registering ||
!request_headers.query.subscriber_username ||
!request_headers.query.subscriber_contact ||
!request_headers.query.subscriber_contact_method ||
!ssid_sessions[socket.ssid].session_store ||
!ssid_sessions[socket.ssid] ||
!session_data.session_store ||
!session_data ||
!socket.ssid
) {
var errpage = wtvshared.doErrorPage(400);
headers = errpage[0];
data = errpage[1];
} else {
ssid_sessions[socket.ssid].setSessionData("subscriber_name", request_headers.query.subscriber_name);
ssid_sessions[socket.ssid].setSessionData("subscriber_username", request_headers.query.subscriber_username);
ssid_sessions[socket.ssid].setSessionData("subscriber_contact", request_headers.query.subscriber_contact);
ssid_sessions[socket.ssid].setSessionData("subscriber_contact_method", request_headers.query.subscriber_contact_method);
ssid_sessions[socket.ssid].setSessionData("subscriber_userid", 0);
ssid_sessions[socket.ssid].setSessionData("registered", true);
var mailstore_exists = ssid_sessions[socket.ssid].mailstore.mailstoreExists();
session_data.setSessionData("subscriber_name", request_headers.query.subscriber_name);
session_data.setSessionData("subscriber_username", request_headers.query.subscriber_username);
session_data.setSessionData("subscriber_contact", request_headers.query.subscriber_contact);
session_data.setSessionData("subscriber_contact_method", request_headers.query.subscriber_contact_method);
session_data.setSessionData("subscriber_userid", 0);
session_data.setSessionData("registered", true);
var mailstore_exists = session_data.mailstore.mailstoreExists();
var mailbox_exists = false;
if (!mailstore_exists) mailstore_exists = ssid_sessions[socket.ssid].mailstore.createMailstore();
if (!mailstore_exists) mailstore_exists = session_data.mailstore.createMailstore();
if (mailstore_exists) {
if (!ssid_sessions[socket.ssid].mailstore.mailboxExists(0)) {
if (!session_data.mailstore.mailboxExists(0)) {
// mailbox does not yet exist, create it
mailbox_exists = ssid_sessions[socket.ssid].mailstore.createMailbox(0);
mailbox_exists = session_data.mailstore.createMailbox(0);
}
if (mailbox_exists) {
// Just created Inbox for the first time, so create the welcome message
ssid_sessions[socket.ssid].mailstore.createWelcomeMessage();
session_data.mailstore.createWelcomeMessage();
}
}
if (!ssid_sessions[socket.ssid].saveSessionData(true, true)) {
if (!session_data.saveSessionData(true, true)) {
var errpage = wtvshared.doErrorPage(400);
headers = errpage[0];
data = errpage[1];

2
zefie_wtvp_minisrv/ServiceVault/wtv-register/register.js
View File

@@ -8,7 +8,7 @@ var wtvr = new WTVRegister(minisrv_config);
var namerand = Math.floor(Math.random() * 100000);
var nickname = (minisrv_config.config.service_name + '_' + namerand)
var human_name = nickname;
var isOldBuild = wtvshared.isOldBuild(ssid_sessions[socket.ssid]);
var isOldBuild = wtvshared.isOldBuild(session_data);
var form_data = `<input type=button action="ValidateAgreement?registering=true&subscriber_name=${human_name}&subscriber_username=${nickname}" text="#dddddd" Value="Quick Reg" name="speedyreg" borderimage="file://ROM/Borders/ButtonBorder2.bif" width=130>`;
if (minisrv_config.config.allow_guests) form_data += `<input type=button text="#dddddd" action="BeMyGuest" Value="Sign in as Guest" name="noreg" borderimage="file://ROM/Borders/ButtonBorder2.bif" width=170 >`;
var main_data = `<form action="ValidateAgreement"

8
zefie_wtvp_minisrv/ServiceVault/wtv-setup/accounts.js
View File

@@ -1,7 +1,7 @@
var minisrv_service_file = true;
ssid_sessions[socket.ssid].loadSessionData();
session_data.loadSessionData();
if (ssid_sessions[socket.ssid].user_id != 0) {
if (session_data.user_id != 0) {
var errpage = doErrorPage(400, "You are not authorized to edit the primary account.");
headers = errpage[0];
data = errpage[1];
@@ -66,9 +66,9 @@ ${minisrv_config.config.service_name} users
<FONT COLOR="44cc55"><B>
Subscriber:
<P>`;
var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers();
var accounts = session_data.listPrimaryAccountUsers();
var num_accounts = ssid_sessions[socket.ssid].getNumberOfUserAccounts();
var num_accounts = session_data.getNumberOfUserAccounts();
if (num_accounts > 1) data += "Additional users:</B></FONT>";
data += "<TD WIDTH=20><TD WIDTH=198 VALIGN=top ALIGN=left>";

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-name.js
View File

@@ -2,8 +2,8 @@ var minisrv_service_file = true;
var errpage;
if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
if (errpage) {

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user-password.js
View File

@@ -4,13 +4,13 @@ var errpage = null;
const WTVRegister = require("./WTVRegister.js")
const wtvr = new WTVRegister(minisrv_config, SessionStore);
if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (!request_headers.query.user_name) errpage = doErrorPage(400, "Please enter a username.");
else if (request_headers.query.user_name.length < minisrv_config.config.user_accounts.min_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with <b>" + minisrv_config.config.user_accounts.min_username_length + "</b> or more characters.");
else if (request_headers.query.user_name.length > minisrv_config.config.user_accounts.max_username_length) errpage = wtvshared.doErrorPage(400, "Please choose a username with <b>" + minisrv_config.config.user_accounts.max_username_length + "</b> or less characters.");
else if (!wtvr.checkUsernameSanity(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have chosen contains invalid characters. Please choose a username with only <b>letters</b>, <b>numbers</b>, <b>_</b> or <b>-</b>. Also, please be sure your username begins with a letter.");
else if (!wtvr.checkUsernameAvailable(request_headers.query.user_name)) errpage = wtvshared.doErrorPage(400, "The username you have selected is already in use. Please select another username.");
else if (ssid_sessions[socket.ssid].getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
else if (session_data.getNumberOfUserAccounts() > minisrv_config.config.user_accounts.max_users_per_account) errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/add-user.js
View File

@@ -1,10 +1,10 @@
var minisrv_service_file = true;
var errpage;
if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) {
if (Object.keys(session_data.listPrimaryAccountUsers()).length >= minisrv_config.config.user_accounts.max_users_per_account) {
errpage = wtvshared.doErrorPage(400, "You are not authorized to add more than " + minisrv_config.config.user_accounts.max_users_per_account + ` account${minisrv_config.config.user_accounts.max_users_per_account > 1 ? 's' : ''}.`);
}
else if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
if (errpage) {

3
zefie_wtvp_minisrv/ServiceVault/wtv-setup/choose-bg-songs.js
View File

@@ -1,8 +1,5 @@
var minisrv_service_file = true;
var WTVBGMusic = require("./WTVBGMusic.js");
var wtvbgm = new WTVBGMusic(minisrv_config, ssid_sessions[socket.ssid])
var catsListed = 0;
var categories = wtvbgm.getCategoryList();
var divide = Math.round(categories.length / 2, 0);

12
zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-password.js
View File

@@ -1,11 +1,11 @@
var minisrv_service_file = true;
ssid_sessions[socket.ssid].loadSessionData();
session_data.loadSessionData();
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;
// security
if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_id != user_id) {
if (session_data.user_id != 0 && session_data.user_id != user_id) {
user_id = null; // force unset
var errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
headers = errpage[0];
@@ -14,7 +14,7 @@ if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_i
if (user_id != null) {
var userSession = null;
if (ssid_sessions[socket.ssid].user_id == request_headers.query.user_id) userSession = ssid_sessions[socket.ssid];
if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
else {
userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
userSession.user_id = user_id;
@@ -34,7 +34,7 @@ Content-Type: text/html`;
<HTML>
<HEAD>
<TITLE>
Change ${(user_id == ssid_sessions[socket.ssid].user_id) ? 'your' : 'user'} password
Change ${(user_id == session_data.user_id) ? 'your' : 'user'} password
</TITLE>
<DISPLAY nosave
noscroll>
@@ -74,7 +74,7 @@ noscroll>
<td abswidth=14>
<td abswidth=416 absheight=80 valign=center>
<font size="+2" color="E7CE4A"><blackface><shadow>
Change ${(user_id == ssid_sessions[socket.ssid].user_id) ? 'your' : 'user'} password
Change ${(user_id == session_data.user_id) ? 'your' : 'user'} password
<td abswidth=20>
<tr>
<td>

10
zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-begin.js
View File

@@ -1,15 +1,15 @@
var minisrv_service_file = true;
ssid_sessions[socket.ssid].loadSessionData();
session_data.loadSessionData();
var user_id = null;
if (request_headers.query.user_id) {
user_id = request_headers.query.user_id;
} else {
user_id = ssid_sessions[socket.ssid].user_id;
user_id = session_data.user_id;
}
// security
if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_id != request_headers.query.user_id) {
if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
user_id = null; // force unset
var errpage = doErrorPage(400, "You are not authorized to edit the selected user.");
headers = errpage[0];
@@ -19,10 +19,10 @@ if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_i
if (user_id != null) {
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`
var userSession = null;
if (ssid_sessions[socket.ssid].user_id == request_headers.query.user_id) userSession = ssid_sessions[socket.ssid];
if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
else {
userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
userSession.user_id = user_id;

8
zefie_wtvp_minisrv/ServiceVault/wtv-setup/edit-user-name.js
View File

@@ -1,11 +1,11 @@
var minisrv_service_file = true;
ssid_sessions[socket.ssid].loadSessionData();
session_data.loadSessionData();
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;
// security
if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_id != request_headers.query.user_id) {
if (session_data.user_id != 0 && session_data.user_id != request_headers.query.user_id) {
user_id = null; // force unset
var errpage = wtvshared.doErrorPage(400, "You are not authorized to change the selected user's password.");
headers = errpage[0];
@@ -14,7 +14,7 @@ if (ssid_sessions[socket.ssid].user_id != 0 && ssid_sessions[socket.ssid].user_i
if (user_id != null) {
var userSession = null;
if (ssid_sessions[socket.ssid].user_id == request_headers.query.user_id) userSession = ssid_sessions[socket.ssid];
if (session_data.user_id == request_headers.query.user_id) userSession = session_data;
else {
userSession = new WTVClientSessionData(minisrv_config, socket.ssid);
userSession.user_id = user_id;

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/get-playlist.js
View File

@@ -1,7 +1,5 @@
var minisrv_service_file = true;
var WTVBGMusic = require("./WTVBGMusic.js");
var wtvbgm = new WTVBGMusic(minisrv_config, ssid_sessions[socket.ssid])
var music_obj = wtvbgm.getMusicObj();
headers = `

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/get.js
View File

@@ -1,6 +1,6 @@
var minisrv_service_file = true;
if (ssid_sessions[socket.ssid].lockdown) {
if (session_data.lockdown) {
headers = `200 OK
wtv-printer-model: -1,-1
wtv-printer-pen: 0,0,1,0
@@ -10,7 +10,7 @@ Content-Type: text/html`;
data = "";
} else {
var settings_obj = ssid_sessions[socket.ssid].getSessionData("wtv-setup");
var settings_obj = session_data.getSessionData("wtv-setup");
if (settings_obj === null) settings_obj = {};
settings_obj["from-server"] = 1;

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/keyboard.js
View File

@@ -1,6 +1,6 @@
var minisrv_service_file = true;
var settings_obj = ssid_sessions[socket.ssid].getSessionData("wtv-setup");
var settings_obj = session_data.getSessionData("wtv-setup");
if (settings_obj === null) settings_obj = {};
headers = `200 OK

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/mail-signature.js
View File

@@ -84,7 +84,7 @@ cols=45 rows=5
autoactivate
nosoftbreaks
maxlength=4096
font=proportional>${ssid_sessions[socket.ssid].getSessionData("subscriber_signature") || ""}</TEXTAREA></FORM></TD>
font=proportional>${session_data.getSessionData("subscriber_signature") || ""}</TEXTAREA></FORM></TD>
</FORM>
<TR>
<TD>

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/messenger-account.js
View File

@@ -69,7 +69,7 @@ the next time you connect to WebTV.
<tr>
<td align=left>
User Name<form action=validate-messenger-account>
<INPUT noSubmit name="email" id="email" Value="${ssid_sessions[socket.ssid].getSessionData("messenger_email")}"
<INPUT noSubmit name="email" id="email" Value="${session_data.getSessionData("messenger_email")}"
bgcolor=#444444 text=#ffdd33 cursor=#cc9933
TYPE="input" ASCIIONLY
SIZE="16"

10
zefie_wtvp_minisrv/ServiceVault/wtv-setup/messenger-enable.js
View File

@@ -1,13 +1,13 @@
var minisrv_service_file = true;
if (!ssid_sessions[socket.ssid].getSessionData("messenger_enabled") == 1) {
ssid_sessions[socket.ssid].setSessionData("messenger_enabled", 1);
ssid_sessions[socket.ssid].saveSessionData;
if (!session_data.getSessionData("messenger_enabled") == 1) {
session_data.setSessionData("messenger_enabled", 1);
session_data.saveSessionData;
var justenabled = "true"
var enablestatus = "1"
} else {
ssid_sessions[socket.ssid].setSessionData("messenger_enabled", 0);
ssid_sessions[socket.ssid].saveSessionData;
session_data.setSessionData("messenger_enabled", 0);
session_data.saveSessionData;
var justenabled = "false"
var enablestatus = "0"
}

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/messenger.js
View File

@@ -69,7 +69,7 @@ Messenger
<tr>
<td absheight=195 valign=top>
Messenger is currently <b>`;
if (ssid_sessions[socket.ssid].getSessionData("messenger_enabled") == 1) {
if (session_data.getSessionData("messenger_enabled") == 1) {
data += "on"
} else {
data += "off"
@@ -81,7 +81,7 @@ if (ssid_sessions[socket.ssid].getSessionData("messenger_enabled") == 1) {
<tr>
<td align=left>
<a href="messenger-enable">Turn messenger `;
if (!ssid_sessions[socket.ssid].getSessionData("messenger_enabled") == 1) {
if (!session_data.getSessionData("messenger_enabled") == 1) {
data += "on"
} else {
data += "off"

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/phone.js
View File

@@ -82,7 +82,7 @@ Dialing options
<A HREF="wtv-setup:/phone-call-waiting"><BLACKFACE>Call waiting</BLACKFACE></A><BR>
<FONT SIZE="-1">Call waiting can be turned off automatically</FONT><BR>
<spacer type=block WIDTH=1 HEIGHT=12><BR>
<A HREF="${ssid_sessions[socket.ssid].get("wtv-open-access") ? 'file://rom/HTMLs/ConfigureBYOISP.html' : 'client:GoToBYOISPIntro'}"><BLACKFACE>Use an ISP</BLACKFACE></A><BR>
<A HREF="${session_data.get("wtv-open-access") ? 'file://rom/HTMLs/ConfigureBYOISP.html' : 'client:GoToBYOISPIntro'}"><BLACKFACE>Use an ISP</BLACKFACE></A><BR>
<FONT SIZE="-1">Save money if you dial long distance to WebTV</FONT><BR>
<TD WIDTH=20>

8
zefie_wtvp_minisrv/ServiceVault/wtv-setup/remove-users.js
View File

@@ -1,10 +1,10 @@
var minisrv_service_file = true;
var errpage;
if (Object.keys(ssid_sessions[socket.ssid].listPrimaryAccountUsers()).length == 1) {
if (Object.keys(session_data.listPrimaryAccountUsers()).length == 1) {
errpage = wtvshared.doErrorPage(400, "There are no more users to remove.");
}
else if (ssid_sessions[socket.ssid].user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
else if (session_data.user_id != 0) errpage = wtvshared.doErrorPage(400, "You are not authorized to add users to this account.");
if (errpage) {
headers = errpage[0];
data = errpage[1];
@@ -95,9 +95,9 @@ noscroll>
<P><FORM ACTION="wtv-setup:/validate-remove-users" METHOD="POST">
`;
var accounts = ssid_sessions[socket.ssid].listPrimaryAccountUsers();
var accounts = session_data.listPrimaryAccountUsers();
var num_accounts = ssid_sessions[socket.ssid].getNumberOfUserAccounts();
var num_accounts = session_data.getNumberOfUserAccounts();
if (num_accounts > 1) {
delete accounts.subscriber;
for (const [key, value] of Object.entries(accounts)) {

4
zefie_wtvp_minisrv/ServiceVault/wtv-setup/reset-musicobj.js
View File

@@ -1,8 +1,8 @@
var minisrv_service_file = true;
var music_obj = {};
ssid_sessions[socket.ssid].setSessionData("wtv-bgmusic", music_obj);
ssid_sessions[socket.ssid].saveSessionData();
session_data.setSessionData("wtv-bgmusic", music_obj);
session_data.saveSessionData();
headers = `300 OK
Location: wtv-setup:/choose-bg-songs
wtv-backgroundmusic-load-playlist: wtv-setup:/get-playlist`;

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/screen.js
View File

@@ -75,7 +75,7 @@ Television
<FONT SIZE="-1">Center WebTV on your screen</FONT><BR>`;
// old classic apparently can do Screen Border
if (ssid_sessions[socket.ssid].get("wtv-client-rom-type") == "bf0app") {
if (session_data.get("wtv-client-rom-type") == "bf0app") {
data += `<spacer type=block width=1 height=5><BR>
<A HREF="wtv-setup:/screen-border" selected><BLACKFACE>Border</BLACKFACE></A><BR>
<FONT SIZE="-1">Change the color of the screen border</FONT><BR>`;

2
zefie_wtvp_minisrv/ServiceVault/wtv-setup/set-bg.js
View File

@@ -1,7 +1,5 @@
var minisrv_service_file = true;
var WTVBGMusic = require("./WTVBGMusic.js");
var wtvbgm = new WTVBGMusic(minisrv_config, ssid_sessions[socket.ssid]);
if (request_headers.query.category) {
var musicList = wtvbgm.getCategorySongList(request_headers.query.category);
var categoryName = wtvbgm.getCategoryName(request_headers.query.category);

8
zefie_wtvp_minisrv/ServiceVault/wtv-setup/set.js
View File

@@ -1,14 +1,14 @@
var minisrv_service_file = true;
if (request_headers.query && ssid_sessions[socket.ssid]) {
var settings_obj = ssid_sessions[socket.ssid].getSessionData("wtv-setup");
if (request_headers.query && session_data) {
var settings_obj = session_data.getSessionData("wtv-setup");
if (settings_obj === null) settings_obj = {};
Object.keys(request_headers.query).forEach(function (k) {
settings_obj[k] = request_headers.query[k];
});
ssid_sessions[socket.ssid].setSessionData("wtv-setup", Object.assign({}, settings_obj));
ssid_sessions[socket.ssid].saveSessionData();
session_data.setSessionData("wtv-setup", Object.assign({}, settings_obj));
session_data.saveSessionData();
headers = `200 OK
Content-type: text/html`;
} else {

7
zefie_wtvp_minisrv/ServiceVault/wtv-setup/setup.js
View File

@@ -1,5 +1,4 @@
var minisrv_service_file = true;
var { WTVShared, clientShowAlert } = require("./WTVShared.js");
var notImplementedAlert = new clientShowAlert({
'image': minisrv_config.config.service_logo,
@@ -63,7 +62,7 @@ hspace=0 vspace=0
<td valign=center absheight=80>
<shadow><blackface><font color="e7ce4a" font size="+1">
Settings
for ${ssid_sessions[socket.ssid].getSessionData("subscriber_username") || "You"}
for ${session_data.getSessionData("subscriber_username") || "You"}
</font><blackface><shadow>
</table>
<tr>
@@ -117,7 +116,7 @@ data += `
<a href="wtv-setup:/keyboard">Keyboard</a><BR>
<spacer type=block width=1 height=5><BR>`;
if (ssid_sessions[socket.ssid].user_id == 0) {
if (session_data.user_id == 0) {
data += `<img src="ROMCache/BulletArrow.gif" width=6 height=13 valign=absmiddle><spacer type=block width=6 height=1>
<a href="wtv-setup:/accounts">Extra Users</a><BR>
<spacer type=block width=1 height=5><BR>`;
@@ -149,7 +148,7 @@ if (!minisrv_config.config.hide_incomplete_features) {
<spacer type=block width=6 height=5><font size="2"><br>`;
}
data += `Choose an on-screen keyboard<BR>`;
if (ssid_sessions[socket.ssid].user_id == 0) {
if (session_data.user_id == 0) {
data += `<spacer type=block width=6 height=5><font size="2"><br>
Add, change, or remove users<BR>`;
}

Some files were not shown because too many files have changed in this diff Show More