diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js index d3451778..af667565 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js @@ -129,10 +129,23 @@ function StorageWarning() { }
`; -if (request_headers.query.addMediaURL) { - data += "Choose an image to add to your web page."; +if (files.length === 0) { + data += ` +Your scrapbook is currently empty. +

+Storing pictures in your scrapbook makes it easy to add them to your Web pages. +

+You can add pictures to your scrapbook from TV, a VCR, a video +camera, an e-mail message, or another Web page. +

+Choose Help for instructions. +`; } else { - data += "Choose one of your saved images to view it full size."; + if (request_headers.query.addMediaURL) { + data += "Choose an image to add to your web page."; + } else { + data += "Choose one of your saved images to view it full size."; + } } data += ` @@ -140,7 +153,10 @@ data += `

- + +` +if (files.length > 0) { + data += `
@@ -156,18 +172,11 @@ data += ` - -
+
- -` -if (files.length === 0) { - data += ``; -} else { +` for (let i = start; i < Math.min(files.length, start + 12); i++) { url = "wtv-tricks:/view-scrapbook-image?id=" + files[i]; if (request_headers.query.addMediaURL) { @@ -180,10 +189,7 @@ data += ` ${i % 4 === 1 ? '' : ''}` -} -} -data += ` -
- Your scrapbook is empty. -
+data += `
@@ -200,6 +206,10 @@ data += ` +` +} +} +data += `
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/lc2-download-complete.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/lc2-download-complete.js index 7086920e..98520248 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/lc2-download-complete.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/lc2-download-complete.js @@ -5,6 +5,12 @@ Content-type: text/html wtv-expire-all: wtv-flashrom: minisrv-no-mail-count: true` +if (socket.ssid && ssid_sessions[socket.ssid]) { + // Clear minibrowser flags, if set. Should prevent the service thinking the box is still in minibrowser mode after the update. + ssid_sessions[socket.ssid].delete("wtv-need-upgrade") + ssid_sessions[socket.ssid].delete("wtv-used-8675309") +} + data = ` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js index bb7bc00c..87f1b4b0 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/bad-disk.js @@ -68,7 +68,7 @@ switch (wtvshared.getManufacturer(session_data.ssid, true)) { data += `Call RCA/Thomson customer service at 1-800-722-9599.`; break; case "AE": - data += `Contact zefie or MattMan on Discord (zefie#0573 or MattMan#2790)` + data += `Contact zefie or MattMan on Discord (zefie or mattman69)` break; default: data += `Contact the manufacturer's customer service department.` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/cancel-account-transfer.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/cancel-account-transfer.js index 9fa89215..09bddaaa 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/cancel-account-transfer.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/cancel-account-transfer.js @@ -8,6 +8,4 @@ var transferCanceled = new clientShowAlert({ 'buttonaction1': "wtv-head-waiter:/login", 'noback': true, }).getURL(); -var errpage = wtvshared.doRedirect(transferCanceled); -var headers = errpage[0]; -var data = errpage[1]; \ No newline at end of file +var [headers, data] = wtvshared.doRedirect(transferCanceled); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/complete-account-transfer.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/complete-account-transfer.js index b4cc780a..013af63a 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/complete-account-transfer.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/complete-account-transfer.js @@ -19,6 +19,4 @@ if (result) { }).getURL(); } -var errpage = wtvshared.doRedirect(transferCanceled); -var headers = errpage[0]; -var data = errpage[1]; \ No newline at end of file +var [headers, data] = wtvshared.doRedirect(transferCanceled); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js index 47497770..88f16e1c 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/login-stage-two.js @@ -39,9 +39,7 @@ else { if (request_headers.query.skip_splash) gourl = "wtv-home:/home?"; else gourl = "wtv-home:/splash?"; } else if (!session_data.getSessionData("registered")) { - var errpage = wtvshared.doErrorPage(400); - headers = errpage[0]; - data = errpage[1]; + var [headers, data] = wtvshared.doErrorPage(400); } else { var userid = session_data.getSessionData("subscriber_userid") var nickname = session_data.getSessionData("subscriber_username"); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/no-mini.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/no-mini.js index 31d277b2..5d34f25e 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/no-mini.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-head-waiter/no-mini.js @@ -1,10 +1,6 @@ var minisrv_service_file = true; -// remove restrictions once this page is shown, since the user will be 'trapped' anyway -session_data.disableLockdown(); ssid_sessions[socket.ssid].delete("wtv-need-upgrade") -ssid_sessions[socket.ssid].delete("wtv-") +ssid_sessions[socket.ssid].delete("wtv-used-8675309") -errpage = wtvshared.doRedirect("wtv-home:/home") -headers = errpage[0]; -data = errpage[1]; \ No newline at end of file +[headers, data] = wtvshared.doRedirect("wtv-home:/home"); diff --git a/zefie_wtvp_minisrv/includes/classes/WTVShared.js b/zefie_wtvp_minisrv/includes/classes/WTVShared.js index ee9d5122..103133bb 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVShared.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVShared.js @@ -288,7 +288,7 @@ class WTVShared { a: ['href', 'name', 'target'], audioscope: ['align', 'bgcolor', 'border', 'gain', 'height', 'leftcolor', 'leftoffset', 'maxlevel', 'rightcolor', 'rightoffset', 'width' ], bgsound: ['src', 'loop'], - img: ['src', 'alt', 'title', 'width', 'height', 'loading'], + img: ['src', 'alt', 'title', 'width', 'height', 'loading'], // ?? What is 'loading'? font: ['size', 'name', 'color'], marquee: ['aign', 'behavior', 'direction', 'height', 'hspace', 'loop', 'scrollamount', 'scrolldelay', 'transparency', 'vspace', 'width'], }, diff --git a/zefie_wtvp_minisrv/test_lzpf.js b/zefie_wtvp_minisrv/test_lzpf.js index 71929903..4b8b9c5b 100644 --- a/zefie_wtvp_minisrv/test_lzpf.js +++ b/zefie_wtvp_minisrv/test_lzpf.js @@ -1,6 +1,8 @@ const WTVLzpf = require("./includes/classes/WTVLzpf.js") const lzpf = new WTVLzpf(); + + // Test with a simple string const testString = "This is a test string to compress and decompress"; const compressed = lzpf.Compress(testString);