move stuff around
This commit is contained in:
@@ -17,10 +17,10 @@ minisrv-no-mail-count: true
|
||||
wtv-initial-key: ` + wtvsec_login.challenge_key.toString(CryptoJS.enc.Base64) + `
|
||||
Content-Type: text/tellyscript
|
||||
wtv-service: reset
|
||||
${getServiceString('wtv-1800')}
|
||||
${getServiceString('wtv-head-waiter')}
|
||||
${getServiceString('wtv-star', { "no_star_word": true })}
|
||||
${getServiceString('wtv-flashrom')}
|
||||
${wtvshared.getServiceString('wtv-1800')}
|
||||
${wtvshared.getServiceString('wtv-head-waiter')}
|
||||
${wtvshared.getServiceString('wtv-star', { "no_star_word": true })}
|
||||
${wtvshared.getServiceString('wtv-flashrom')}
|
||||
wtv-boot-url: wtv-head-waiter:/login?
|
||||
wtv-visit: wtv-head-waiter:/login?
|
||||
wtv-client-time-zone: GMT -0000
|
||||
|
||||
@@ -166,15 +166,15 @@ if (session_data.data_store.wtvsec_login) {
|
||||
headers += "wtv-initial-key: " + session_data.data_store.wtvsec_login.challenge_key.toString(CryptoJS.enc.Base64) + "\n";
|
||||
headers += "Content-Type: " + prereg_contype + "\n";
|
||||
if (!request_headers.query.reconnect) headers += "wtv-service: reset\n";
|
||||
if (!bf0app_update) headers += getServiceString('wtv-1800') + "\n";
|
||||
if (!bf0app_update) headers += wtvshared.getServiceString('wtv-1800') + "\n";
|
||||
|
||||
if (bf0app_update) headers += getServiceString('wtv-head-waiter', { "flags": "0x00000001" }) + "\n";
|
||||
else headers += getServiceString('wtv-head-waiter') + "\n";
|
||||
if (bf0app_update) headers += wtvshared.getServiceString('wtv-head-waiter', { "flags": "0x00000001" }) + "\n";
|
||||
else headers += wtvshared.getServiceString('wtv-head-waiter') + "\n";
|
||||
|
||||
if (bf0app_update) headers += getServiceString('wtv-star', { "no_star_word": true }) + "\n";
|
||||
else headers += getServiceString('wtv-star') + "\n";
|
||||
if (request_headers.query.reconnect && !session_data.isRegistered() && !session_data.lockdown) headers += getServiceString('wtv-register') + "\n";
|
||||
if (!session_data.lockdown) headers += getServiceString('wtv-flashrom') + "\n";
|
||||
if (bf0app_update) headers += wtvshared.getServiceString('wtv-star', { "no_star_word": true }) + "\n";
|
||||
else headers += wtvshared.getServiceString('wtv-star') + "\n";
|
||||
if (request_headers.query.reconnect && !session_data.isRegistered() && !session_data.lockdown) headers += wtvshared.getServiceString('wtv-register') + "\n";
|
||||
if (!session_data.lockdown) headers += wtvshared.getServiceString('wtv-flashrom') + "\n";
|
||||
if (bf0app_update) headers += "wtv-boot-url: " + gourl + "\n";
|
||||
else {
|
||||
headers += "wtv-boot-url: wtv-head-waiter:/login?relogin=true";
|
||||
|
||||
@@ -14,9 +14,9 @@ if (gourl) {
|
||||
// fake logged in for reg
|
||||
session_data.setUserLoggedIn(true);
|
||||
headers += `wtv-encrypted: ${(request_headers['wtv-encrypted']) ? wtvshared.parseBool(request_headers['wtv-encrypted']) : true}
|
||||
${getServiceString('wtv-register')}
|
||||
${getServiceString('wtv-head-waiter')}
|
||||
${getServiceString('wtv-star')}
|
||||
${wtvshared.getServiceString('wtv-register')}
|
||||
${wtvshared.getServiceString('wtv-head-waiter')}
|
||||
${wtvshared.getServiceString('wtv-star')}
|
||||
wtv-boot-url: wtv-head-waiter:/relogin?
|
||||
`
|
||||
}
|
||||
@@ -102,7 +102,7 @@ wtv-expire-all: client:closeallpanels
|
||||
if (!limitedLogin && !limitedLoginRegistered) {
|
||||
session_data.assignMailStore();
|
||||
headers += "wtv-service: reset\n";
|
||||
headers += getServiceString('all', { "exceptions": ["wtv-register"] });
|
||||
headers += wtvshared.getServiceString('all', { "exceptions": ["wtv-register"] });
|
||||
if (offline_user_list) headers += "wtv-offline-user-list: " + offline_user_list + "\n";
|
||||
headers += `wtv-messenger-authorized: ${messenger_authorized}
|
||||
wtv-messenger-enable: ${messenger_enabled}
|
||||
@@ -113,11 +113,11 @@ wtv-messenger-login-url: wtv-passport:/messengerlogin
|
||||
`;
|
||||
} else {
|
||||
/*
|
||||
headers += getServiceString('wtv-1800') + "\n";
|
||||
headers += getServiceString('wtv-head-waiter') + "\n";
|
||||
headers += getServiceString('wtv-log') + "\n";
|
||||
headers += getServiceString('wtv-star') + "\n";
|
||||
headers += getServiceString('wtv-flashrom') + "\n";
|
||||
headers += wtvshared.getServiceString('wtv-1800') + "\n";
|
||||
headers += wtvshared.getServiceString('wtv-head-waiter') + "\n";
|
||||
headers += wtvshared.getServiceString('wtv-log') + "\n";
|
||||
headers += wtvshared.getServiceString('wtv-star') + "\n";
|
||||
headers += wtvshared.getServiceString('wtv-flashrom') + "\n";
|
||||
*/
|
||||
headers += `wtv-messenger-authorized: 0
|
||||
wtv-messenger-enable: 0
|
||||
|
||||
@@ -48,7 +48,7 @@ if (!send_to_relogin) {
|
||||
Connection: Keep-Alive
|
||||
Expires: Wed, 09 Oct 1991 22:00:00 GMT
|
||||
wtv-expire-all: wtv-head-waiter:
|
||||
`+ getServiceString('wtv-log') + `
|
||||
`+ wtvshared.getServiceString('wtv-log') + `
|
||||
wtv-log-url: wtv-log:/log`;
|
||||
if (challenge_header !== "") headers += "\n" + challenge_header;
|
||||
headers += `
|
||||
|
||||
@@ -12,7 +12,7 @@ Expires: Wed, 09 Oct 1991 22:00:00 GMT
|
||||
wtv-expire-all: wtv-head-waiter:
|
||||
wtv-expire-all: wtv-1800:
|
||||
wtv-service: reset
|
||||
${getServiceString('wtv-1800')}
|
||||
${wtvshared.getServiceString('wtv-1800')}
|
||||
wtv-visit: ${gourl}
|
||||
Content-type: text/html`;
|
||||
data = '';
|
||||
@@ -7,9 +7,9 @@ wtv-noback-all: wtv-register:
|
||||
wtv-expire-all: wtv-
|
||||
wtv-ticket: ${session_data.data_store.wtvsec_login.ticket_b64}
|
||||
wtv-service: reset
|
||||
${getServiceString('wtv-1800')}
|
||||
${getServiceString('wtv-head-waiter')}
|
||||
${getServiceString('wtv-star')}
|
||||
${wtvshared.getServiceString('wtv-1800')}
|
||||
${wtvshared.getServiceString('wtv-head-waiter')}
|
||||
${wtvshared.getServiceString('wtv-star')}
|
||||
wtv-relogin-url: wtv-1800:/preregister?relogin=true
|
||||
wtv-reconnect-url: wtv-1800:/preregister?reconnect=true
|
||||
wtv-boot-url: wtv-1800:/preregister?relogin=true
|
||||
|
||||
@@ -5,7 +5,7 @@ wtv-noback-all: wtv-
|
||||
wtv-expire-all: wtv-
|
||||
Content-type: text/html
|
||||
wtv-service: reset
|
||||
`+getServiceString('wtv-1800');
|
||||
`+wtvshared.getServiceString('wtv-1800');
|
||||
|
||||
|
||||
// HackTV Homepage is default
|
||||
|
||||
@@ -16,7 +16,7 @@ class WTVShared {
|
||||
sanitizeHtml = require('sanitize-html');
|
||||
iconv = require('iconv-lite');
|
||||
parentDirectory = process.cwd()
|
||||
extend = require('util')._extend;
|
||||
util = require('util');
|
||||
debug = require('debug')('WTVShared')
|
||||
process = require('process');
|
||||
shenanigans = null;
|
||||
@@ -139,6 +139,19 @@ class WTVShared {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Moves an array element from one index to another
|
||||
* @param {Array} array The array to modify
|
||||
* @param {number} from The index of the element to move
|
||||
* @param {number} to The index to move the element to
|
||||
* @return {Array} The modified array with the element moved
|
||||
* @notice This function modifies the original array and also returns it for convenience
|
||||
*/
|
||||
moveArrayKey(array, from, to) {
|
||||
array.splice(to, 0, array.splice(from, 1)[0]);
|
||||
return array;
|
||||
};
|
||||
|
||||
/**
|
||||
* Converts a byte array to a 32-bit unsigned integer (big-endian)
|
||||
* @param {Uint8Array} bytes The byte array
|
||||
|
||||
Reference in New Issue
Block a user