';
}
@@ -7255,7 +7255,7 @@
for (var i = 0; i < checkboxes.length; i++) {
if (checkboxes[i].checked) {
if (p13filetree.dir[checkboxes[i].value].s <= 204800) {
- p13downloadfile(encodeURIComponent(p13filetreelocation.join('/') + '/' + p13filetree.dir[checkboxes[i].value].n), encodeURIComponent(p13filetree.dir[checkboxes[i].value].n), p13filetree.dir[checkboxes[i].value].s, 'viewer');
+ p13downloadfile(encodeURIComponentEx(p13filetreelocation.join('/') + '/' + p13filetree.dir[checkboxes[i].value].n), encodeURIComponentEx(p13filetree.dir[checkboxes[i].value].n), p13filetree.dir[checkboxes[i].value].s, 'viewer');
} else { messagebox("File Editor", "Only files less than 200k can be edited."); }
break;
}
@@ -7622,7 +7622,7 @@
var msg = EscapeHtml(event.msg).split('(R)').join('®');
if (event.username) {
if ((userinfo.siteadmin & 2) && (event.userid)) {
- msg = '' + EscapeHtml(event.username) + ' → ' + msg;
+ msg = '' + EscapeHtml(event.username) + ' → ' + msg;
} else {
msg = EscapeHtml(event.username) + ' → ' + msg;
}
@@ -8579,7 +8579,7 @@
x += addHtmlValue("Intel® AMT", addLinkConditional(intelAmtPolicy, 'p20editMeshAmt()', meshrights & 1));
// Display group note support
- if (meshrights & 1) { x += ' '; }
+ if (meshrights & 1) { x += ' '; }
x += '
';
if (meshrights & 2) {
@@ -8625,14 +8625,14 @@
var trash = '', r = sortedusers[i].rights, rights = makeDeviceGroupRightsString(r), icon = 2;
if ((sortedusers[i].id != userinfo._id) && (meshrights == 0xFFFFFFFF || (((meshrights & 2) != 0)))) {
if ((meshrights == 0xFFFFFFFF) || (currentMesh.links[sortedusers[i].id].rights != 0xFFFFFFFF)) {
- trash = '';
+ trash = '';
}
- rights = '' + rights + ' ';
+ rights = '' + rights + ' ';
}
if (sortedusers[i].id.startsWith('ugrp/')) { icon = 4; }
var username = EscapeHtml(decodeURIComponent(sortedusers[i].name));
- if ((usergroups != null) && sortedusers[i].id.startsWith('ugrp/')) { username = '' + username + ''; }
- if ((users != null) && sortedusers[i].id.startsWith('user/')) { username = '' + username + ''; }
+ if ((usergroups != null) && sortedusers[i].id.startsWith('ugrp/')) { username = '' + username + ''; }
+ if ((users != null) && sortedusers[i].id.startsWith('user/')) { username = '' + username + ''; }
x += '
' + username + '
' + trash + '
' + rights + '
';
++count;
}
@@ -8845,7 +8845,7 @@
var y = '';
if (selected == null) {
var omeshs = getOrderedList(meshes, 'name');
- for (var i in omeshs) { if ((currentUser.links == null) || (currentUser.links[omeshs[i]._id] == null)) { y += ''; } }
+ for (var i in omeshs) { if ((currentUser.links == null) || (currentUser.links[omeshs[i]._id] == null)) { y += ''; } }
} else {
y += '';
}
@@ -8854,14 +8854,14 @@
if (usergroups == null) return;
var y = '';
var ousergroups = getOrderedList(usergroups, 'name');
- for (var i in ousergroups) { if ((currentMesh.links == null) || (currentMesh.links[ousergroups[i]._id] == null)) { y += ''; } }
+ for (var i in ousergroups) { if ((currentMesh.links == null) || (currentMesh.links[ousergroups[i]._id] == null)) { y += ''; } }
x += addHtmlValue("User Group", '');
} else if (userid == 6) {
if (usergroups == null) return;
var y = '';
if (selected == null) {
var ousergroups = getOrderedList(usergroups, 'name');
- for (var i in ousergroups) { if ((currentNode.links == null) || (currentNode.links[ousergroups[i]._id] == null)) { y += ''; } }
+ for (var i in ousergroups) { if ((currentNode.links == null) || (currentNode.links[ousergroups[i]._id] == null)) { y += ''; } }
} else {
y += '';
}
@@ -8870,7 +8870,7 @@
var y = '';
if (selected) { selected = decodeURIComponent(selected); }
var omeshs = getOrderedList(meshes, 'name');
- for (var i in omeshs) { if ((selected != null) || (currentUserGroup.links == null) || (currentUserGroup.links[omeshs[i]._id] == null)) { y += ''; } }
+ for (var i in omeshs) { if ((selected != null) || (currentUserGroup.links == null) || (currentUserGroup.links[omeshs[i]._id] == null)) { y += ''; } }
x += addHtmlValue("Device Group", '');
} else if ((userid == 4) || (userid == 7)) {
var y = '', selectedMeshId = null, selectedNode = null;
@@ -8878,13 +8878,13 @@
var omeshs = getOrderedList(meshes, 'name');
for (var i in omeshs) {
if ((omeshs[i].links[userinfo._id] != null) && (omeshs[i].links[userinfo._id].rights & 7)) { // Only show device groups that we have user administrator for.
- if (selectedMeshId == null) { selectedMeshId = omeshs[i]._id; } y += '';
+ if (selectedMeshId == null) { selectedMeshId = omeshs[i]._id; } y += '';
}
}
x += addHtmlValue("Device Group", '');
y = '';
var onodes = getOrderedList(nodes, 'name');
- for (var i in onodes) { if (onodes[i].meshid == selectedMeshId) { y += ''; } }
+ for (var i in onodes) { if (onodes[i].meshid == selectedMeshId) { y += ''; } }
x += addHtmlValue("Device", '');
} else {
userid = decodeURIComponent(userid);
@@ -9002,7 +9002,7 @@
function p20changeMeshAddMeshUserDialog(userid) {
var y = '', meshid = decodeURIComponent(Q('dp2meshid').value);
- for (var i in nodes) { if (nodes[i].meshid == meshid) { y += ''; } }
+ for (var i in nodes) { if (nodes[i].meshid == meshid) { y += ''; } }
QH('dp2nodeid', y);
p20validateAddMeshUserDialog(userid);
}
@@ -9069,7 +9069,7 @@
}
if ((exactMatch == false) && (matchingUsers.length > 0)) {
var x = '';
- for (var i in matchingUsers) { x += '' + matchingUsers[i] + ' '; }
+ for (var i in matchingUsers) { x += '' + matchingUsers[i] + ' '; }
QH('dp20usersuggest', x);
showsuggestbox = true;
}
@@ -9501,11 +9501,11 @@
var h = '';
if (f.t < 3 || f.t == 4) {
var right = (f.t == 1 || f.t == 4)?p5getQuotabar(f):'', title = '';
- h = '