v0.9.54 combined merge from dev
* initial (very incomplete) work on PC Services Admin (eg csops) * primitive account listing * add ban/unban/delete functionality * fix wtv-tricks theme * fix wtv-tricks theme (cSetup) * better tricks code * fix session_data.getTicketData() * speedtest and other tricks stuff * better protection against direct access to finished url * dependancies update (run `npm update`) * Bump path-to-regexp and express in /zefie_wtvp_minisrv (#29) Bumps [path-to-regexp](https://github.com/pillarjs/path-to-regexp) to 0.1.12 and updates ancestor dependency [express](https://github.com/expressjs/express). These dependencies need to be updated together. Updates `path-to-regexp` from 0.1.10 to 0.1.12 - [Release notes](https://github.com/pillarjs/path-to-regexp/releases) - [Changelog](https://github.com/pillarjs/path-to-regexp/blob/master/History.md) - [Commits](https://github.com/pillarjs/path-to-regexp/compare/v0.1.10...v0.1.12) Updates `express` from 4.21.1 to 4.21.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/4.21.2/History.md) - [Commits](https://github.com/expressjs/express/compare/4.21.1...4.21.2) --- updated-dependencies: - dependency-name: path-to-regexp dependency-type: indirect - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix up path functions * force version 1.2.1 of newsie due to breaking change * remove debug log print for usenet * fix account directory was broken due to previous changes * fix wtv-home:/home was hiding options bar * bump to 0.9.54 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
zefie
@@ -37,174 +37,42 @@ function load() {
|
||||
headers = `200 OK
|
||||
Content-Type: text/html`
|
||||
|
||||
data = `<html>
|
||||
<head>
|
||||
<title>Connect Setup v2.2-minisrv</title>
|
||||
<DISPLAY noscroll notvaudio switchtowebmode>
|
||||
</head>
|
||||
<body bgcolor="#3C2F47" text="#cbcbcb" link="#aaaaaa"
|
||||
hspace="0" vspace="0" fontsize="large" noscroll>
|
||||
|
||||
<table cellspacing="0" cellpadding="0" cellborder="0">
|
||||
<tr>
|
||||
<td width="104" height="80" valign="top" align="left"><spacer type="block" WIDTH="11" HEIGHT="11"><br>
|
||||
<spacer type="block" WIDTH="10" HEIGHT="1"> <a href="wtv-home:/home"><img src="${minisrv_config.config.service_logo}" width="87"
|
||||
height="67"></a>
|
||||
</td>
|
||||
<td width="456" height="80" valign="middle" align="center">
|
||||
<br><h2>
|
||||
Connection Setup v2.2-minisrv
|
||||
</h2>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td colspan=4><hr>
|
||||
<tr><td absheight=6>
|
||||
data = `<html><head><display nooptions noscroll allowoffline notvaudio switchtowebmode nosend>
|
||||
<script src=/ROMCache/h.js></script><script src=/ROMCache/n.js></script>
|
||||
<script src=htv-cSetup.js></script>
|
||||
</head><form name=t><input type=hidden name=h value=&pname;></form>
|
||||
<script>head('Connect Setup v2.6');
|
||||
window.onload=uS;
|
||||
</script><form name=c action=client:ConfirmConnectSetup>
|
||||
<table width=100% cellspacing=1 cellpadding=0>
|
||||
<tr><td height=18>
|
||||
<tr><td colspan=3> Server:</td>
|
||||
<td><select width=420 name=p onchange=uS() selected>
|
||||
<option value=htv>MattMan's (HTV) MiniSrv</option>
|
||||
<option value=htvb>MattMan's (HTV) MiniSrv Backup</option>
|
||||
<option value=mm69>MattMan's Revival Srv.</option>
|
||||
<option value=zef>zefie's MiniSrv</option>
|
||||
<option value=jar>WebTV Redialed</option>
|
||||
<option value=zlan>zefie LAN (.8)</option>
|
||||
<option value=zlan2>zefie LAN (.95)</option>
|
||||
<option value=other>Other</option>
|
||||
</select></table>
|
||||
<table width=100% cellspacing=1 cellpadding=0>
|
||||
<tr><td height=18>
|
||||
<tr><td><input name=serviceType type=hidden value=custom>
|
||||
Address: <input size=21 asciionly name=machine value="" bgcolor=191919 text=c6c6c6 cursor=cc9933>
|
||||
Port:<input size=5 asciionly numbers name=port value="" bgcolor=191919 text=c6c6c6 cursor=cc9933>
|
||||
</table>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
|
||||
function doConnect() {
|
||||
if (document.connect.machine.value == "${minisrv_config.services['wtv-1800'].host}" && document.connect.port.value == "${minisrv_config.services['wtv-1800'].port}") {
|
||||
alert("You are already here!");
|
||||
} else {
|
||||
document.connect.submit();
|
||||
}
|
||||
}
|
||||
|
||||
function setOther() {
|
||||
count = document.connect.preset.length;
|
||||
document.connect.preset.selectedIndex = count - 1;
|
||||
setTimeout(updateService,10);
|
||||
}
|
||||
function updateService() {
|
||||
srv = document.connect.preset[document.connect.preset.selectedIndex].value;
|
||||
switch (srv) {
|
||||
case "mattman69":
|
||||
document.connect.machine.value="71.244.121.234"
|
||||
document.connect.port.value="1615"
|
||||
document.message.msg.value="This is MattMan69's Public HackTV minisrv, all are welcome to connect and enjoy the wonders of WebTV. Offers a custom experience."
|
||||
break;
|
||||
case "mm69bak":
|
||||
document.connect.machine.value="71.244.121.234"
|
||||
document.connect.port.value="1415"
|
||||
document.message.msg.value="This is the public HackTV minisrv backup, only available when the main HackTV server is down."
|
||||
break;
|
||||
case "mm69pri":
|
||||
document.connect.machine.value="71.244.121.234"
|
||||
document.connect.port.value="1515"
|
||||
document.message.msg.value="This is MattMan's normally private WebTV server. It's the real deal, not minisrv! May be up from time to time."
|
||||
break;
|
||||
case "redialed":
|
||||
document.connect.machine.value="217.160.150.209"
|
||||
document.connect.port.value="1615"
|
||||
document.message.msg.value="WebTV Redialed, a server designed to replicate the original WebTV service."
|
||||
break
|
||||
case "zefie":
|
||||
document.connect.machine.value="38.175.202.142"
|
||||
document.connect.port.value="1615"
|
||||
document.message.msg.value="This is zefie's public minisrv, for those who want the vanilla minisrv experience."
|
||||
break
|
||||
case "local":
|
||||
document.connect.machine.value="127.0.0.1"
|
||||
document.connect.port.value="1615"
|
||||
document.message.msg.value="Connect to your server via localhost. Localhost refers to the computer that you are on that is running your server."
|
||||
break;
|
||||
case "other":
|
||||
document.message.msg.value="Your custom service."
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<form name="connect" action="wtv-tricks:/cSetup">
|
||||
<table width=100% cellspacing=1 cellpadding=0>
|
||||
<tr>
|
||||
<td colspan=3>
|
||||
<font color=#4489a8>Presets:</font>
|
||||
</td>
|
||||
<td><spacer W=24 type=block>
|
||||
<select width="440" name="preset" onchange="updateService()" selected>
|
||||
<option value="mattman69" selected>MattMan's (HTV) MiniSrv - Public</option>
|
||||
<option value="mm69bak">MattMan's (HTV) MiniSrv - Bakup</option>
|
||||
<option value="mm69pri">MattMan's Revival Server</option>
|
||||
<option value="redialed">WebTV Redialed</option>
|
||||
<option value="zefie">Zefie's MiniSrv - Public</option>
|
||||
<option value="local">Localhost - Your Server</option>
|
||||
<option value="other">Other</option>
|
||||
</select>
|
||||
<tr><td absheight=6>
|
||||
</table>
|
||||
<hr>
|
||||
<table width=100% cellspacing=1 cellpadding=0>
|
||||
<tr>
|
||||
<td height=6>
|
||||
<tr>
|
||||
<td colspan=3>
|
||||
<font color=#4489a8>Service:</font>
|
||||
<tr>
|
||||
<td width=15></td>
|
||||
<td height=2>
|
||||
<tr>
|
||||
<td height=2>
|
||||
<tr>
|
||||
<td>
|
||||
<td>
|
||||
<input name=serviceType type=radio bgcolor=#444444 value=custom checked>
|
||||
<td>
|
||||
Custom:
|
||||
<td>
|
||||
Address:
|
||||
<input size=16 ASCIIONLY name=machine bgcolor=#444444 text=#cbcbcb cursor=#cc9933 value="71.244.121.234" onkeypress="setOther()">
|
||||
Port:
|
||||
<input size=5 ASCIIONLY NUMBERS name=port bgcolor=#444444 text=#cbcbcb cursor=#cc9933 value="1615" onkeypress="setOther()">
|
||||
</table>
|
||||
|
||||
<spacer type=block height="8">
|
||||
<hr>
|
||||
<table cellspacing=1 cellpadding=0>
|
||||
<tr>
|
||||
<td height=8>
|
||||
<tr>
|
||||
<td colspan=3>
|
||||
<font color=#4489a8>Description:</font><br><br>
|
||||
<tr>
|
||||
<td width=20>
|
||||
<td width=390 align=left valign=top>
|
||||
<form name=message>
|
||||
<textarea rows=4 size=46 text=#cbcbcb id=msg name=msg border="0" bgcolor=#3C2F47 value='This is the public HackTV minisrv, all are welcome to connect and enjoy the wonders of WebTV. Custom experience!' nohighlight noselect>
|
||||
</textarea>
|
||||
</form>
|
||||
<td>
|
||||
<td width=100% align=right valign=top>
|
||||
<form action="client:GoToPhoneSetup">
|
||||
<font color="#E7CE4A" size=-2><shadow>
|
||||
<input
|
||||
type=submit
|
||||
borderimage="file://ROM/tvimages/TVButtonBorder.bif"
|
||||
value="Phone Settings"
|
||||
name="Phone Settings"
|
||||
usestyle
|
||||
width=170>
|
||||
</shadow></font>
|
||||
</form>
|
||||
<spacer type=block height="60">
|
||||
<font color="#E7CE4A" size=-2><shadow>
|
||||
<input type=hidden name=useEncryption value=true checked>
|
||||
<input
|
||||
type=button
|
||||
borderimage="file://ROM/tvimages/TVButtonBorder.bif"
|
||||
value="Connect"
|
||||
name="Connect"
|
||||
onclick="doConnect()"
|
||||
usestyle
|
||||
width=170>
|
||||
</shadow></font>
|
||||
|
||||
|
||||
</table>
|
||||
</form>
|
||||
|
||||
</body>
|
||||
</html>`;
|
||||
<spacer type=block height=42><hr><br>
|
||||
<table cellspacing=1 cellpadding=0>
|
||||
<tr><td height=1>
|
||||
<tr><td colspan=2> Info:<br><br><td>
|
||||
<tr><td width=20><td width=300 align=left valign=top>
|
||||
<form name=i><font size=-1><script>ta(6,46,'msg',0,'','nohighlight noselect',1)</script></font></form>
|
||||
<td><td width=100% align=right valign=top>
|
||||
<font size=-2><input type=hidden name=useEncryption value=true><script>butt('Connect','Connect',170);</script></font>
|
||||
</form>
|
||||
<form action=client:gotophonesetup><font size=-2><script>butt( 'Dialing Options', '', 170);</script></font></form>
|
||||
</table>
|
||||
`;
|
||||
}
|
||||
Reference in New Issue
Block a user