diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js index 95167d37..c87548a6 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-1800/preregister.js @@ -62,7 +62,9 @@ if (session_data.data_store.wtvsec_login) { var bootrom = parseInt(session_data.get("wtv-client-bootrom-version")); var send_tellyscript = (minisrv_config.services[service_name].send_tellyscripts && !request_headers.query.relogin && !request_headers.query.guest_login && !bootrom !== 0); var wtv_script_id = parseInt(session_data.get("wtv-script-id")); + var wtv_script_mod = parseInt(session_data.get("wtv-script-mod")); if ((request_headers.query.reconnect || request_headers.query.relogin) && wtv_script_id != 0) send_tellyscript = false; + if (wtv_script_id !== 0 && wtv_script_mod !== 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) diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup.js b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup.js index 86da99ae..42bb9184 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-tricks/cSetup.js @@ -1,15 +1,49 @@ var minisrv_service_file = true; -headers = `200 OK -Content-Type: text/html` - -data = ` +if (request_headers.query.machine && request_headers.query.port) { + headers = `200 OK +Content-Type: text/html +Connection: close +wtv-connection-close: true +wtv-service: reset +wtv-service: name=wtv-1800 host=${request_headers.query.machine} port=${request_headers.query.port} flags=0x00000004 connections=1 +wtv-boot-url: wtv-1800:/preregister +` + data = ` Connect Setup v2.2-minisrv - + +hspace="0" vspace="0" fontsize="large" noscroll hideoptions onload="load()"> +

Connecting...

+Please wait while we connect you to ${request_headers.query.machine}:${request_headers.query.port} ... + + + +`; + +} else { + + headers = `200 OK +Content-Type: text/html` + + data = ` + +Connect Setup v2.2-minisrv + + + @@ -31,18 +65,13 @@ hspace="0" vspace="0" fontsize="large" noscroll hideoptions> - +
@@ -171,4 +200,5 @@ hspace="0" vspace="0" fontsize="large" noscroll hideoptions> -`; \ No newline at end of file +`; +} \ No newline at end of file