Ylianst/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2024-11-22 12:52:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Linux install script to accept cookies in addition to meshid.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2020-06-23 12:11:15 -07:00
parent 45216ef48d
commit 3de4a33d1c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agents/meshinstall-linux.sh
View File

@ -55,7 +55,7 @@ CheckInstallAgent() {
url=$1 url=$1
meshid=$2 meshid=$2
meshidlen=${#meshid} meshidlen=${#meshid}
if [ $meshidlen -eq 64 ] if [ $meshidlen -gt 63 ]
then then
machineid=0 machineid=0
machinetype=$( uname -m ) machinetype=$( uname -m )
@ -118,7 +118,7 @@ CheckInstallAgent() {
fi fi
else else
echo "MeshID is not correct, must be 64 characters long." echo "MeshID is not correct, must be at least 64 characters long."
fi fi
else else
echo "URI and/or MeshID have not been specified, must be passed in as arguments." echo "URI and/or MeshID have not been specified, must be passed in as arguments."

12
views/player.handlebars
View File

@ -260,7 +260,7 @@
else if (recFileMetadata.protocol == 101) { else if (recFileMetadata.protocol == 101) {
// Intel AMT Redirection // Intel AMT Redirection
recFileProtocol = 101; recFileProtocol = 101;
x += '<br /><br /><span style=color:gray>Press [space] to play/pause.</span>'; x += '<br /><br /><span style=color:gray>' + "Press [space] to play/pause." + '</span>';
QE('PlayButton', true); QE('PlayButton', true);
QE('PauseButton', false); QE('PauseButton', false);
QE('RestartButton', false); QE('RestartButton', false);
@ -275,7 +275,7 @@
else if (recFileMetadata.protocol == 200) { else if (recFileMetadata.protocol == 200) {
// Intel AMT Midstream KVM // Intel AMT Midstream KVM
recFileProtocol = 200; recFileProtocol = 200;
x += '<br /><br /><span style=color:gray>Press [space] to play/pause.</span>'; x += '<br /><br /><span style=color:gray>' + "Press [space] to play/pause." + '</span>';
QE('PlayButton', true); QE('PlayButton', true);
QE('PauseButton', false); QE('PauseButton', false);
QE('RestartButton', false); QE('RestartButton', false);
@ -367,6 +367,14 @@
} }
} }
// This is a PNG screenshot of the display, load it and render it.
if ((type == 3) && (recFileProtocol == 200)) {
var tile = new Image();
tile.src = "data:image/png;base64," + btoa(data);
tile.onload = function () { amtDesktop.canvas.drawImage(tile, 0, 0); }
tile.error = function () { }
}
if (playing) { readNextBlock(processBlock); } if (playing) { readNextBlock(processBlock); }
} }