Merge 1c37514962 into b90b2ac0bf

add RDP to device context menu #6401
Signed-off-by: si458 <simonsmith5521@gmail.com>
2024-11-20 17:18:57 +03:00 · 2024-09-26 13:07:54 -07:00 · 2024-09-26 19:51:06 +01:00 · 2024-09-26 19:21:25 +01:00
3 changed files with 19 additions and 7 deletions
--- a/translate/translate.json
+++ b/translate/translate.json
@ -61827,7 +61827,8 @@
        "default.handlebars->47->1042",
        "default.handlebars->47->439",
        "default.handlebars->47->998",
-        "default.handlebars->container->dialog->dialogBody->dialog7->1->td7rdpkvm"
+        "default.handlebars->container->dialog->dialogBody->dialog7->1->td7rdpkvm",
+        "default.handlebars->contextMenu->cxrdp"
      ]
    },
    {
--- a/views/default-mobile.handlebars
+++ b/views/default-mobile.handlebars
@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <meta charset="utf-8">
@ -2694,7 +2694,7 @@
                    d3filetreelocation2.push(d3filetreelocation[i]);
                    if ((folderdepth == 1)) {
                        var sp = d3filetreelocation[i].split('/');
-                        publicPath = window.location + sp[0] + 'files/' + sp[2];
+                        publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2];
                        if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); }
                    } else {
                        if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
@ -2788,7 +2788,7 @@
                    fullPath += ' / ' + filetreelocation[i];
                    if ((folderdepth == 1)) {
                        var sp = filetreelocation[i].split('/');
-                        publicPath = window.location + sp[0] + 'files/' + sp[2];
+                        publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2];
                        //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); }
                        filetreelinkpath += filetreelocation[i];
                    } else {
--- a/views/default.handlebars
+++ b/views/default.handlebars
@ -64,6 +64,7 @@
        <div id="cxwebrdp" class="cmtext" onclick="cmaction(11,event)">Web-RDP</div>
        <div id="cxwebvnc" class="cmtext" onclick="cmaction(12,event)">Web-VNC</div>
        <div id="cxwebssh" class="cmtext" onclick="cmaction(13,event)">Web-SSH</div>
+        <div id="cxrdp" class="cmtext" onclick="cmaction(14,event)">RDP</div>
        <div id="cxplugins" class="cmtext" onclick="cmaction(8,event)" style="display:none">Plugins</div>
        <hr id="cxmgroupsplit" />
        <div id="cxstar" class="cmtext" onclick="cmaction(10,event)" style="display:none">Toggle Star</div>
@ -6448,7 +6449,16 @@
                    QV('cxwebrdp', ((((node.conn & 1) != 0) || (node.mtype == 3)) && (node.agent) && ((rights & 8) != 0) && ((features & 0x40000000) == 0)));
                    QV('cxwebssh', ((features2 & 0x200) && (((node.conn & 1) != 0) || (node.mtype == 3)) && (node.agent) && ((rights & 8) != 0)));
                    QV('cxconsole', (consoleRights && (node.mtype == 2) && ((node.agent == null) || (node.agent.caps == null) || ((node.agent.caps & 8) != 0))) && (rights & 8));
-
+                    QV('cxrdp', false); // always have the RDP hidden
+                    if ((((node.conn & 1) != 0) || (node.mtype == 3)) && (node.agent) && ((rights & 8) != 0)) {
+                        if ((node.agent.id > 0) && (node.agent.id < 5)) {
+                            if (navigator.platform.toLowerCase() == 'win32') {
+                                if ((serverinfo.devicemeshrouterlinks == null) || (serverinfo.devicemeshrouterlinks.rdp != false)) {
+                                    QV('cxrdp', true);
+                                }
+                            }
+                        }
+                    }
                    QV('cxmgroupsplit', true);
                    QV('cxstar', true);
                    break;
@ -6516,6 +6526,7 @@
            else if (action == 11) { p10mstsc(nodeid); } // Web-RDP
            else if (action == 12) { p10rfb(nodeid); } // Web-VNC
            else if (action == 13) { p10ssh(nodeid); } // Web-SSH
+            else if (action == 14) { p10MCRouter(nodeid,3); } // RDP
        }

        function cmmeshaction(action) {
@ -14729,7 +14740,7 @@
                    fullPath += ' / ' + filetreelocation[i];
                    if ((folderdepth == 1)) {
                        var sp = filetreelocation[i].split('/');
-                        publicPath = (("" + window.location).split('?')[0]) + sp[0] + 'files/' + sp[2];
+                        publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2];
                        //if (filetreelocation[i] === userinfo._id) { filetreelinkpath += 'self'; } else { filetreelinkpath += (sp[0] + '/' + sp[2]); }
                        filetreelinkpath += filetreelocation[i];
                    } else {
@ -17394,7 +17405,7 @@
                    d3filetreelocation2.push(d3filetreelocation[i]);
                    if ((folderdepth == 1)) {
                        var sp = d3filetreelocation[i].split('/');
-                        publicPath = window.location + sp[0] + 'files/' + sp[2];
+                        publicPath = window.location.origin + '/' + sp[0] + 'files/' + sp[2];
                        if (d3filetreelocation[i] === userinfo._id) { d3filetreelinkpath += 'self'; } else { d3filetreelinkpath += (sp[0] + '/' + sp[2]); }
                    } else {
                        if (d3filetreelinkpath != '') { d3filetreelinkpath += '/' + d3filetreelocation[i]; if (folderdepth > 2) { publicPath += '/' + d3filetreelocation[i]; } }
Author	SHA1	Message	Date
Josiah Baldwin	27e657be49	Merge `1c37514962` into `b90b2ac0bf`	2024-09-26 13:07:54 -07:00
si458	b90b2ac0bf	add RDP to device context menu #6401 Signed-off-by: si458 <simonsmith5521@gmail.com>	2024-09-26 19:51:06 +01:00
si458	39a1755b3d	fix 404 on public files with /login url #6406 Signed-off-by: si458 <simonsmith5521@gmail.com>	2024-09-26 19:21:25 +01:00