external/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-03-09 15:40:18 +00:00
Code Issues Releases Wiki Activity

Fix for incorrect MeshMessenger URL when using a multi-domain server. #2882

Browse source
This commit is contained in:
Ylian Saint-Hilaire 2021-07-09 15:36:16 -07:00
parent 2a3f55f9fd
commit 913ed9f033
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
views/default-mobile.handlebars
View file

@ -3694,6 +3694,7 @@
if (xxdialogMode) return;
setDialogMode(2, "Device Action", 3, function () {
var url = '/messenger?id=meshmessenger/' + encodeURIComponentEx(currentNode._id) + '/' + encodeURIComponentEx(userinfo._id) + '&title=' + currentNode.name;
if (serverinfo.domainsuffix != '') { url = '/' + serverinfo.domainsuffix + url; }
if ((authCookie != null) && (authCookie != '')) { url += '&auth=' + authCookie; }
if (e && (e.shiftKey == true)) {
safeNewWindow(url, 'meshmessenger:' + currentNode._id);

1
views/default.handlebars
View file

@ -6913,6 +6913,7 @@
function deviceChat(e) {
if (xxdialogMode) return;
var url = '/messenger?id=meshmessenger/' + encodeURIComponentEx(currentNode._id) + '/' + encodeURIComponentEx(userinfo._id) + '&title=' + currentNode.name;
if (serverinfo.domainsuffix != '') { url = '/' + serverinfo.domainsuffix + url; }
if ((authCookie != null) && (authCookie != '')) { url += '&auth=' + authCookie; }
if ((currentNode.pmt == 1) && ((features2 & 2) != 0)) { url += '&pmt=1'; } // Push messaging is possible for this device
if (e && (e.shiftKey == true)) {