some improvements

This commit is contained in:
zefie
2025-07-20 14:00:32 -04:00
parent 1a8401d015
commit 86c9b3b0e2
9 changed files with 42 additions and 34 deletions

View File

@@ -129,18 +129,34 @@ function StorageWarning() { }
<td colspan=2> <td colspan=2>
<table><tr><td width=20><td width=380> <table><tr><td width=20><td width=380>
<font color=AEBFD1>`; <font color=AEBFD1>`;
if (files.length === 0) {
data += `<font color=AEBFD1>
Your scrapbook is currently empty.
<p>
Storing pictures in your scrapbook makes it easy to add them to your Web pages.
<p>
You can add pictures to your scrapbook from TV, a VCR, a video
camera, an e-mail message, or another Web page.
<p>
Choose <b>Help</b> for instructions.
</font>`;
} else {
if (request_headers.query.addMediaURL) { if (request_headers.query.addMediaURL) {
data += "Choose an image to add to your web page."; data += "Choose an image to add to your web page.";
} else { } else {
data += "Choose one of your saved images to view it full size."; data += "Choose one of your saved images to view it full size.";
} }
}
data += ` data += `
</font> </font>
</table> </table>
<tr><td absheight=10> <tr><td absheight=10>
</table> </table>
<CENTER> <CENTER>
<TABLE cellspacing=0 cellpadding=0 align=center>
`
if (files.length > 0) {
data += `<TABLE cellspacing=0 cellpadding=0 align=center>
<TR height=8> <TR height=8>
<TD width=10 height=8></TD> <TD width=10 height=8></TD>
<TD bgcolor=#8A99B0 width=2 rowspan=7></TD> <TD bgcolor=#8A99B0 width=2 rowspan=7></TD>
@@ -156,18 +172,11 @@ data += `
<TR height=2> <TR height=2>
<TD bgcolor=#8A99B0 height=2 colspan=7></TD> <TD bgcolor=#8A99B0 height=2 colspan=7></TD>
</TR> </TR>
<TR height=10> <TR height=10><TD absheight=10 width=10 valign=top background=wtv-author:/ROMCache/vert_line.gif>
<TD absheight=10 width=10 valign=top background=wtv-author:/ROMCache/vert_line.gif>
<IMG src=wtv-author:/ROMCache/up_arrow.gif> </TD> <IMG src=wtv-author:/ROMCache/up_arrow.gif> </TD>
<TD colspan=3 rowspan=3 align=center> <TD colspan=3 rowspan=3 align=center>
<table cellspacing=24 cellpadding=1 width=372 background="/ROMCache/light_blue_tile.gif"> <table cellspacing=24 cellpadding=1 width=372 background="/ROMCache/light_blue_tile.gif">
<tr> <tr>`
`
if (files.length === 0) {
data += `<td align=center valign=middle colspan=4>
<font color=AEBFD1 size=+1><blackface> Your scrapbook is empty. </blackface></font>
</td>`;
} else {
for (let i = start; i < Math.min(files.length, start + 12); i++) { for (let i = start; i < Math.min(files.length, start + 12); i++) {
url = "wtv-tricks:/view-scrapbook-image?id=" + files[i]; url = "wtv-tricks:/view-scrapbook-image?id=" + files[i];
if (request_headers.query.addMediaURL) { if (request_headers.query.addMediaURL) {
@@ -180,10 +189,7 @@ data += `
</a> </a>
</td> </td>
${i % 4 === 1 ? '</tr><tr>' : ''}` ${i % 4 === 1 ? '</tr><tr>' : ''}`
} data += `</table>
}
data += `
</table>
</TD> </TD>
</TR> </TR>
<TR> <TR>
@@ -200,6 +206,10 @@ data += `
<TD height=8></TD> <TD height=8></TD>
</TR> </TR>
</TABLE> </TABLE>
`
}
}
data += `
</CENTER> </CENTER>
</table> </table>
</BODY> </BODY>

View File

@@ -5,6 +5,12 @@ Content-type: text/html
wtv-expire-all: wtv-flashrom: wtv-expire-all: wtv-flashrom:
minisrv-no-mail-count: true` 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 = `<html> data = `<html>
<head> <head>

