diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-block.js index fb228954..81c504e9 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-block.js @@ -1,8 +1,8 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName -var blockNum = request_headers.query.blockNum -var blockClass = request_headers.query.blockClass +const docName = request_headers.query.docName +let blockNum = request_headers.query.blockNum +const blockClass = request_headers.query.blockClass blockNum = parseInt(blockNum) + 1 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-media-to-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-media-to-block.js index 57e022d7..c2b72ac0 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-media-to-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/add-media-to-block.js @@ -1,17 +1,17 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var title = request_headers.query.blockTitle -var caption = request_headers.query.textBlockText -var size = request_headers.query.textBlockSize -var style = request_headers.query.textBlockStyle -var position = request_headers.query.newBlockNum -var oldPosition = request_headers.query.oldBlockNum -var editing = request_headers.query.editing +const docName = request_headers.query.docName; +const title = request_headers.query.blockTitle; +const caption = request_headers.query.textBlockText; +const size = request_headers.query.textBlockSize; +const style = request_headers.query.textBlockStyle; +const position = request_headers.query.newBlockNum; +const oldPosition = request_headers.query.oldBlockNum; +const editing = request_headers.query.editing; +let page; if (editing == "true"){ session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.newBlockNum, null, null, request_headers.query.blockTitle, request_headers.query.photoBlockCaption); - var page = session_data.pagestore.loadPage(docName); headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview @@ -20,10 +20,10 @@ wtv-expire-all: wtv-author:/edit-block wtv-expire-all: wtv-author:/get-photo?docName=${docName}&blockNum=${request_headers.query.blockNum} Location: wtv-author:/show-blocks?docName=${docName}` } else { - var page = session_data.pagestore.loadPage(docName); - var blockNum = request_headers.query.blockNum; + const page = session_data.pagestore.loadPage(docName); + const blockNum = request_headers.query.blockNum; if (request_headers.query.scrapbookID != undefined) { - var image = session_data.pagestore.getScrapbookImage(parseInt(request_headers.query.scrapbookID)); + const image = session_data.pagestore.getScrapbookImage(parseInt(request_headers.query.scrapbookID)); if (page.blocks[blockNum] != undefined) session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.blockNum, image, "scrapbook", null, null); else diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/block-preview.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/block-preview.js index e25f02ed..0b1cea4a 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/block-preview.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/block-preview.js @@ -1,6 +1,6 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName +const docName = request_headers.query.docName headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/choose-new-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/choose-new-block.js index 3ef57a31..c8faca5d 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/choose-new-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/choose-new-block.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName -var numOfBlocks = request_headers.query.blockNum; +const docName = request_headers.query.docName +const numOfBlocks = request_headers.query.blockNum; headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook-categories.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook-categories.js index 09e64be3..0ed8b97f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook-categories.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook-categories.js @@ -1,9 +1,9 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName -var blockNum = request_headers.query.blockNum -var blockClass = request_headers.query.blockClass -var category = request_headers.query.mediaCategoryID +const docName = request_headers.query.docName +const blockNum = request_headers.query.blockNum +const blockClass = request_headers.query.blockClass +const category = request_headers.query.mediaCategoryID headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook.js index e0744e33..ec09529a 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/clipbook.js @@ -1,10 +1,10 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; const docName = request_headers.query.docName const blockNum = request_headers.query.blockNum const blockClass = request_headers.query.blockClass const category = request_headers.query.mediaCategoryID ? parseInt(request_headers.query.mediaCategoryID) : null; -var page = request_headers.query.pageNum ? parseInt(request_headers.query.pageNum) : 0; +const page = request_headers.query.pageNum ? parseInt(request_headers.query.pageNum) : 0; const itemsPerPage = 12; const clipart = { @@ -1684,10 +1684,11 @@ ${(category !== null) ? `${clipart[category].name}` : 'art'} `; +let cat; if (category !== null) { - var cat = clipart[category]; + cat = clipart[category]; if (cat.categories) { - var i = 0; + let i = 0; Object.keys(cat.categories).forEach(function (k) { i++; if (i % 14 === 0) data += `
`; @@ -1702,7 +1703,7 @@ ${(category !== null) ? `${clipart[category].name}` : 'art'} }); } } else { - var i = 0; + let i = 0; Object.keys(clipart).forEach(function (k) { cat = clipart[k]; if (cat.parent) return; @@ -1723,9 +1724,9 @@ ${(category !== null) ? `${clipart[category].name}` : 'art'} ` } else { // category has images - var cat = clipart[category]; - var imgcount = cat.images.length; - var pages = Math.ceil(imgcount / itemsPerPage); + const cat = clipart[category]; + const imgcount = cat.images.length; + const pages = Math.ceil(imgcount / itemsPerPage); data = ` @@ -1870,11 +1871,11 @@ ${cat.name}
`; - for (i = page * itemsPerPage; i < Math.min(imgcount, (page + 1) * itemsPerPage); i++) { + for (let i = page * itemsPerPage; i < Math.min(imgcount, (page + 1) * itemsPerPage); i++) { if (i % 4 === 0) data += ``; data += ` `; } diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/congrats.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/congrats.js index d785466a..04a62d2c 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/congrats.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/congrats.js @@ -1,8 +1,8 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var page = session_data.pagestore.loadPage(docName) -var site = session_data.pagestore.getPublishDomain(); +const docName = request_headers.query.docName; +const page = session_data.pagestore.loadPage(docName) +const site = session_data.pagestore.getPublishDomain(); headers = `200 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-block.js index 78b282af..011d59e5 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-block.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var position = request_headers.query.blockNum +const docName = request_headers.query.docName; +const position = request_headers.query.blockNum session_data.pagestore.deleteBlock(docName, position); headers = `300 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-doc.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-doc.js index 354dca20..f346fd65 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-doc.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/delete-doc.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var position = request_headers.query.blockNum +const docName = request_headers.query.docName; +const position = request_headers.query.blockNum session_data.pagestore.deletePage(docName); headers = `300 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/doc-info.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/doc-info.js index 3a2f54ab..bcb17f9d 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/doc-info.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/doc-info.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var pagestore_exists = session_data.pagestore.pagestoreExists(); -var docName = request_headers.query.docName; +const pagestore_exists = session_data.pagestore.pagestoreExists(); +const docName = request_headers.query.docName; if (pagestore_exists != true) { @@ -10,8 +10,8 @@ if (pagestore_exists != true) Location: wtv-author:/documents` } else { - var page = session_data.pagestore.loadPage(docName) - var discardAlert = function (docName) { + const page = session_data.pagestore.loadPage(docName) + const discardAlert = function (docName) { return new clientShowAlert({ 'image': this.minisrv_config.config.service_logo, 'message': "Would you like to permanently discard this document and all of its contents?", @@ -23,7 +23,7 @@ Location: wtv-author:/documents` 'noback': true, }).getURL(); } - var unpublishAlert = function (docName) { + const unpublishAlert = function (docName) { return new clientShowAlert({ 'image': this.minisrv_config.config.service_logo, 'message': "Would you like to unpublish this document? You can republish it later.", diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-block.js index c99df53e..dff48cee 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-block.js @@ -1,13 +1,12 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName -var pagedata = session_data.pagestore.loadPage(docName); -var blockNum = pagedata.blocks.length -var oldBlockNum = request_headers.query.blockNum +const docName = request_headers.query.docName +const pagedata = session_data.pagestore.loadPage(docName); +const blockNum = pagedata.blocks.length +const oldBlockNum = request_headers.query.blockNum -var blockType = pagedata.blocks[oldBlockNum].type -var photo; -var thumbnail; +const blockType = pagedata.blocks[oldBlockNum].type +let photo, thumbnail; if (pagedata.blocks[oldBlockNum].photo) { photo = wtvshared.btoa(pagedata.blocks[oldBlockNum].photo) @@ -202,7 +201,7 @@ Add text to your document
+href="wtv-author:/add-media-to-block?docName=${docName}&blockNum=${blockNum}&blockClass=23&mediaPath=clipart%2F${encodeURIComponent(cat.path + "/" + cat.images[i])}&thumbnailPath=clipart%2Ficons%2F${encodeURIComponent(cat.path + "/" + cat.images[i])}">
data += ` ` for (let i = start; i < Math.min(files.length, start + 6); i++) { - url = "wtv-tricks:/view-scrapbook-image?id=" + files[i]; + let url = "wtv-tricks:/view-scrapbook-image?id=" + files[i]; if (request_headers.query.addMediaURL) { url = decodeURIComponent(request_headers.query.addMediaURL) + "&scrapbookID=" + files[i]; } diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/show-blocks.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/show-blocks.js index d79a1a39..3dee15c8 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/show-blocks.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/show-blocks.js @@ -1,9 +1,9 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var page = session_data.pagestore.loadPage(docName); -var numOfBlocks = page.blocks.length -var style = page.style.replace ('_', ' ') +const docName = request_headers.query.docName; +const page = session_data.pagestore.loadPage(docName); +const numOfBlocks = page.blocks.length +const style = page.style.replace ('_', ' ') console.log(numOfBlocks) headers = `200 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/styles.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/styles.js index cc082d51..6c3b40dd 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/styles.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/styles.js @@ -1,12 +1,12 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; headers = `200 OK Connection: Keep-Alive Content-Type: text/html`; -var styleName = request_headers.query.styleName; -var page = (request_headers.query.pageNum) ? parseInt(request_headers.query.pageNum) : 0 -var docName = request_headers.query.docName; +const styleName = request_headers.query.styleName; +let page = (request_headers.query.pageNum) ? parseInt(request_headers.query.pageNum) : 0 +const docName = request_headers.query.docName; const pages = [ [ @@ -144,7 +144,7 @@ ${(styleName) ? ` Your current style is: ${styleName} `; -for (i=0;i` data += `
Text size:` -var textsize = pagedata.blocks[oldBlockNum].size +const textsize = pagedata.blocks[oldBlockNum].size if (textsize == "-1") { @@ -232,7 +231,7 @@ Medium
Text style:` -var textstyle = pagedata.blocks[oldBlockNum].style +const textstyle = pagedata.blocks[oldBlockNum].style if (textstyle == "B") { diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-title.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-title.js index b83f6102..c2ea3d16 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-title.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/edit-title.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var page = session_data.pagestore.loadPage(docName); +const docName = request_headers.query.docName; +const page = session_data.pagestore.loadPage(docName); headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/fill-from-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/fill-from-favorites.js index ab32ce5e..0ff5015f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/fill-from-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/fill-from-favorites.js @@ -1,7 +1,7 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var blockNum = request_headers.query.blockNum; +const docName = request_headers.query.docName; +const blockNum = request_headers.query.blockNum; headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/generator.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/generator.js index d7066e88..f0234e0d 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/generator.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/generator.js @@ -1,7 +1,9 @@ +const minisrv_service_file = true; + const fs = require('fs'); -var dir = "ServiceVault\\wtv-author\\clipart\\Sports\\Baseball" -var files = fs.readdirSync(dir) -var start = 12; +const dir = "ServiceVault\\wtv-author\\clipart\\Sports\\Baseball" +const files = fs.readdirSync(dir) +const start = 12; headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/get-photo.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/get-photo.js index c32cd10a..a55bb079 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/get-photo.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/get-photo.js @@ -1,13 +1,9 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var errpage = null; +const docName = request_headers.query.docName; +const blockNum = request_headers.query.blockNum; +const page = session_data.pagestore.loadPage(docName); -var docName = request_headers.query.docName; -var blockNum = request_headers.query.blockNum; -var page = session_data.pagestore.loadPage(docName); - -if (!errpage) { - headers = `200 OK +headers = `200 OK Content-Type: image/jpeg`; - data = new Buffer.from(page.blocks[blockNum].photo, 'base64'); -} \ No newline at end of file +data = new Buffer.from(page.blocks[blockNum].photo, 'base64'); \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/new.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/new.js index 6ef23ed6..925f175f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/new.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/new.js @@ -1,13 +1,14 @@ -var minisrv_service_file = true; -var create = true; -var pagenums = session_data.pagestore.listPages().length; +const minisrv_service_file = true; + +let create = true; +const pagenums = session_data.pagestore.listPages().length; if (minisrv_config.services["wtv-author"].max_pages) { if (pagenums + 1 > minisrv_config.services["wtv-author"].max_pages) { create = false; } } if (create) { - var pagename = session_data.pagestore.createPage(request_headers.query.styleName.replace(' ', '_')); + const pagename = session_data.pagestore.createPage(request_headers.query.styleName.replace(' ', '_')); headers = `300 OK Connection: Keep-Alive @@ -15,7 +16,7 @@ Content-Type: text/html wtv-expire-all: wtv-author:/documents Location: wtv-author:/show-blocks?docName=${pagename}` } else { - var err = wtvshared.doErrorPage(500, "You are not allowed to create more than "+minisrv_config.services["wtv-author"].max_pages+" pages."); + const err = wtvshared.doErrorPage(500, "You are not allowed to create more than "+minisrv_config.services["wtv-author"].max_pages+" pages."); headers = err[0]; data = err[1]; } \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/preview.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/preview.js index 9b87812f..7b4e5603 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/preview.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/preview.js @@ -1,6 +1,6 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName +const docName = request_headers.query.docName headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/publish.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/publish.js index 6a9b2946..528606e5 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/publish.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/publish.js @@ -1,8 +1,8 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var page = session_data.pagestore.loadPage(docName) -var site = session_data.pagestore.getPublishDomain(); +const docName = request_headers.query.docName; +const page = session_data.pagestore.loadPage(docName); +const site = session_data.pagestore.getPublishDomain(); if (request_headers.query.publishStage == "1") { headers = `200 OK @@ -117,13 +117,13 @@ Include in public list ` } else if (request_headers.query.publishStage == "2") { - var inlist; + let inlist; if (request_headers.query.includeInPublicList != undefined) { inlist = true; } else { inlist = false; } - var result = session_data.pagestore.publishPage(docName, inlist); + const result = session_data.pagestore.publishPage(docName, inlist); if (result == true) { headers = `300 OK wtv-expire-all: wtv-author:/documents @@ -132,7 +132,7 @@ Location: wtv-author:/congrats?docName=${docName}` headers = `400 ${result}` } } else if (request_headers.query.unpublish == "1") { - var result = session_data.pagestore.unpublishPage(docName); + const result = session_data.pagestore.unpublishPage(docName); if (result == true) { headers = `300 OK wtv-expire-all: wtv-author:/documents diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-block.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-block.js index d4c57da4..940f3128 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-block.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-block.js @@ -1,158 +1,157 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var title = request_headers.query.blockTitle -var caption = request_headers.query.textBlockText -var size = request_headers.query.textBlockSize -var style = request_headers.query.textBlockStyle -var position = request_headers.query.newBlockNum -var oldPosition = request_headers.query.oldBlockNum -var editing = request_headers.query.editing -var blockClass = request_headers.query.blockClass +const docName = request_headers.query.docName; +const title = request_headers.query.blockTitle; +const caption = request_headers.query.textBlockText; +let size = request_headers.query.textBlockSize; +let style = request_headers.query.textBlockStyle; +const position = request_headers.query.newBlockNum; +const oldPosition = request_headers.query.oldBlockNum; +const editing = request_headers.query.editing; +const blockClass = request_headers.query.blockClass; switch(blockClass) { case "23": - if (editing == "true"){ - var photo = request_headers.query.photoBlockPhoto; - if (request_headers.query.toSnapshot == "true") - session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.newBlockNum, photo, "snapshot", request_headers.query.blockTitle, request_headers.query.photoBlockCaption); - else - session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.newBlockNum, null, null, request_headers.query.blockTitle, request_headers.query.photoBlockCaption); - var page = session_data.pagestore.loadPage(docName); - headers = `300 OK + if (editing == "true") { + const photo = request_headers.query.photoBlockPhoto; + if (request_headers.query.toSnapshot == "true") + session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.newBlockNum, photo, "snapshot", request_headers.query.blockTitle, request_headers.query.photoBlockCaption); + else + session_data.pagestore.editPhotoBlock(docName, request_headers.query.blockNum, request_headers.query.newBlockNum, null, null, request_headers.query.blockTitle, request_headers.query.photoBlockCaption); + const page = session_data.pagestore.loadPage(docName); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: ${request_headers.query.returnPageURL || "wtv-author:/show-blocks?docName=" + docName}` - -} else { - session_data.pagestore.createPhotoBlock(docName, request_headers.query.photoBlockPhoto, "snapshot"); - var page = session_data.pagestore.loadPage(docName); - headers = `300 OK + } else { + session_data.pagestore.createPhotoBlock(docName, request_headers.query.photoBlockPhoto, "snapshot"); + const page = session_data.pagestore.loadPage(docName); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: ${request_headers.query.returnPageURL + "&numOfBlocks=" + page.blocks.length}` -} - break; + } + break; case "21": -if (caption.length == 0) { - headers = "400 You must enter a caption. Please enter a caption and try again." -} else { - if (editing == "true") { - if (size.length == 0) - size = null; - - if (style.length == 0) - style = null; - session_data.pagestore.editTextBlock(docName, title, caption, size, style, position, oldPosition); - headers = `300 OK -wtv-expire-all: wtv-author:/block-preview -wtv-expire-all: wtv-author:/preview -wtv-expire-all: wtv-author:/show-blocks -wtv-expire-all: wtv-author:/edit-block -Location: wtv-author:/show-blocks?docName=${docName}` - } else { - if (size.length == 0) - size = null; - - if (style.length == 0) - style = null; - session_data.pagestore.createTextBlock(docName, title, caption, size, style, position); - headers = `300 OK -wtv-expire-all: wtv-author:/block-preview -wtv-expire-all: wtv-author:/preview -wtv-expire-all: wtv-author:/show-blocks -Location: wtv-author:/show-blocks?docName=${docName}` - } -} - break; + if (caption.length == 0) { + headers = "400 You must enter a caption. Please enter a caption and try again." + } else { + if (editing == "true") { + if (size.length == 0) + size = null; + + if (style.length == 0) + style = null; + session_data.pagestore.editTextBlock(docName, title, caption, size, style, position, oldPosition); + headers = `300 OK + wtv-expire-all: wtv-author:/block-preview + wtv-expire-all: wtv-author:/preview + wtv-expire-all: wtv-author:/show-blocks + wtv-expire-all: wtv-author:/edit-block + Location: wtv-author:/show-blocks?docName=${docName}` + } else { + if (size.length == 0) + size = null; + + if (style.length == 0) + style = null; + session_data.pagestore.createTextBlock(docName, title, caption, size, style, position); + headers = `300 OK + wtv-expire-all: wtv-author:/block-preview + wtv-expire-all: wtv-author:/preview + wtv-expire-all: wtv-author:/show-blocks + Location: wtv-author:/show-blocks?docName=${docName}` + } + } + break; case "26": - var header = request_headers.query.headingBlockText - size = request_headers.query.headingBlockSize - var dividerBefore = request_headers.query.headingBlockDividerBefore - var dividerAfter = request_headers.query.headingBlockDividerAfter -if (header.length == 0) { - headers = "400 You must enter a header. Please enter a header and try again." -} else { - if (editing == "true") { - session_data.pagestore.editHeaderBlock(docName, header, size, dividerBefore, dividerAfter, position, request_headers.query.blockNum); - headers = `300 OK + const header = request_headers.query.headingBlockText + size = request_headers.query.headingBlockSize + const dividerBefore = request_headers.query.headingBlockDividerBefore + const dividerAfter = request_headers.query.headingBlockDividerAfter + if (header.length == 0) { + headers = "400 You must enter a header. Please enter a header and try again." + } else { + if (editing == "true") { + session_data.pagestore.editHeaderBlock(docName, header, size, dividerBefore, dividerAfter, position, request_headers.query.blockNum); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: wtv-author:/show-blocks?docName=${docName}` - } else { - session_data.pagestore.createHeaderBlock(docName, header, size, dividerBefore, dividerAfter, position); - headers = `300 OK + } else { + session_data.pagestore.createHeaderBlock(docName, header, size, dividerBefore, dividerAfter, position); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks Location: wtv-author:/show-blocks?docName=${docName}` - } -} + } + } break; case "24": - if (editing == "true") { - var listItems = request_headers.query.listItemText.filter(function(e){ return e.replace(/(\r\n|\n|\r)/gm,"")}); - session_data.pagestore.editListBlock(docName, title, listItems, position, request_headers.query.blockNum); - headers = `300 OK + if (editing == "true") { + const listItems = request_headers.query.listItemText.filter(function(e){ return e.replace(/(\r\n|\n|\r)/gm,"")}); + session_data.pagestore.editListBlock(docName, title, listItems, position, request_headers.query.blockNum); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: wtv-author:/show-blocks?docName=${docName}` - } else { - var listItems = request_headers.query.listItemText.filter(function(e){ return e.replace(/(\r\n|\n|\r)/gm,"")}); - session_data.pagestore.createListBlock(docName, title, listItems, position); - headers = `300 OK + } else { + const listItems = request_headers.query.listItemText.filter(function(e){ return e.replace(/(\r\n|\n|\r)/gm,"")}); + session_data.pagestore.createListBlock(docName, title, listItems, position); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks Location: wtv-author:/show-blocks?docName=${docName}` - } - break; + } + break; case "25": - if (editing == "true") { - var listItems = request_headers.query.listItemText; - var linkItems = request_headers.query.linkItemURL; - session_data.pagestore.editLinkBlock(docName, title, listItems, linkItems, position, request_headers.query.blockNum); - headers = `300 OK + if (editing == "true") { + const listItems = request_headers.query.listItemText; + const linkItems = request_headers.query.linkItemURL; + session_data.pagestore.editLinkBlock(docName, title, listItems, linkItems, position, request_headers.query.blockNum); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: wtv-author:/show-blocks?docName=${docName}` - } else { - var listItems = request_headers.query.listItemText; - var linkItems = request_headers.query.linkItemURL; - session_data.pagestore.createLinkBlock(docName, title, listItems, linkItems, position); - headers = `300 OK + } else { + const listItems = request_headers.query.listItemText; + const linkItems = request_headers.query.linkItemURL; + session_data.pagestore.createLinkBlock(docName, title, listItems, linkItems, position); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks Location: wtv-author:/show-blocks?docName=${docName}` - } - break; + } + break; case "27": - if (editing == "true") { - session_data.pagestore.editBreakBlock(docName, position, request_headers.query.blockNum); - headers = `300 OK + if (editing == "true") { + session_data.pagestore.editBreakBlock(docName, position, request_headers.query.blockNum); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks wtv-expire-all: wtv-author:/edit-block Location: wtv-author:/show-blocks?docName=${docName}` - } else { - session_data.pagestore.createBreakBlock(docName, position); - headers = `300 OK + } else { + session_data.pagestore.createBreakBlock(docName, position); + headers = `300 OK wtv-expire-all: wtv-author:/block-preview wtv-expire-all: wtv-author:/preview wtv-expire-all: wtv-author:/show-blocks Location: wtv-author:/show-blocks?docName=${docName}` - } - break; + } + break; } diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-style.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-style.js index 6a8661dd..5e90721f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-style.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-style.js @@ -1,8 +1,8 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var page = session_data.pagestore.loadPage(docName); -var style = request_headers.query.styleName.replace (' ', '_') +const docName = request_headers.query.docName; +const page = session_data.pagestore.loadPage(docName); +const style = request_headers.query.styleName.replace (' ', '_') page.style = style; session_data.pagestore.editPage(page, docName); headers = `300 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-title.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-title.js index aa72f95e..d798a34c 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-title.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/save-title.js @@ -1,14 +1,14 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var docName = request_headers.query.docName; -var docTitle = request_headers.query.docTitle; +const docName = request_headers.query.docName; +const docTitle = request_headers.query.docTitle; if (docTitle.length == 0) { headers = "400 You must enter a title for your page. Please enter a title and try again." } else { - var pagedata = session_data.pagestore.loadPage(docName); - var description = request_headers.query.docDesc - var showtitle = request_headers.query.hideTitle + const pagedata = session_data.pagestore.loadPage(docName); + const description = request_headers.query.docDesc + const showtitle = request_headers.query.hideTitle session_data.pagestore.editMetadata(docTitle, description, showtitle, docName); headers = `300 OK diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook-add.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook-add.js index 62d58f74..207f3d96 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook-add.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook-add.js @@ -1,10 +1,10 @@ -minisrv_service_file = true; +const minisrv_service_file = true; request_is_async = true; function addToScrapbook(id, contentType, data) { - var result = session_data.addToScrapbook(id, contentType, data); + const result = session_data.addToScrapbook(id, contentType, data); if (result) { - var successScrapbook = new clientShowAlert({ + const successScrapbook = new clientShowAlert({ 'image': minisrv_config.config.service_logo, 'message': "The image has been added to your scrapbook. Would you like to view your scrapbook now?", 'buttonlabel1': "No", @@ -12,8 +12,8 @@ function addToScrapbook(id, contentType, data) { 'buttonlabel2': "Yes", 'buttonaction2': "wtv-author:/scrapbook", }) - var files = session_data.listScrapbook(); - var pageNum = Math.ceil(files.length / 6); + const files = session_data.listScrapbook(); + const pageNum = Math.ceil(files.length / 6); if (pageNum > 1) { successScrapbook.buttonaction2 += '?pageNum=' + pageNum; } @@ -24,18 +24,18 @@ function addToScrapbook(id, contentType, data) { } function handleError(reason) { - var errpage = wtvshared.doErrorPage(400, reason); + const errpage = wtvshared.doErrorPage(400, reason); sendToClient(socket, errpage[0], errpage[1]); } if (!request_headers.query.mediaData && !request_headers.query.mediaPath) { - var errpage = wtvshared.doErrorPage(400, "Bad Request", "Missing mediaData or mediaPath parameter."); + const errpage = wtvshared.doErrorPage(400, "Bad Request", "Missing mediaData or mediaPath parameter."); headers = errpage[0]; data = errpage[1]; } else { const id = session_data.getFreeScrapbookID(); if (request_headers.query.mediaPath) { if (!request_headers.query.confirm) { - var confirmScrapbook = new clientShowAlert({ + const confirmScrapbook = new clientShowAlert({ 'image': minisrv_config.config.service_logo, 'message': "You are about to add an image to your scrapbook.

Do you wish to continue?", 'buttonlabel1': "Continue", @@ -126,7 +126,7 @@ if (!request_headers.query.mediaData && !request_headers.query.mediaPath) { } } } else { - var result = session_data.addToScrapbook(id, "image/jpg", request_headers.query.mediaData); + const result = session_data.addToScrapbook(id, "image/jpg", request_headers.query.mediaData); if (result) { headers = `300 OK Content-Type: text/html diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js index f1684dee..266d9e7e 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/scrapbook.js @@ -1,9 +1,9 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; -var files = session_data.listScrapbook(); -var dir = session_data.scrapbookDir() -var pageNum = parseInt(request_headers.query.pageNum || 1); -var start = (pageNum - 1) * 6; +const files = session_data.listScrapbook(); +const dir = session_data.scrapbookDir() +const pageNum = parseInt(request_headers.query.pageNum || 1); +const start = (pageNum - 1) * 6; headers = `200 OK Connection: Keep-Alive @@ -212,7 +212,7 @@ if (files.length > 0) {
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/templates.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/templates.js index 700560d0..ac6b4394 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/templates.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/templates.js @@ -1,4 +1,4 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; headers = `302 Moved Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/welcome.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/welcome.js index 99fe4cfb..b1b69b2e 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/welcome.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/welcome.js @@ -1,4 +1,4 @@ -minisrv_service_file = true; +const minisrv_service_file = true; headers = `300 OK Content-Type: text/html Location: wtv-author:/documents diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/add.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/add.js index 7ae5064b..42be1b59 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/add.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/add.js @@ -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>/) // 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); \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js index ca18aae1..ca282e95 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-add-folder.js @@ -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) diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-arrange-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-arrange-favorites.js index 0acaa300..434d6379 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-arrange-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-arrange-favorites.js @@ -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) diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-favorites.js index 99f774b5..ebd3d4e0 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-favorites.js @@ -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}` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-folders.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-folders.js index 7a00e752..75ea5c0c 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-folders.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-discard-folders.js @@ -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` } \ No newline at end of file diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-move-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-move-favorites.js index 833ef066..35b67d12 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-move-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-move-favorites.js @@ -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]; } diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-rename-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-rename-favorites.js index 6f1ea484..08fa5e35 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-rename-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-rename-favorites.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-samples-page.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-samples-page.js index 73bd906c..a418aea4 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-samples-page.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-samples-page.js @@ -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) diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js index eb1837cf..f267f545 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/commit-shortcuts-favorites.js @@ -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); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js index b4647321..1cb88a3f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite-index.js @@ -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}` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js index 347be311..9bc5b220 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/favorite.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/get-thumbnail.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/get-thumbnail.js index 08cbaa24..bbd60832 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/get-thumbnail.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/get-thumbnail.js @@ -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"); diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/list-folders.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/list-folders.js index 5ad37958..138efe03 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/list-folders.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/list-folders.js @@ -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"; diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-add-folder-page.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-add-folder-page.js index 614ac988..e7d1479b 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-add-folder-page.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-add-folder-page.js @@ -1,4 +1,4 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-arrange-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-arrange-favorites.js index 5e7640a9..8199ff5f 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-arrange-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-arrange-favorites.js @@ -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; diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-browser.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-browser.js index d1fac7f3..a5de707d 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-browser.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-browser.js @@ -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">`; diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js index 52ac3294..461f51f7 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-choose-shortcut-favorites.js @@ -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 += ` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-favorites.js index c05f5dac..ab68d8d2 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-favorites.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-folders.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-folders.js index 523db003..07b71ca8 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-folders.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-discard-folders.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-move-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-move-favorites.js index fc3cc4ea..4608f6c0 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-move-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-move-favorites.js @@ -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++) { diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-organize-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-organize-favorites.js index c6a08de1..add4a11e 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-organize-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-organize-favorites.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-rename-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-rename-favorites.js index e33c02c2..b89a08b3 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-rename-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-rename-favorites.js @@ -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 diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-samples-page.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-samples-page.js index ba26d7f5..9ee03408 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-samples-page.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-samples-page.js @@ -1,4 +1,4 @@ -var minisrv_service_file = true; +const minisrv_service_file = true; headers = `200 OK Connection: Keep-Alive diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js index b1a62839..d1a8d454 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcut-list.js @@ -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 += ` diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js index 38060328..1dd8d1c2 100644 --- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js +++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-favorite/serve-shortcuts-favorites.js @@ -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}&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>`; } diff --git a/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js b/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js index 7730fe28..ed9887f1 100644 --- a/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js +++ b/zefie_wtvp_minisrv/includes/classes/WTVFavorites.js @@ -233,7 +233,7 @@ class WTVFavorites { const dir = this.getFolderDir(folder); if (dir) { try { - this.fs.rm(dir, { recursive: true }); + this.fs.rmSync(dir, { recursive: true }); return true; } catch (e) { return false; @@ -252,9 +252,8 @@ class WTVFavorites { } clearFolder(folder) { - const { readdirSync, rmSync } = require('fs'); - const dir = this.getFolderDir(folder); - readdirSync(dir).forEach(f => rmSync(`${dir}${f}`)); + const dir = this.getFolderDir(folder); + this.fs.readdirSync(dir).forEach(f => this.fs.rmSync(`${dir}${f}`)); } updateFavorite(favoritedata, folder) { diff --git a/zefie_wtvp_minisrv/test.js b/zefie_wtvp_minisrv/test.js index 89dbcf59..2c114ba0 100644 --- a/zefie_wtvp_minisrv/test.js +++ b/zefie_wtvp_minisrv/test.js @@ -156,8 +156,8 @@ function checkScopeErrors(file) { if (serviceName === "wtv-guide") { eslintConfig.globals["wtvguide"] = "readonly"; } - - if (service.modules) { + + if (service && service.modules) { for (const moduleName of service.modules) { eslintConfig.globals[moduleName] = "readonly"; if (moduleName === "WTVNews") {