-
diff --git a/views/download.handlebars b/views/download.handlebars
index 57831e5e..e965fa05 100644
--- a/views/download.handlebars
+++ b/views/download.handlebars
@@ -14,18 +14,18 @@
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}
{{{logoutControl}}}
-
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}
Download
-{{{message}}}
+
+
+
+
|
+ ||
|
+
+
+ {{{footer}}}
+ {{{rootCertLink}}} Terms & Privacy
+ |
+
+
-
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}
diff --git a/views/error4042.handlebars b/views/error4042.handlebars
new file mode 100644
index 00000000..4510edec
--- /dev/null
+++ b/views/error4042.handlebars
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+ {{{title1}}} - Download
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/views/invite.handlebars b/views/invite.handlebars
index c9d1719d..21201b30 100644
--- a/views/invite.handlebars
+++ b/views/invite.handlebars
@@ -48,12 +48,12 @@
+
diff --git a/views/message.handlebars b/views/message.handlebars
index 979080cb..3c430c4a 100644
--- a/views/message.handlebars
+++ b/views/message.handlebars
@@ -15,12 +15,12 @@
+ |
+ 404
+ This page does not exist
+
+ |
+
|
+
+
+ {{{footer}}}
+ {{{rootCertLink}}} Terms & Privacy
+ |
+
-
diff --git a/views/login2.handlebars b/views/login2.handlebars
index 130a652c..31e03723 100644
--- a/views/login2.handlebars
+++ b/views/login2.handlebars
@@ -18,21 +18,10 @@
background: linear-gradient(to bottom right, #369, #036);
}
- #flink a:link {
- color: #c8c8c8;
- }
-
- #flink a:visited {
- color: #c8c8c8;
- }
-
- #flink a:hover {
- color: #c8c8c8;
- }
-
- #flink a:active {
- color: #c8c8c8;
- }
+ #flink a:link { color: #c8c8c8; }
+ #flink a:visited { color: #c8c8c8; }
+ #flink a:hover { color: #c8c8c8; }
+ #flink a:active { color: #c8c8c8; }
@@ -140,15 +129,15 @@
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}
{{{logoutControl}}}
Account Reset
- | Email: | -+ | + + |
| - - + | + | |
-
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}
diff --git a/views/terms.handlebars b/views/terms.handlebars
index 4b3dad22..a0206783 100644
--- a/views/terms.handlebars
+++ b/views/terms.handlebars
@@ -15,12 +15,12 @@
-
diff --git a/webserver.js b/webserver.js
index 09ab4fe3..b9a3f23e 100644
--- a/webserver.js
+++ b/webserver.js
@@ -2459,7 +2459,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
if (domain.customui != null) { customui = encodeURIComponent(JSON.stringify(domain.customui)); }
// Render the login page
- render(req, res, getRenderPage('login', req, domain), getRenderArgs({ loginmode: loginmode, rootCertLink: getRootCertLink(), newAccount: newAccountsAllowed, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.getWebServerName(domain), serverPublicPort: httpsPort, emailcheck: emailcheck, features: features, sessiontime: args.sessiontime, passRequirements: passRequirements, customui: customui, footer: (domain.footer == null) ? '' : domain.footer, hkey: encodeURIComponent(hardwareKeyChallenge).replace(/'/g, '%27'), messageid: msgid, passhint: passhint, welcometext: domain.welcometext ? encodeURIComponent(domain.welcometext).split('\'').join('\\\'') : null, hwstate: hwstate, otpemail: otpemail, otpsms: otpsms, twoFactorCookieDays: twoFactorCookieDays, authStrategies: authStrategies.join(',') }, req, domain));
+ render(req, res, getRenderPage((domain.sitestyle == 2)?'login2':'login', req, domain), getRenderArgs({ loginmode: loginmode, rootCertLink: getRootCertLink(), newAccount: newAccountsAllowed, newAccountPass: (((domain.newaccountspass == null) || (domain.newaccountspass == '')) ? 0 : 1), serverDnsName: obj.getWebServerName(domain), serverPublicPort: httpsPort, emailcheck: emailcheck, features: features, sessiontime: args.sessiontime, passRequirements: passRequirements, customui: customui, footer: (domain.footer == null) ? '' : domain.footer, hkey: encodeURIComponent(hardwareKeyChallenge).replace(/'/g, '%27'), messageid: msgid, passhint: passhint, welcometext: domain.welcometext ? encodeURIComponent(domain.welcometext).split('\'').join('\\\'') : null, hwstate: hwstate, otpemail: otpemail, otpsms: otpsms, twoFactorCookieDays: twoFactorCookieDays, authStrategies: authStrategies.join(',') }, req, domain));
}
// Handle a post request on the root
@@ -2780,10 +2780,12 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
}
try { res.sendFile(obj.path.resolve(__dirname, path)); } catch (e) { res.sendStatus(404); }
} else {
- render(req, res, getRenderPage('download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "" + filename + ", " + stat.size + " byte" + ((stat.size < 2) ? '' : 's') + "." }, req, domain));
+ render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), messageid: 1, fileurl: req.path + '?download=1', filename: filename, filesize: stat.size }, req, domain));
+ //render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "" + filename + ", " + stat.size + " byte" + ((stat.size < 2) ? '' : 's') + "." }, req, domain));
}
} else {
- render(req, res, getRenderPage('download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "Invalid file link, please check the URL again." }, req, domain));
+ render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), messageid: 2 }, req, domain));
+ //render(req, res, getRenderPage((domain.sitestyle == 2) ? 'download2' : 'download', req, domain), getRenderArgs({ rootCertLink: getRootCertLink(), message: "Invalid file link, please check the URL again." }, req, domain));
}
}
@@ -5116,6 +5118,9 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
});
});
+ // Allows agents to transfer files
+ obj.agentapp.ws(url + 'devicefile.ashx', function (ws, req) { obj.meshDeviceFileHandler.CreateMeshDeviceFile(obj, ws, null, req, domain); });
+
// Setup agent to/from server file transfer handler
obj.agentapp.ws(url + 'agenttransfer.ashx', handleAgentFileTransfer); // Setup agent to/from server file transfer handler
}
@@ -5143,7 +5148,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
var domain = getDomain(req);
if ((domain == null) || (domain.auth == 'sspi')) { res.sendStatus(404); return; }
if ((domain.loginkey != null) && (domain.loginkey.indexOf(req.query.key) == -1)) { res.sendStatus(404); return; } // Check 3FA URL key
- res.status(404).render(getRenderPage('error404', req, domain), getRenderArgs({}, req, domain));
+ res.status(404).render(getRenderPage((domain.sitestyle == 2) ? 'error4042' : 'error404', req, domain), getRenderArgs({}, req, domain));
});
}
{{{titlehtml}}}
+ {{{titlehtml}}}
- {{{title1}}}
+ {{{title1}}}
- {{{title2}}}
+ {{{title2}}}