View File

@@ -68,7 +68,7 @@ switch (wtvshared.getManufacturer(session_data.ssid, true)) {
data += `Call RCA/Thomson customer service at 1-800-722-9599.`; data += `Call RCA/Thomson customer service at 1-800-722-9599.`;
break; break;
case "AE": 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; break;
default: default:
data += `Contact the manufacturer's customer service department.` data += `Contact the manufacturer's customer service department.`

View File

@@ -8,6 +8,4 @@ var transferCanceled = new clientShowAlert({
'buttonaction1': "wtv-head-waiter:/login", 'buttonaction1': "wtv-head-waiter:/login",
'noback': true, 'noback': true,
}).getURL(); }).getURL();
var errpage = wtvshared.doRedirect(transferCanceled); var [headers, data] = wtvshared.doRedirect(transferCanceled);
var headers = errpage[0];
var data = errpage[1];

View File

@@ -19,6 +19,4 @@ if (result) {
}).getURL(); }).getURL();
} }
var errpage = wtvshared.doRedirect(transferCanceled); var [headers, data] = wtvshared.doRedirect(transferCanceled);
var headers = errpage[0];
var data = errpage[1];

View File

@@ -39,9 +39,7 @@ else {
if (request_headers.query.skip_splash) gourl = "wtv-home:/home?"; if (request_headers.query.skip_splash) gourl = "wtv-home:/home?";
else gourl = "wtv-home:/splash?"; else gourl = "wtv-home:/splash?";
} else if (!session_data.getSessionData("registered")) { } else if (!session_data.getSessionData("registered")) {
var errpage = wtvshared.doErrorPage(400); var [headers, data] = wtvshared.doErrorPage(400);
headers = errpage[0];
data = errpage[1];
} else { } else {
var userid = session_data.getSessionData("subscriber_userid") var userid = session_data.getSessionData("subscriber_userid")
var nickname = session_data.getSessionData("subscriber_username"); var nickname = session_data.getSessionData("subscriber_username");

View File

@@ -1,10 +1,6 @@
var minisrv_service_file = true; 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-need-upgrade")
ssid_sessions[socket.ssid].delete("wtv-") ssid_sessions[socket.ssid].delete("wtv-used-8675309")
errpage = wtvshared.doRedirect("wtv-home:/home") [headers, data] = wtvshared.doRedirect("wtv-home:/home");
headers = errpage[0];
data = errpage[1];

View File

@@ -288,7 +288,7 @@ class WTVShared {
a: ['href', 'name', 'target'], a: ['href', 'name', 'target'],
audioscope: ['align', 'bgcolor', 'border', 'gain', 'height', 'leftcolor', 'leftoffset', 'maxlevel', 'rightcolor', 'rightoffset', 'width' ], audioscope: ['align', 'bgcolor', 'border', 'gain', 'height', 'leftcolor', 'leftoffset', 'maxlevel', 'rightcolor', 'rightoffset', 'width' ],
bgsound: ['src', 'loop'], bgsound: ['src', 'loop'],
img: ['src', 'alt', 'title', 'width', 'height', 'loading'], img: ['src', 'alt', 'title', 'width', 'height', 'loading'], // ?? What is 'loading'?
font: ['size', 'name', 'color'], font: ['size', 'name', 'color'],
marquee: ['aign', 'behavior', 'direction', 'height', 'hspace', 'loop', 'scrollamount', 'scrolldelay', 'transparency', 'vspace', 'width'], marquee: ['aign', 'behavior', 'direction', 'height', 'hspace', 'loop', 'scrollamount', 'scrolldelay', 'transparency', 'vspace', 'width'],
}, },

View File

@@ -1,6 +1,8 @@
const WTVLzpf = require("./includes/classes/WTVLzpf.js") const WTVLzpf = require("./includes/classes/WTVLzpf.js")
const lzpf = new WTVLzpf(); const lzpf = new WTVLzpf();
// Test with a simple string // Test with a simple string
const testString = "This is a test string to compress and decompress"; const testString = "This is a test string to compress and decompress";
const compressed = lzpf.Compress(testString); const compressed = lzpf.Compress(testString);