zefie/minisrv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix/optimize wtv-author, wtv-favorite

Browse Source
This commit is contained in:
zefie
2025-08-12 20:44:15 -04:00
parent 011229cc22
commit 6827746799
54 changed files with 543 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/add.js
View File

@@ -1,38 +1,41 @@
var minisrv_service_file = true;
var request_is_async = true;
const minisrv_service_file = true;
var max_redirects = 3;
var redirects = 0;
request_is_async = true;
const max_redirects = 3;
let redirects = 0;
function hex_to_ascii(POST)
{
var hex = POST.toString();
var str = '';
for (var n = 0; n < hex.length; n += 2) {
str += String.fromCharCode(parseInt(hex.substr(n, 2), 16));
{
const hex = POST.toString();
let str = '';
for (let n = 0; n < hex.length; n += 2) {
str += String.fromCharCode(parseInt(hex.slice(n, n + 2), 16));
}
return str;
}
let POST, image;
if (request_headers.post_data) {
var POST = request_headers.post_data;
var image = hex_to_ascii(POST);
POST = request_headers.post_data;
image = hex_to_ascii(POST);
}
function getTitle(url) {
return new Promise(function (resolve, reject) {
var page_title = "Web Page";
var request_type = (url.substring(0, 5) == "https") ? "https" : "http";
var proxy_agent = null;
let page_title = "Web Page";
const request_type = (url.slice(0, 5) == "https") ? "https" : "http";
let proxy_agent = null;
switch (request_type) {
case "https":
var proxy_agent = require('https');
proxy_agent = require('https');
break;
case "http":
var proxy_agent = require('http');;
proxy_agent = require('http');;
break;
}
if (proxy_agent) {
var options = {
const options = {
method: 'GET'
}
const request = proxy_agent.get(url, options, (response) => {
@@ -47,7 +50,7 @@ function getTitle(url) {
});
response.on('end', () => {
let match = req_data.match(/<title>([^<]*)<\/title>/) // regular expression to parse contents of the <title> tag
const match = req_data.match(/<title>([^<]*)<\/title>/) // regular expression to parse contents of the <title> tag
if (match && typeof match[1] === 'string') page_title = match[1];
resolve(page_title);
});
@@ -62,20 +65,20 @@ function getTitle(url) {
}
async function saveFavorite(favstore, title, folder, imagetype, favurl) {
var headers, data = '';
let headers, data = '';
if (!favstore.favstoreExists()) {
// create favstore if the user hasn't already navigated to favorites
favstore.createFavstore();
}
if (favstore.favstoreExists()) {
var default_folder = "Personal"; // default to "Personal"
var favoritenum = 0;
const default_folder = "Personal"; // default to "Personal"
let favoritenum = 0;
if (!folder) folder = default_folder;
if (!favstore.folderExists(folder)) {
// user did not define a folder, and the default folder does not exist
// so choose the user's first available folder
var favfolders = favstore.getFolders();
const favfolders = favstore.getFolders();
if (favfolders.length > 0) folder = favfolders[0];
}
if (!folder) {
@@ -84,7 +87,7 @@ async function saveFavorite(favstore, title, folder, imagetype, favurl) {
favstore.createTemplateFolder(folder);
}
var favarray = favstore.listFavorites(folder);
const favarray = favstore.listFavorites(folder);
favoritenum = Object.keys(favarray).length;
@@ -108,12 +111,12 @@ async function saveFavorite(favstore, title, folder, imagetype, favurl) {
headers = `400 You can only have ${minisrv_config.services[service_name].max_favorites_per_folder} favorites in a folder. Discard some favorites or choose a different folder, then try again.`
} else {
var createresult = favstore.createFavorite(title, favurl, folder, image, imagetype);
const createresult = favstore.createFavorite(title, favurl, folder, image, imagetype);
if (!createresult) { // true if fail
headers = `200 OK
wtv-expire: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
} else {
var err = wtvshared.doErrorPage(500);
const err = wtvshared.doErrorPage(500);
headers = err[0];
data = err[1];
}
@@ -121,7 +124,7 @@ wtv-expire: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
sendToClient(socket, headers, data);
}
} else {
var err = wtvshared.doErrorPage(500);
const err = wtvshared.doErrorPage(500);
headers = err[0];
data = err[1];
sendToClient(socket, headers, data);
@@ -129,10 +132,10 @@ wtv-expire: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
}
var title = request_headers.query['favorite-title'];
var folder = request_headers.query['favorite-category'];
const title = request_headers.query['favorite-title'];
let folder = request_headers.query['favorite-category'];
if (folder) folder = folder.replaceAll("+", " ")
var imagetype = request_headers.query['favorite-thumbnail-type']
var favurl = request_headers.query['favorite-url'];
const imagetype = request_headers.query['favorite-thumbnail-type']
const favurl = request_headers.query['favorite-url'];
saveFavorite(session_data.favstore, title, folder, imagetype, favurl);

12
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js
View File

@@ -1,15 +1,15 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var foldername = request_headers.query.new_folder_name;
var favstore_exists = session_data.favstore.favstoreExists();
var valid_foldername = session_data.favstore.checkFolderName(foldername);
const foldername = request_headers.query.new_folder_name;
const favstore_exists = session_data.favstore.favstoreExists();
const valid_foldername = session_data.favstore.checkFolderName(foldername);
if (!valid_foldername) {
headers = `400 That folder name is not valid. Choose a different name and try again.`
} else {
var folder_exists = session_data.favstore.folderExists(foldername);
var folder_array = session_data.favstore.getFolders();
const folder_exists = session_data.favstore.folderExists(foldername);
const folder_array = session_data.favstore.getFolders();
if (foldername) {
if (favstore_exists === false)

7
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-arrange-favorites.js
View File

@@ -1,9 +1,8 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var with_pictures = request_headers.query.with_pictures
const with_pictures = request_headers.query.with_pictures
if (with_pictures = "on")
{
if (with_pictures === "on") {
session_data.setSessionData("subscriber_fav_images", true)
} else {
session_data.setSessionData("subscriber_fav_images", false)

98
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-favorites.js
View File

@@ -1,23 +1,23 @@
var minisrv_service_file = true;
var errpage;
const minisrv_service_file = true;
let errpage;
var query = request_headers.query
const query = request_headers.query
var discardAll = request_headers.query.DiscardAll
const discardAll = request_headers.query.DiscardAll
let strName;
if (discardAll != "Discard All")
{
var strName, strValue ;
for(strName in query)
{
if (strName != "favorite_folder_name")
break;
}
for(strName in query)
{
if (strName != "favorite_folder_name")
break;
strName = strName.replaceAll("+", " ");
}
strName = strName.replaceAll("+", " ");
}
var folder = request_headers.query.favorite_folder_name;
const folder = request_headers.query.favorite_folder_name;
if (request_headers.query.ForwardToBrowser)
{
headers = `300 OK
@@ -25,57 +25,55 @@ Connection: Keep-Alive
Content-Type: text/html
Location: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`
} else if (strName != "getCaseInsensitiveKey") {
var favorite = session_data.favstore.getFavorite(folder, strName);
const favorite = session_data.favstore.getFavorite(folder, strName);
if (errpage) {
headers = errpage[0];
data = errpage[1];
} else {
if (!request_headers.query.confirm_remove) {
if (discardAll == "Discard All")
{
var message = `Are you sure you want to discard all favorites in this folder?`;
var removeurl = request_headers.request_url;
removeurl += "&confirm_remove=true&DiscardAll=Discard All";
} else {
var message = `Are you sure you want to discard <b>${favorite.title}</b>?`;
var removeurl = request_headers.request_url;
removeurl += "&confirm_remove=true";
}
if (errpage) {
headers = errpage[0];
data = errpage[1];
} else {
if (!request_headers.query.confirm_remove) {
let message, removeurl;
if (discardAll == "Discard All")
{
message = `Are you sure you want to discard all favorites in this folder?`;
removeurl = request_headers.request_url + "&confirm_remove=true&DiscardAll=Discard All";
} else {
message = `Are you sure you want to discard <b>${favorite.title}</b>?`;
removeurl = request_headers.request_url + "&confirm_remove=true";
}
var confirmAlert = new clientShowAlert({
'message': message,
'buttonlabel1': "Don't Remove",
'buttonaction1': "client:donothing",
'buttonlabel2': "Remove",
'buttonaction2': removeurl,
'noback': true,
}).getURL();
headers = `300 OK
const confirmAlert = new clientShowAlert({
'message': message,
'buttonlabel1': "Don't Remove",
'buttonaction1': "client:donothing",
'buttonlabel2': "Remove",
'buttonaction2': removeurl,
'noback': true,
}).getURL();
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
wtv-expire-all: wtv-favorite:
Location: ${confirmAlert}`
} else {
var gourl = `wtv-favorite:/serve-discard-favorites?favorite_folder_name=${folder}`;
if (discardAll == "Discard All")
{
session_data.favstore.clearFolder(folder);
} else {
session_data.favstore.deleteFavorite(strName, folder);
}
const gourl = `wtv-favorite:/serve-discard-favorites?favorite_folder_name=${folder}`;
if (discardAll == "Discard All")
{
session_data.favstore.clearFolder(folder);
} else {
session_data.favstore.deleteFavorite(strName, folder);
}
headers = `300 OK
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
wtv-expire-all: wtv-favorite:
Location: ${gourl}`
}
}
}
} else {
headers = `300 OK
} else {
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
Location: wtv-favorite:/serve-browser?favorite_folder_name=${folder}`

101
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-folders.js
View File

@@ -1,18 +1,17 @@
var minisrv_service_file = true;
var errpage;
const minisrv_service_file = true;
let errpage;
var query = request_headers.query
var folder_array = session_data.favstore.getFolders();
var totalfavorites = folder_array.length;
const query = request_headers.query
const folder_array = session_data.favstore.getFolders();
const totalfolders = folder_array.length;
let folder;
var strName, strValue ;
for(strName in query)
{
break;
}
strName = strName.replaceAll("+", " ");
Object.entries(query).forEach(([key, value]) => {
if (value === "Remove") {
folder = key;
return;
}
});
if (request_headers.query.ForwardToFolders)
{
@@ -20,57 +19,51 @@ if (request_headers.query.ForwardToFolders)
Connection: Keep-Alive
Content-Type: text/html
Location: wtv-favorite:/favorite`
} else if (strName != "getCaseInsensitiveKey") {
var folder = session_data.favstore.getFolders();
var folderdata = session_data.favstore.listFavorites(strName);
var numoffavorites = Object.keys(folderdata).length;
if (totalfavorites == 1) {
errpage = wtvshared.doErrorPage(400, "You cannot remove your last folder.");
}
if (errpage) {
headers = errpage[0];
data = errpage[1];
} else {
if (!request_headers.query.confirm_remove) {
var message = '';
if (numoffavorites == 0) {
message = `Are you sure you want to remove <b>${strName}</b>?`;
} else {
message = `Removing <b>${strName}</b> will also remove the ${numoffavorites} favorites it contains.`;
}
var removeurl = request_headers.request_url;
removeurl += "&confirm_remove=true";
const folderdata = session_data.favstore.listFavorites(folder);
const numoffavorites = Object.keys(folderdata).length;
var confirmAlert = new clientShowAlert({
'message': message,
'buttonlabel1': "Don't Remove",
'buttonaction1': "client:donothing",
'buttonlabel2': "Remove",
'buttonaction2': removeurl,
'noback': true,
}).getURL();
headers = `300 OK
if (totalfolders === 1) {
errpage = wtvshared.doErrorPage(400, "You cannot remove your last folder.");
}
if (errpage) {
headers = errpage[0];
data = errpage[1];
} else {
if (!request_headers.query.confirm_remove) {
let message = '';
if (numoffavorites == 0) {
message = `Are you sure you want to remove <b>${folder}</b>?`;
} else {
message = `Removing <b>${folder}</b> will also remove the ${numoffavorites} favorites it contains.`;
}
let removeurl = request_headers.request_url;
removeurl += "&confirm_remove=true";
const confirmAlert = new clientShowAlert({
'message': message,
'buttonlabel1': "Don't Remove",
'buttonaction1': "client:donothing",
'buttonlabel2': "Remove",
'buttonaction2': removeurl,
'noback': true,
}).getURL();
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
wtv-expire-all: wtv-favorite:
Location: ${confirmAlert}`
} else {
var gourl = "wtv-favorite:/serve-discard-folders";
session_data.favstore.deleteFolder(strName);
} else {
const gourl = "wtv-favorite:/serve-discard-folders";
session_data.favstore.deleteFolder(folder);
headers = `300 OK
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
wtv-expire-all: wtv-favorite:
Location: ${gourl}`
}
}
}
} else {
headers = `300 OK
Connection: Keep-Alive
Content-Type: text/html
Location: wtv-favorite:/serve-discard-folders`
}

22
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-move-favorites.js
View File

@@ -1,24 +1,24 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var folder = request_headers.query.favorite_folder_name || null;
var favarray = session_data.favstore.listFavorites(folder);
var error_occured = false;
let favoritenum = 0;
const folder = request_headers.query.favorite_folder_name || null;
const favarray = session_data.favstore.listFavorites(folder);
let error_occured = false;
if (!folder) error_occured = true;
else {
favoritenum = Object.keys(favarray).length;
if (typeof request_headers.query.favoriteid === 'string') {
// one favorite
var favid = request_headers.query.favoriteid;
var favfolder = request_headers.query.favoritefolder;
const favid = request_headers.query.favoriteid;
const favfolder = request_headers.query.favoritefolder;
if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
} else {
if (request_headers.query.favoriteid.length == request_headers.query.favoritefolder.length) {
// both queries should have the same number of entries
Object.keys(request_headers.query.favoriteid).forEach(function (k) {
var favid = request_headers.query.favoriteid[k];
var favfolder = request_headers.query.favoritefolder[k];
const favid = request_headers.query.favoriteid[k];
const favfolder = request_headers.query.favoritefolder[k];
if (folder != favfolder) session_data.favstore.moveFavorite(folder, favfolder, favid);
})
} else {
@@ -27,7 +27,7 @@ else {
}
if (!error_occured) {
var gourl = `wtv-favorite:/serve-browser?favorite_folder_name=${folder}`;
const gourl = `wtv-favorite:/serve-browser?favorite_folder_name=${folder}`;
headers = `300 OK
Connection: Keep-Alive
@@ -35,7 +35,7 @@ Content-Type: text/html
wtv-expire-all: wtv-favorite:
Location: ${gourl}`
} else {
var err = doErrorPage(500);
const err = wtvshared.doErrorPage(500);
headers = err[0];
data = err[1];
}

83
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-rename-favorites.js
View File

@@ -1,90 +1,91 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var folder = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(folder);
let favoritenum = 0;
const folder = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(folder);
favoritenum = Object.keys(favarray).length;
let favid, favname;
for (let i = 0; i < favoritenum; i++) {
switch(i) {
case 0:
var favid = request_headers.query.favorite0id;
var favname = request_headers.query.favorite0name;
favid = request_headers.query.favorite0id;
favname = request_headers.query.favorite0name;
break;
case 1:
var favid = request_headers.query.favorite1id;
var favname = request_headers.query.favorite1name;
favid = request_headers.query.favorite1id;
favname = request_headers.query.favorite1name;
break;
case 2:
var favid = request_headers.query.favorite2id;
var favname = request_headers.query.favorite2name;
favid = request_headers.query.favorite2id;
favname = request_headers.query.favorite2name;
break;
case 3:
var favid = request_headers.query.favorite3id;
var favname = request_headers.query.favorite3name;
favid = request_headers.query.favorite3id;
favname = request_headers.query.favorite3name;
break;
case 4:
var favid = request_headers.query.favorite4id;
var favname = request_headers.query.favorite4name;
favid = request_headers.query.favorite4id;
favname = request_headers.query.favorite4name;
break;
case 5:
var favid = request_headers.query.favorite5id;
var favname = request_headers.query.favorite5name;
favid = request_headers.query.favorite5id;
favname = request_headers.query.favorite5name;
break;
case 6:
var favid = request_headers.query.favorite6id;
var favname = request_headers.query.favorite6name;
favid = request_headers.query.favorite6id;
favname = request_headers.query.favorite6name;
break;
case 7:
var favid = request_headers.query.favorite7id;
var favname = request_headers.query.favorite7name;
favid = request_headers.query.favorite7id;
favname = request_headers.query.favorite7name;
break;
case 8:
var favid = request_headers.query.favorite8id;
var favname = request_headers.query.favorite8name;
favid = request_headers.query.favorite8id;
favname = request_headers.query.favorite8name;
break;
case 9:
var favid = request_headers.query.favorite9id;
var favname = request_headers.query.favorite9name;
favid = request_headers.query.favorite9id;
favname = request_headers.query.favorite9name;
break;
case 10:
var favid = request_headers.query.favorite10id;
var favname = request_headers.query.favorite10name;
favid = request_headers.query.favorite10id;
favname = request_headers.query.favorite10name;
break;
case 11:
var favid = request_headers.query.favorite11id;
var favname = request_headers.query.favorite11name;
favid = request_headers.query.favorite11id;
favname = request_headers.query.favorite11name;
break;
case 12:
var favid = request_headers.query.favorite12id;
var favname = request_headers.query.favorite12name;
favid = request_headers.query.favorite12id;
favname = request_headers.query.favorite12name;
break;
case 13:
var favid = request_headers.query.favorite13id;
var favname = request_headers.query.favorite13name;
favid = request_headers.query.favorite13id;
favname = request_headers.query.favorite13name;
break;
case 14:
var favid = request_headers.query.favorite14id;
var favname = request_headers.query.favorite14name;
favid = request_headers.query.favorite14id;
favname = request_headers.query.favorite14name;
break;
case 15:
var favid = request_headers.query.favorite15id;
var favname = request_headers.query.favorite15name;
favid = request_headers.query.favorite15id;
favname = request_headers.query.favorite15name;
break;
case 16:
var favid = request_headers.query.favorite16id;
var favname = request_headers.query.favorite16name;
favid = request_headers.query.favorite16id;
favname = request_headers.query.favorite16name;
break;
case 17:
var favid = request_headers.query.favorite17id;
var favname = request_headers.query.favorite17name;
favid = request_headers.query.favorite17id;
favname = request_headers.query.favorite17name;
break;
}
session_data.favstore.changeFavoriteName(favid, folder, favname);
}
var gourl = `wtv-favorite:/serve-browser?favorite_folder_name=${folder}`;
const gourl = `wtv-favorite:/serve-browser?favorite_folder_name=${folder}`;
headers = `300 OK
Connection: Keep-Alive

18
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-samples-page.js
View File

@@ -1,14 +1,14 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var totalfavorites = 0;
let totalfavorites = 0;
var createFun = request_headers.query.Fun;
var createMoney = request_headers.query.Money;
var createMovies = request_headers.query.Movies;
var createNews = request_headers.query.News;
var createRecommended = request_headers.query.Recommended;
var createReference = request_headers.query.Reference;
var folder_array = session_data.favstore.getFolders();
const createFun = request_headers.query.Fun;
const createMoney = request_headers.query.Money;
const createMovies = request_headers.query.Movies;
const createNews = request_headers.query.News;
const createRecommended = request_headers.query.Recommended;
const createReference = request_headers.query.Reference;
const folder_array = session_data.favstore.getFolders();
totalfavorites = folder_array.length;
if (totalfavorites < 14)

8
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js
View File

@@ -1,8 +1,8 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var folder = request_headers.query.favorite_folder_name;
var key = request_headers.query.Choose;
var id = request_headers.query.favoriteid;
const folder = request_headers.query.favorite_folder_name;
const key = request_headers.query.Choose;
const id = request_headers.query.favoriteid;
session_data.favstore.updateShortcutKey("none", key, folder, id);

14
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js
View File

@@ -1,6 +1,6 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favstore_exists = session_data.favstore.favstoreExists();
const favstore_exists = session_data.favstore.favstoreExists();
if (favstore_exists != true)
{
@@ -9,14 +9,14 @@ if (favstore_exists != true)
Location: wtv-favorite:/favorite`
} else {
var folder_array = session_data.favstore.getFolders();
var url = request_headers.request;
var key = url.split('?')[1]
var scfav = session_data.favstore.getShortcutKey(key);
const folder_array = session_data.favstore.getFolders();
const url = request_headers.request;
const key = url.split('?')[1]
const scfav = session_data.favstore.getShortcutKey(key);
if (!scfav.id || scfav.id == "none") {
headers = `400 You have not assigned a favorite to ${key}`
} else {
var fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
const fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
headers = `300 OK
Content-Type: text/html
Location: ${fav.url}`

12
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js
View File

@@ -1,6 +1,6 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favstore_exists = session_data.favstore.favstoreExists();
const favstore_exists = session_data.favstore.favstoreExists();
if (favstore_exists != true)
{
@@ -9,9 +9,9 @@ if (favstore_exists != true)
Location: wtv-favorite:/favorite`
} else {
var folder_array = session_data.favstore.getFolders();
var totalfavorites = folder_array.length;
var stopdrawing = false;
const folder_array = session_data.favstore.getFolders();
const totalfavorites = folder_array.length;
const stopdrawing = false;
headers = `200 OK
Connection: Keep-Alive
@@ -148,7 +148,7 @@ for ${session_data.getSessionData("subscriber_username") || "You"}
</font>
</td><td width="20">
</td></tr></table>`
var kval = 0;
let kval = 0;
// process evens
Object.keys(folder_array).forEach(function (k) {
if (k == 0) return; // skip 0 since it was processed above

10
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/get-thumbnail.js
View File

@@ -1,10 +1,10 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var errpage = null;
let errpage = null;
var id = request_headers.query.id;
var folder = request_headers.query.folder;
var favorite = session_data.favstore.getFavorite(folder, id);
const id = request_headers.query.id;
const folder = request_headers.query.folder;
const favorite = session_data.favstore.getFavorite(folder, id);
if (!favorite) errpage = wtvshared.doErrorPage(400, "Invalid favorite ID");

12
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/list-folders.js
View File

@@ -1,14 +1,12 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
const favstore_exists = session_data.favstore.favstoreExists();
var favstore_exists = session_data.favstore.favstoreExists();
if (favstore_exists != true)
{
if (favstore_exists !== true) {
session_data.favstore.createFavstore();
}
var folder_array = session_data.favstore.getFolders();
var data = "";
const folder_array = session_data.favstore.getFolders();
data = "";
for (let i = 0; i < folder_array.length; i++) data += folder_array[i] + "\0";

2
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-add-folder-page.js
View File

@@ -1,4 +1,4 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
headers = `200 OK
Connection: Keep-Alive

18
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-arrange-favorites.js
View File

@@ -1,16 +1,12 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
let favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;

23
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-browser.js
View File

@@ -1,18 +1,11 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
headers = `200 OK
Connection: Keep-Alive
@@ -210,7 +203,7 @@ if (folderid !== numoffolders - 1)
// favorite loop
Object.keys(favarray).forEach(function (k) {
var url = decodeURIComponent(favarray[k].url);
const url = decodeURIComponent(favarray[k].url);
data += `</td><td abswidth="139" valign="top">
<table href="${url}" bgcolor="191919">
<tbody><tr><td abswidth="139" align="center">`;

39
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js
View File

@@ -1,22 +1,13 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var favid = request_headers.query.favoriteid;
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
var favoritedata = session_data.favstore.getFavorite(foldername, favid);
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const favid = request_headers.query.favoriteid;
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
const favoritedata = session_data.favstore.getFavorite(foldername, favid);
headers = `200 OK
@@ -117,14 +108,14 @@ Choose a shortcut label for <b>${favoritedata.title}</b>, then choose <b>Done</b
<tbody><tr><td width="13">
</td><td>
<form action="wtv-favorite:/commit-shortcuts-favorites">`
for (var i = 1; i <= 8; i++) {
var key = "F" + i;
var scfav = session_data.favstore.getShortcutKey(key);
let fav;
for (let i = 1; i <= 8; i++) {
const key = "F" + i;
const scfav = session_data.favstore.getShortcutKey(key);
if (scfav && scfav.id != "none") {
var fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
} else {
var fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
}
data += `

21
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-favorites.js
View File

@@ -1,18 +1,11 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
headers = `200 OK

6
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-folders.js
View File

@@ -1,7 +1,7 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var folder_array = session_data.favstore.getFolders();
var totalfavorites = folder_array.length;
const folder_array = session_data.favstore.getFolders();
const totalfavorites = folder_array.length;
headers = `200 OK
Connection: Keep-Alive

26
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-move-favorites.js
View File

@@ -1,22 +1,14 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldernum = 0;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
const foldernum = folder_array.length;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
foldernum = folder_array.length;
var folderlist = `<select name="newfolder" width=140>
let folderlist = `<select name="newfolder" width=140>
<option value="${foldername}" selected="">${foldername}</option>
`
for (let i = 0; i < foldernum; i++) {

21
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-organize-favorites.js
View File

@@ -1,18 +1,11 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
headers = `200 OK

21
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-rename-favorites.js
View File

@@ -1,18 +1,11 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
headers = `200 OK

2
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-samples-page.js
View File

@@ -1,4 +1,4 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
headers = `200 OK
Connection: Keep-Alive

14
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js
View File

@@ -1,4 +1,4 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
headers = `200 OK
Content-Type: text/html`
@@ -73,14 +73,14 @@ Keyboard shortcut list
</td></tr><tr>
<td width="4" height="14"><img src="wtv-home:/ROMCache/Spacer.gif" width="1" height="1">
</td></tr></tbody></table>`
for (var i = 1; i <= 8; i++) {
var key = "F" + i;
var scfav = session_data.favstore.getShortcutKey(key);
let fav;
for (let i = 1; i <= 8; i++) {
const key = "F" + i;
const scfav = session_data.favstore.getShortcutKey(key);
if (scfav && scfav.id != "none") {
var fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
fav = session_data.favstore.getFavorite(scfav.folder, scfav.id);
} else {
var fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
fav = { image: "wtv-home:/ROMCache/Spacer.gif", title: "Not assigned" };
}
data += `

23
zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js
View File

@@ -1,18 +1,11 @@
var minisrv_service_file = true;
const minisrv_service_file = true;
var favoritenum = 0;
var foldername = request_headers.query.favorite_folder_name;
var favarray = session_data.favstore.listFavorites(foldername);
var folder_array = session_data.favstore.getFolders();
var folderid = folder_array.indexOf(foldername);
var numoffolders = folder_array.length;
favoritenum = Object.keys(favarray).length;
const foldername = request_headers.query.favorite_folder_name;
const favarray = session_data.favstore.listFavorites(foldername);
const folder_array = session_data.favstore.getFolders();
const folderid = folder_array.indexOf(foldername);
const numoffolders = folder_array.length;
const favoritenum = Object.keys(favarray).length;
headers = `200 OK
@@ -164,7 +157,7 @@ ${favarray[i].title}<br>
<table absheight="38" href="wtv-favorite:/serve-choose-shortcut-favorites?favorite_folder_name=${foldername}&amp;favoriteid=${favarray[i].id}" width="53" cellspacing="0" cellpadding="0">
<tbody><tr><td valign="middle" background="images/FKey.gif" absheight=38 align="center">
`
var scdata = session_data.favstore.isFavoriteAShortcut(favarray[i].id);
const scdata = session_data.favstore.isFavoriteAShortcut(favarray[i].id);
if (scdata) {
data += `<font size="-2" color="#F1F1F1">${scdata.key}</font>`;
}