diff --git a/README.md b/README.md index 0a184bcd..691d6364 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ This open source server is in beta status. Use at your own risk. - ~~No intentions to support user accounts, registration, or any form of database system~~ *(I guess this was a lie, but we still don't use a database!)* ### Feature Todo: -- wtv-setup and bgm support - TellyScript generation and/or manipulation without external dependancies +- ~~wtv-setup and bgm support~~ ***Done [v0.9.23](https://github.com/zefie/zefie_wtvp_minisrv/releases/tag/v0.9.23)*** - ~~wtv-cookie full support~~ ***Done [v0.9.13](https://github.com/zefie/zefie_wtvp_minisrv/releases/tag/v0.9.13)*** - ~~Flashrom flashing for bf0app old classic~~ ***Done [v0.9.9](https://github.com/zefie/zefie_wtvp_minisrv/releases/tag/v0.9.9)*** - ~~SSID/IP black/whitelisting (including tying SSID to an IP or multiple IPs)~~ ***Done [v0.9.4](https://github.com/zefie/zefie_wtvp_minisrv/releases/tag/v0.9.4)*** diff --git a/zefie_wtvp_minisrv/ServiceDeps/TOS.html b/zefie_wtvp_minisrv/ServiceDeps/TOS.html new file mode 100644 index 00000000..60aa8e72 --- /dev/null +++ b/zefie_wtvp_minisrv/ServiceDeps/TOS.html @@ -0,0 +1,92 @@ + + + +Access Denied + + + + + + + + + + + + + + +
+ + + + + + + + +
+Access Denied + + + +
+ +
+ + + + + + + + + + + +
+
+ + +You are not authorized to use this service.

Reason: ${REASON} +

+ + + +
+ + +
+ + + +
+ + +
+ + + + +
+ + + + + + + + +
+		 +
+ + \ No newline at end of file diff --git a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js index fc5cb153..03168b7a 100644 --- a/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js +++ b/zefie_wtvp_minisrv/ServiceVault/wtv-flashrom/get-lc2-page.js @@ -9,19 +9,23 @@ if (!request_headers.query.path) { headers = errpage[0]; data = errpage[1]; } else { - var wtvflashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, false, true); + var wtvflashrom = new WTVFlashrom(minisrv_config, service_vaults, service_name, minisrv_config.services[service_name].use_zefie_server, false, (minisrv_config.services[service_name].debug ? false : true)); var request_path = request_headers.query.path; // read flashrom header info into array using WTVFlashrom class wtvflashrom.getFlashromMeta(request_path, function (data) { - processLC2DownloadPage(request_headers.query.path, data, (request_headers.query.numparts || null)); + processLC2DownloadPage(request_headers.query.path, data, (request_headers.query.numparts ? request_headers.query.numparts : null)); }); } async function processLC2DownloadPage(path, flashrom_info, numparts = null) { if (numparts != null) flashrom_info.part_count = parseInt(numparts); if (!flashrom_info.part_count) flashrom_info.part_count = parseInt(flashrom_info.message.substring(flashrom_info.message.length - 4).replace(/\D/g, '')); - if (!flashrom_info.part_number || !flashrom_info.is_last_part || !flashrom_info.rompath || !flashrom_info.next_rompath || !flashrom_info.is_bootrom) { + console.log(flashrom_info); + if (parseInt(flashrom_info.part_number) >= 0 && flashrom_info.rompath && flashrom_info.next_rompath) { + if (!flashrom_info.message && flashrom_info.is_bootrom) { + flashrom_info.message = "BootRom Part " + (flashrom_info.part_number + 1) + " of " + flashrom_info.part_count; + } if (!flashrom_info.is_last_part) { flashrom_info.next_rompath = request_headers.request_url.replace(escape(request_headers.query.path), escape(flashrom_info.next_rompath.replace(service_name+":/",""))); } @@ -80,7 +84,7 @@ Your WebTV Unit is being
updated automatically.

This will take a while, and
then you can use your WebTV again. `; - if (flashrom_info.is_bootrom && flashrom_info.part_number == 16) { + if (flashrom_info.is_bootrom && flashrom_info.part_number == (flashrom_info.part_count - 1)) { data += `

The system will pause for about 30 seconds at the end of this update. Please do not interrupt the system @@ -90,7 +94,7 @@ This will take a while, and
then you can use your WebTV again. data += `




- -Welcome to ${z_title}`; +Welcome to ${minisrv_config.config.service_name}`; if (ssid_sessions[socket.ssid].getSessionData("registered")) data += ", " + ssid_sessions[socket.ssid].getSessionData("subscriber_username") + "!"; -data += "
"; -if (minisrv_config.config.git_commit) data += `

git revision ${minisrv_config.config.git_commit}

`; +data += `
+
+ +minisrv v${minisrv_config.version}${(minisrv_config.config.git_commit) ? ' git-'+minisrv_config.config.git_commit : ''}, hosted by ${minisrv_config.config.service_owner}

-data += `
Status: ${cryptstatus} (${compstatus})
Connection Speed: &rate; @@ -45,7 +46,7 @@ data += `