mirror of
https://github.com/Ylianst/MeshCentral.git
synced 2024-12-24 06:05:53 -05:00
Fixed terminal CTRL-D in vi
This commit is contained in:
parent
79dc1fd76e
commit
b734e17362
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "meshcentral",
|
"name": "meshcentral",
|
||||||
"version": "0.3.2-h",
|
"version": "0.3.2-i",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"Remote Management",
|
"Remote Management",
|
||||||
"Intel AMT",
|
"Intel AMT",
|
||||||
|
@ -356,6 +356,16 @@ var CreateAmtRemoteTerminal = function (divid) {
|
|||||||
for (var z = 0; z < obj.width; z++) { _tscreen[y][z] = ' '; _scratt[y][z] = (7 << 6); }
|
for (var z = 0; z < obj.width; z++) { _tscreen[y][z] = ' '; _scratt[y][z] = (7 << 6); }
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'M': // Delete X lines, default 1
|
||||||
|
var x = 1;
|
||||||
|
if (argslen == 1) { x = args[0] }
|
||||||
|
for (var y = _termy; y <= _scrollRegion[1] - x; y++) {
|
||||||
|
for (var z = 0; z < obj.width; z++) { _tscreen[y][z] = _tscreen[y + x][z]; _scratt[y][z] = _scratt[y + x][z]; }
|
||||||
|
}
|
||||||
|
for (var y = _scrollRegion[1] - x + 1; y < _scrollRegion[1]; y++) {
|
||||||
|
for (var z = 0; z < obj.width; z++) { _tscreen[y][z] = ' '; _scratt[y][z] = (7 << 6); }
|
||||||
|
}
|
||||||
|
break;
|
||||||
case 'T': // Scroll down the scroll region X lines, default 1
|
case 'T': // Scroll down the scroll region X lines, default 1
|
||||||
var x = 1;
|
var x = 1;
|
||||||
if (argslen == 1) { x = args[0] }
|
if (argslen == 1) { x = args[0] }
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -249,10 +249,10 @@
|
|||||||
<br style=clear:both />
|
<br style=clear:both />
|
||||||
</div>
|
</div>
|
||||||
<strong>Device Groups</strong>
|
<strong>Device Groups</strong>
|
||||||
( <a onclick=account_createMesh() style=cursor:pointer><img src="images/icon-addnew.png" width=12 height=12 border=0 /> New</a> )
|
<span id="p3createMeshLink1">( <a onclick=account_createMesh() style=cursor:pointer><img src="images/icon-addnew.png" width=12 height=12 border=0 /> New</a> )</span>
|
||||||
<br /><br />
|
<br /><br />
|
||||||
<div id=p3meshes></div>
|
<div id=p3meshes></div>
|
||||||
<div id=p3noMeshFound style=margin-left:9px;display:none>No device groups. <a onclick=account_createMesh() style=cursor:pointer><strong>Get started here!</strong></a></div>
|
<div id=p3noMeshFound style=margin-left:9px;display:none>No device groups.<span id="p3createMeshLink2"> <a onclick=account_createMesh() style=cursor:pointer><strong>Get started here!</strong></a></span></div>
|
||||||
<br style=clear:both />
|
<br style=clear:both />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -655,6 +655,10 @@
|
|||||||
QV('manageAuthApp', features & 4096);
|
QV('manageAuthApp', features & 4096);
|
||||||
QV('manageOtp', ((features & 4096) != 0) && ((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0)));
|
QV('manageOtp', ((features & 4096) != 0) && ((userinfo.otpsecret == 1) || (userinfo.otphkeys > 0)));
|
||||||
|
|
||||||
|
// On the mobile app, don't allow group creation (for now).
|
||||||
|
QV('p3createMeshLink1', false);
|
||||||
|
QV('p3createMeshLink2', false);
|
||||||
|
|
||||||
if (typeof userinfo.passchange == 'number') {
|
if (typeof userinfo.passchange == 'number') {
|
||||||
if (userinfo.passchange == -1) { QH('p2nextPasswordUpdateTime', ' - Reset on next login.'); }
|
if (userinfo.passchange == -1) { QH('p2nextPasswordUpdateTime', ' - Reset on next login.'); }
|
||||||
else if ((passRequirements != null) && (typeof passRequirements.reset == 'number')) {
|
else if ((passRequirements != null) && (typeof passRequirements.reset == 'number')) {
|
||||||
@ -1165,6 +1169,9 @@
|
|||||||
function account_createMesh() {
|
function account_createMesh() {
|
||||||
if (xxdialogMode) return;
|
if (xxdialogMode) return;
|
||||||
|
|
||||||
|
// Check if we are disallowed from creating a device group
|
||||||
|
if ((userinfo.siteadmin != 0xFFFFFFFF) && ((userinfo.siteadmin & 64) != 0)) { setDialogMode(2, "New Device Group", 1, null, "This account does not have the rights to create a new device group."); return; }
|
||||||
|
|
||||||
// Remind the user to verify the email address
|
// Remind the user to verify the email address
|
||||||
if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until a email address is verified. This is required for password recovery. Go to the \"My Account\" to change and verify an email address."); return; }
|
if ((userinfo.emailVerified !== true) && (serverinfo.emailcheck == true) && (userinfo.siteadmin != 0xFFFFFFFF)) { setDialogMode(2, "Account Security", 1, null, "Unable to access a device until a email address is verified. This is required for password recovery. Go to the \"My Account\" to change and verify an email address."); return; }
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user