Fixed MyServer:true in settings.
ylianst committed
Feb 14, 2021 at 22:56 UTC
aa7080c84bd9e05a62b808999de7128e82c518a9
1 file changed
+5
-5
meshuser.js
+5
-5
@@ -876,7 +876,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
876
if (user.siteadmin != SITERIGHT_ADMIN) break;
877
878
// Only accept if the console is allowed for this domain
879
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.console !== true))) break;
879
+ if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.console !== true))) break;
880
881
var r = '';
882
var cmdargs = splitArgs(command.value);
@@ -2826,7 +2826,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2826
{
2827
// Check the server version
2828
if ((user.siteadmin & 16) == 0) break;
2829
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.upgrade !== true))) break;
2829
+ if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) break;
2830
//parent.parent.getLatestServerVersion(function (currentVersion, latestVersion) { try { ws.send(JSON.stringify({ action: 'serverversion', current: currentVersion, latest: latestVersion })); } catch (ex) { } });
2831
parent.parent.getServerTags(function (tags, err) { try { ws.send(JSON.stringify({ action: 'serverversion', tags: tags })); } catch (ex) { } });
2832
break;
@@ -2835,7 +2835,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2835
{
2836
// Perform server update
2837
if ((user.siteadmin & 16) == 0) break;
2838
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.upgrade !== true))) break;
2838
+ if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.upgrade !== true))) break;
2839
if ((command.version != null) && (typeof command.version != 'string')) break;
2840
parent.parent.performServerUpdate(command.version);
2841
break;
@@ -2844,7 +2844,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
2844
{
2845
// Load the server error log
2846
if ((user.siteadmin & 16) == 0) break;
2847
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.errorlog !== true))) break;
2847
+ if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.errorlog !== true))) break;
2848
fs.readFile(parent.parent.getConfigFilePath('mesherrors.txt'), 'utf8', function (err, data) { try { ws.send(JSON.stringify({ action: 'servererrors', data: data })); } catch (ex) { } });
2849
break;
2850
}
@@ -5026,7 +5026,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5026
}
5027
case 'traceinfo': {
5028
// Only accept if the tracing tab is allowed for this domain
5029
- if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver.trace !== true))) break;
5029
+ if ((domain.myserver === false) || ((domain.myserver != null) && (domain.myserver !== true) && (domain.myserver.trace !== true))) break;
5030
5031
if ((user.siteadmin === SITERIGHT_ADMIN) && (typeof command.traceSources == 'object')) {
5032
parent.parent.debugRemoteSources = command.traceSources;