major fix in app.js, also fix favorites
This commit is contained in:
@@ -919,7 +919,12 @@ async function processURL(socket, request_headers, pc_services = false) {
|
||||
request_headers.query = {};
|
||||
|
||||
if (request_headers.request_url) {
|
||||
service_name = socket.service_name;
|
||||
service_name = socket.service_name || verifyServicePort(unescape(request_headers.request_url).split(':/')[0], socket);
|
||||
if (minisrv_config.services[service_name]) {
|
||||
allow_double_slash = minisrv_config.services[service_name].allow_double_slash || false;
|
||||
enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
|
||||
use_external_proxy = minisrv_config.services[service_name].use_external_proxy || false;
|
||||
}
|
||||
if (pc_services) {
|
||||
original_service_name = socket.service_name; // store service name
|
||||
service_name = verifyServicePort(socket.service_name, socket); // get the actual ServiceVault path
|
||||
@@ -934,6 +939,7 @@ async function processURL(socket, request_headers, pc_services = false) {
|
||||
const k = qraw_split[0];
|
||||
const value = unescape(qraw_split[1].replace(/\+/g, "%20"));
|
||||
if (request_headers.query[k] && enable_multi_query) {
|
||||
console.log("yes")
|
||||
if (typeof request_headers.query[k] === 'string') {
|
||||
request_headers.query[k] = [request_headers.query[k]];
|
||||
}
|
||||
@@ -1067,15 +1073,7 @@ minisrv-no-mail-count: true`;
|
||||
var ssl = (socket.ssl) ? true : false;
|
||||
if (original_service_name == service_name) console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + service_name + " for " + request_headers.request_url, 'on', socket.id);
|
||||
else console.log(" * " + ((ssl) ? "SSL " : "") + "PC request on service " + original_service_name + " (Service Vault " + service_name + ") for " + request_headers.request_url, 'on', socket.id);
|
||||
} else {
|
||||
var service_name = verifyServicePort(shortURL.split(':/')[0], socket);
|
||||
}
|
||||
if (minisrv_config.services[service_name]) {
|
||||
allow_double_slash = minisrv_config.services[service_name].allow_double_slash || false;
|
||||
enable_multi_query = minisrv_config.services[service_name].enable_multi_query || false;
|
||||
use_external_proxy = minisrv_config.services[service_name].use_external_proxy || false;
|
||||
}
|
||||
|
||||
|
||||
if ((shortURL.includes(':/')) && (!shortURL.includes('://') || (shortURL.includes('://') && allow_double_slash))) {
|
||||
var ssid = socket.ssid;
|
||||
|
||||
@@ -90,7 +90,7 @@ class WTVFavorites {
|
||||
var self = this;
|
||||
if (folder_templates[folder]) {
|
||||
Object.keys(folder_templates[folder]).forEach(function (k) {
|
||||
self.createFavorite(folder_templates[folder][k].title, folder_templates[folder][k].url, folder, (folder_templates[folder][k].image_type == "image/wtv-bitmap") ? btoa(folder_templates[folder][k].image) : folder_templates[folder][k].image, folder_templates[folder][k].image_type);
|
||||
self.createFavorite(folder_templates[folder][k].title, folder_templates[folder][k].url, folder, (folder_templates[folder][k].image_type == "image/wtv-bitmap") ? atob(folder_templates[folder][k].image) : folder_templates[folder][k].image, folder_templates[folder][k].image_type);
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -149,7 +149,7 @@ class WTVFavorites {
|
||||
var favoritefile = favoriteid + this.favFileExt;
|
||||
var favoritefileout = folderpath + favoritefile;
|
||||
if (imagetype != "url")
|
||||
image = atob(image);
|
||||
image = btoa(image);
|
||||
|
||||
title = decodeURIComponent(title).replaceAll("+", " ");
|
||||
url = decodeURIComponent(url)
|
||||
|
||||
Reference in New Issue
Block a user