update: actually fix wtv-1800:/preregister and include tellyscripts
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -46,7 +46,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
|
|||||||
var send_tellyscripts = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin);
|
var send_tellyscripts = (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 wtv_script_id = parseInt(ssid_sessions[socket.ssid].get("wtv-script-id"));
|
||||||
var bootrom = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version");
|
var bootrom = ssid_sessions[socket.ssid].get("wtv-client-bootrom-version");
|
||||||
if (request_headers.query.relogin && wtv_script_id != 0) send_tellyscript = false;
|
if (request_headers.query.relogin && wtv_script_id != 0) send_tellyscripts = false;
|
||||||
if (send_tellyscripts) {
|
if (send_tellyscripts) {
|
||||||
if (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist) {
|
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)
|
var send_telly_to_ssid = (minisrv_config.services[service_name].send_tellyscript_ssid_whitelist.findIndex(element => element == socket.ssid) != -1)
|
||||||
@@ -132,7 +132,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
|
|||||||
request_is_async = true;
|
request_is_async = true;
|
||||||
fs.readFile(file_path, null, function (err, file_read_data) {
|
fs.readFile(file_path, null, function (err, file_read_data) {
|
||||||
if (err) {
|
if (err) {
|
||||||
var errmsg = doErrorCode(400);
|
var errmsg = doErrorPage(400);
|
||||||
headers = errmsg[0];
|
headers = errmsg[0];
|
||||||
file_read_data = errmsg[1] + "\n" + err.toString();
|
file_read_data = errmsg[1] + "\n" + err.toString();
|
||||||
}
|
}
|
||||||
@@ -140,7 +140,7 @@ if (ssid_sessions[socket.ssid].data_store.wtvsec_login) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
var errpage = doErrorCode(400);
|
var errpage = doErrorPage(400);
|
||||||
headers = errpage[0];
|
headers = errpage[0];
|
||||||
data = errpage[1];
|
data = errpage[1];
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user