@cryptotaxi247 / MeshCentral / commits / 046c59fa

Updated all MeshAgents.

Ylian Saint-Hilaire committed Aug 3, 2020 at 14:00 UTC 046c59fa2c0575dacdd88765cf1f27c1b67d17b8
25 files changed +108 -87
agents/MeshCmd-signed.exe
Binary files a/agents/MeshCmd-signed.exe and b/agents/MeshCmd-signed.exe differ
agents/MeshCmd64-signed.exe
Binary files a/agents/MeshCmd64-signed.exe and b/agents/MeshCmd64-signed.exe differ
agents/MeshService-signed.exe
Binary files a/agents/MeshService-signed.exe and b/agents/MeshService-signed.exe differ
agents/MeshService.exe
Binary files a/agents/MeshService.exe and b/agents/MeshService.exe differ
agents/MeshService64-signed.exe
Binary files a/agents/MeshService64-signed.exe and b/agents/MeshService64-signed.exe differ
agents/MeshService64.exe
Binary files a/agents/MeshService64.exe and b/agents/MeshService64.exe differ
agents/hashagents.txt
+16 -16
@@ -1,33 +1,33 @@
1 3: MeshService-signed.exe
2 -15B19C5D60155EBC824E19BC21FA7D20351F368CE5C923D265EAD7F43B1D8854EF0DBBE57AB26493F82E36CB142E0B24
2 +C04FA82B33290FE52C732165834EA4B5491E6982A2671C0FF51DB447CA50434CC38515AA15D40D20C105CF2C13BA9D02
3 4: MeshService64-signed.exe
4 -402941EA92A70CA80F3A5149162E2D373344001B5389D6CFC3B995A2BD1D9C763099C566615E57029D707F4E757350E7
4 +45A86F19CCE1BE657A37AA4D2E2F10DED27337EA34FA6195DBAAF9CAF642195FC8059684E20DDC92CDFB56C60C3BD8C3
5 5: meshagent_x86
6 -715186A078EE4AF74C05EE4084BB7BBBE4DEF4F3A24664ED0EA79F2E1B95B160697FD3C538CA519D619BBF2DE5311AB8
6 +3EA390454CE039823B735D61EEF5A5BC39AD656BE156BC3C3E818DF2BB3F1442CDC0146A222E7C37F14D23CAF070AECE
7 6: meshagent_x86-64
8 -F7117FBA95A0C132C730E1F29B13E281A387A6615AFD295C702271868EFDACAE598EE7167DA7FDCC7112E3B5FD5C9CDF
8 +64FD1D49A16017F8C86EB0054236427E3AEC3B31BD35EAF8B372ADF451F284142360480B325A2CC203CFA95B069211ED
9 9: meshagent_arm
10 -7AE1AA999B86E5CF67C8F3F5CE9D1E7981FF3F5299B514A21ED460A8B4D3786FD523B68D92D32E0258D449573DB50E0F
10 +25DDBBB570AA5F0EC1E7CDF10D35299089BB32785CE530139544AF04350390C7029A104DE840E98D719B4B1905ECE749
11 7: meshagent_mips
12 -43616A92F8373984B96E8F71CF9211E29582CFC1E035E5739B65C99CF001F16BA53C3AAB8AD2657AFAA45341C10BD055
12 +7A9C9E622DAEC35013724A8A92D8BC5D944EA18E530A9E89A7E9B2719D112577B6CF3932560A1B64382E1129BEDE64E7
13 13: meshagent_pogo
14 -4B5918296BCA88DC3654EEFC6AF3E1722A9BE8AA83174925D1B8598D5186A09EFC7003F24A049B7970BCAE1043120621
14 +1D4B5C066F249B9863A3194C72FD24F279AD7564968106EEE28A850B30AFD9AD04117133802C72E13194B8E4B2DACE41
15 15: meshagent_poky
16 -ABA3EEF6883B7A1F8A2B34B32AF518DFC8319F96B8474E43762DE09B24D7E419D1E738A0A1721BC918848FEC74A9B365
16 +B040D93B61F95D720A71C69747FFAB879DC786575E6D6E07A66CAE5A773A3DE1CD8D5EED1F616D412695A881C43C1719
17 16: meshagent_osx-x86-64
18 -BD7071C5D2E46275202E802CB149A82948B4597399B64A8A22AED3F2593730D00646F9AA347E53B3F2460E42DB88FB87
18 +FFB730DA93DBE85C719DE5794522DB482968FEF3B6546312BD65749C5C142A8448BCD79F28FBDAA9FD33514F2EADFF39
19 18: meshagent_poky64
20 -1105DD015C75A86D9DDA7C4C9EBD2E169009578A4FB26E19E0C1B8C522667C065B6C969C3C46BC200CA953912F645CDD
20 +0F6FE1230143B663BEB8C18450184CF13C12B4865A64083A399003D6B17AAA1F47745BF93380382712D2F7B14D7BFDCE
21 19: meshagent_x86_nokvm
22 -4C0828B4596ED72A542F2240FA78E1FCF39BFA33BB7315E6FB26CB0D6E4DAEF14A49F25C9FCA731AF1BA144BEC3B55DE
22 +A42ED063D34469B272DB09BA28E8B1E3DAABA4468994CB4E83CF5B625D08D3F6676EBF39A8AE3C2E5EAAC010EEEE79A7
23 20: meshagent_x86-64_nokvm
24 -9BAF098F604903CB81968DF0BBDB3914D5BF1D114DFE08F29E3BC62D2C6D839D65D1A437087C486B51FD4DA18B363D04
24 +2CB7E07B7522CE54F6791AD923EFA81C93CDADE0F77BAD9EC5DA1FB362ED7DD79FF522CA38DC23242853235903C054F7
25 24: meshagent_arm-linaro
26 -8B953C45BCF20A353192783A55CAAAB12D0F69E6BEB71AC83BA871F3F4465B1C1D5C22C10189399287A69B76ABB19FCD
26 +D270E2C42B65B20DA8487C63120D3B02CCA916FF35220C4B1623A33D02EC70411A4DB808F97A5159AB4E9985387B3821
27 25: meshagent_armhf
28 -B679432037078A04775DAB5349ACD7FDDC9DED3804DCDB42140EF2E3944B50799218D39C2477CD332E6DA229004AE919
28 +DCFF6BED2AB4E3290274C7B1D2F5984CC7E4FA3D6E5B063C839E6D1D67648CB74A7324C52C0413C99C37F86EA381E08A
29 26: meshagent_arm64
30 -407922C20CB88C7AD0AA11D72C74F1D359EF98C13F6F5ED307D2DE692E5F7E2C0894C0087AADE19DC54C34E98E629ED3
30 +CC1E9B31DDB1474A01D145A856E6F0CE52072939D5AB8BF921BF8572AF4F7CF08B59AF8C095CFDC86A1887F225ABD42C
31 30: meshagent_freebsd_x86-64
32 -A5A8784C936B3FA5B2E310382DD369B5820C6D17A80AB8DD99E8109C543AE4B1F2956F8E55CF60BBE480311C1327DC94
32 +40868E8C42A9E429B79A9D0C572686221A222E3188A09DE8FF730A7538A0A2CE85B71BEA940EAAC9AA3415F1677CCCC0
33
agents/meshagent_arm
Binary files a/agents/meshagent_arm and b/agents/meshagent_arm differ
agents/meshagent_arm-linaro
Binary files a/agents/meshagent_arm-linaro and b/agents/meshagent_arm-linaro differ
agents/meshagent_arm64
Binary files a/agents/meshagent_arm64 and b/agents/meshagent_arm64 differ
agents/meshagent_armhf
Binary files a/agents/meshagent_armhf and b/agents/meshagent_armhf differ
agents/meshagent_freebsd_x86-64
Binary files a/agents/meshagent_freebsd_x86-64 and b/agents/meshagent_freebsd_x86-64 differ
agents/meshagent_mips
Binary files a/agents/meshagent_mips and b/agents/meshagent_mips differ
agents/meshagent_osx-x86-64
Binary files a/agents/meshagent_osx-x86-64 and b/agents/meshagent_osx-x86-64 differ
agents/meshagent_pogo
Binary files a/agents/meshagent_pogo and b/agents/meshagent_pogo differ
agents/meshagent_poky
Binary files a/agents/meshagent_poky and b/agents/meshagent_poky differ
agents/meshagent_poky64
Binary files a/agents/meshagent_poky64 and b/agents/meshagent_poky64 differ
agents/meshagent_x86
Binary files a/agents/meshagent_x86 and b/agents/meshagent_x86 differ
agents/meshagent_x86-64
Binary files a/agents/meshagent_x86-64 and b/agents/meshagent_x86-64 differ
agents/meshagent_x86-64_nokvm
Binary files a/agents/meshagent_x86-64_nokvm and b/agents/meshagent_x86-64_nokvm differ
agents/meshagent_x86_nokvm
Binary files a/agents/meshagent_x86_nokvm and b/agents/meshagent_x86_nokvm differ
agents/meshinstall-linux.js
-6
@@ -14,12 +14,6 @@ See the License for the specific language governing permissions and
14 limitations under the License.
15 */
16
17 -/*
18 -TODO: in msh, when:
19 -InstallFlags=1 --> Interactive only, show connect button, not install/uninstal.
20 -InstallFlags=2 --> Background only, show only install/uninstal, not connect.
21 -*/
22 -
17 var msh = {};
18 var s = null;
19 try { s = require('service-manager').manager.getService('meshagent'); } catch (e) { }
public/scripts/amt-wsman-0.2.0-min.js
+1 -1
@@ -1 +1 @@
1 -var WsmanStackCreateService=function(e,s,r,a,o,t){var p={};function l(e){if(!e)return"";var s=" ";for(var r in e)e.hasOwnProperty(r)&&0===r.indexOf("@")&&(s+=r.substring(1)+'="'+e[r]+'" ');return s}function w(e){if(!e)return"";if("string"==typeof e)return e;if(e.InstanceID)return'<w:SelectorSet><w:Selector Name="InstanceID">'+e.InstanceID+"</w:Selector></w:SelectorSet>";var s="<w:SelectorSet>";for(var r in e)if(e.hasOwnProperty(r)){if(s+='<w:Selector Name="'+r+'">',e[r].ReferenceParameters){s+="<a:EndpointReference>",s+="<a:Address>"+e[r].Address+"</a:Address><a:ReferenceParameters><w:ResourceURI>"+e[r].ReferenceParameters.ResourceURI+"</w:ResourceURI><w:SelectorSet>";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o<a.length;o++)s+="<w:Selector"+l(a[o])+">"+a[o].Value+"</w:Selector>";else s+="<w:Selector"+l(a)+">"+a.Value+"</w:Selector>";s+="</w:SelectorSet></a:ReferenceParameters></a:EndpointReference>"}else s+=e[r];s+="</w:Selector>"}return s+="</w:SelectorSet>"}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('<?xml version=\"1.0\" encoding=\"utf-8\"?><Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:a="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:w="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd" xmlns="http://www.w3.org/2003/05/soap-envelope" '+a+"><Header><a:Action>"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,d,c){var m="",i="";null!=d&&null!=c&&(m="<t:IssuedTokens><t:RequestSecurityTokenResponse><t:TokenType>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken</t:TokenType><t:RequestedSecurityToken><se:UsernameToken><se:Username>"+d+'</se:Username><se:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd#PasswordText">'+c+"</se:Password></se:UsernameToken></t:RequestedSecurityToken></t:RequestSecurityTokenResponse></t:IssuedTokens>",i='<Auth Profile="http://schemas.xmlsoap.org/ws/2004/08/eventing/DeliveryModes/secprofile/http/digest"/>'),l=null!=l&&null!=l?"<a:ReferenceParameters>"+l+"</a:ReferenceParameters>":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>"+w(n)+m+'</Header><Body><e:Subscribe><e:Delivery Mode="http://schemas.dmtf.org/wbem/wsman/1/wsman/'+s+'"><e:NotifyTo><a:Address>'+r+"</a:Address></e:NotifyTo>"+i+"</e:Delivery><e:Expires>PT0.000000S</e:Expires></e:Subscribe>";p.PerformAjax(u+"</Body></Envelope>",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>"+w(o)+"</Header><Body><e:Unsubscribe/>";p.PerformAjax(t+"</Body></Envelope>",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60.000S</w:OperationTimeout>"+w(t)+"</Header><Body>"+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="<r:"+r+' xmlns:r="'+e+'">';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+="<r:"+o+"><a:Address>"+s[o].Address+"</a:Address><a:ReferenceParameters><w:ResourceURI>"+s[o].ReferenceParameters.ResourceURI+"</w:ResourceURI><w:SelectorSet>";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n<t.length;n++)a+="<w:Selector"+l(t[n])+">"+t[n].Value+"</w:Selector>";else a+="<w:Selector"+l(t)+">"+t.Value+"</w:Selector>";a+="</w:SelectorSet></a:ReferenceParameters></r:"+o+">"}else if(Array.isArray(s[o]))for(n=0;n<s[o].length;n++)a+="<r:"+o+">"+s[o][n].toString()+"</r:"+o+">";else a+="<r:"+o+">"+s[o].toString()+"</r:"+o+">";return a+="</r:"+r+">"}(e,s);p.PerformAjax(n+"</Body></Envelope>",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(t)+"</Header><Body><g:"+n+' xmlns:g="'+e+'">';for(var d in s)l+="<g:"+d+">"+s[d]+"</g:"+d+">";p.PerformAjax(l+"</g:"+n+"></Body></Envelope>",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60.000S</w:OperationTimeout></Header><Body><r:"+t+' xmlns:r="'+e+'">'+s+"</r:"+t+"></Body></Envelope>",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(s)+"</Header><Body /></Envelope>";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body /></Envelope>",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var d in r)if(null!=r[d])if(Array.isArray(r[d]))for(var c in r[d])l+="<r:"+d+">"+r[d][c]+"</r:"+d+">";else l+="<r:"+d+">"+r[d]+"</r:"+d+">";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+"</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(n)+"</Header><Body><r:"+s+'_INPUT xmlns:r="'+e+'">'+r+"</r:"+s+"_INPUT></Body></Envelope>",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++'</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Enumerate xmlns="http://schemas.xmlsoap.org/ws/2004/09/enumeration" /></Body></Envelope>',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++'</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Pull xmlns="http://schemas.xmlsoap.org/ws/2004/09/enumeration"><EnumerationContext>'+s+"</EnumerationContext><MaxElements>999</MaxElements><MaxCharacters>99999</MaxCharacters></Pull></Body></Envelope>",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;o<a.childNodes.length;o++){var t=a.childNodes[o];r.Header[t.localName]=t.textContent}var n=s.getElementsByTagName("Body")[0];return(n=n||s.getElementsByTagName("a:Body")[0])?(0<n.childNodes.length&&((e=n.childNodes[0].localName).indexOf("_OUTPUT")==e.length-7&&(e=e.substring(0,e.length-7)),r.Header.Method=e,r.Body=function e(s){var r,a={};for(var o=0;o<s.childNodes.length;o++){var t=s.childNodes[o];"true"==(r=0==t.childElementCount?t.textContent:e(t))&&(r=!0),"false"==r&&(r=!1);var n=r;if(0<t.attributes.length){n={Value:r};for(var l=0;l<t.attributes.length;l++)n["@"+t.attributes[l].name]=t.attributes[l].value}a[t.localName]instanceof Array?a[t.localName].push(n):null==a[t.localName]?a[t.localName]=n:a[t.localName]=[a[t.localName],n]}return a}(n.childNodes[0])),r):null}catch(e){return console.log("Unable to parse XML: "+s),null}},p}
\ No newline at end of file
1 +var WsmanStackCreateService=function(e,s,r,a,o,t){var p={};function l(e){if(!e)return"";var s=" ";for(var r in e)e.hasOwnProperty(r)&&0===r.indexOf("@")&&(s+=r.substring(1)+'="'+e[r]+'" ');return s}function w(e){if(!e)return"";if("string"==typeof e)return e;if(e.InstanceID)return'<w:SelectorSet><w:Selector Name="InstanceID">'+e.InstanceID+"</w:Selector></w:SelectorSet>";var s="<w:SelectorSet>";for(var r in e)if(e.hasOwnProperty(r)){if(s+='<w:Selector Name="'+r+'">',e[r].ReferenceParameters){s+="<a:EndpointReference>",s+="<a:Address>"+e[r].Address+"</a:Address><a:ReferenceParameters><w:ResourceURI>"+e[r].ReferenceParameters.ResourceURI+"</w:ResourceURI><w:SelectorSet>";var a=e[r].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(a))for(var o=0;o<a.length;o++)s+="<w:Selector"+l(a[o])+">"+a[o].Value+"</w:Selector>";else s+="<w:Selector"+l(a)+">"+a.Value+"</w:Selector>";s+="</w:SelectorSet></a:ReferenceParameters></a:EndpointReference>"}else s+=e[r];s+="</w:Selector>"}return s+="</w:SelectorSet>"}return p.NextMessageId=1,p.Address="/wsman",p.comm=CreateWsmanComm(e,s,r,a,o,t),p.PerformAjax=function(e,o,s,r,a){null==a&&(a=""),p.comm.PerformAjax('<?xml version=\"1.0\" encoding=\"utf-8\"?><Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:a="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:w="http://schemas.dmtf.org/wbem/wsman/1/wsman.xsd" xmlns="http://www.w3.org/2003/05/soap-envelope" '+a+"><Header><a:Action>"+e,function(e,s,r){if(200==s){var a=p.ParseWsman(e);a&&null!=a?o(p,a.Header.ResourceURI,a,200,r):o(p,null,{Header:{HttpError:s}},601,r)}else o(p,null,{Header:{HttpError:s}},s,r)},s,r)},p.CancelAllQueries=function(e){p.comm.CancelAllQueries(e)},p.GetNameFromUrl=function(e){var s=e.lastIndexOf("/");return-1==s?e:e.substring(s+1)},p.ExecSubscribe=function(e,s,r,a,o,t,n,l,c,d){var m="",i="";null!=c&&null!=d&&(m="<t:IssuedTokens><t:RequestSecurityTokenResponse><t:TokenType>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#UsernameToken</t:TokenType><t:RequestedSecurityToken><se:UsernameToken><se:Username>"+c+'</se:Username><se:Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd#PasswordText">'+d+"</se:Password></se:UsernameToken></t:RequestedSecurityToken></t:RequestSecurityTokenResponse></t:IssuedTokens>",i='<Auth Profile="http://schemas.xmlsoap.org/ws/2004/08/eventing/DeliveryModes/secprofile/http/digest"/>'),l=null!=l&&null!=l?"<a:ReferenceParameters>"+l+"</a:ReferenceParameters>":"";var u="http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>"+w(n)+m+'</Header><Body><e:Subscribe><e:Delivery Mode="http://schemas.dmtf.org/wbem/wsman/1/wsman/'+s+'"><e:NotifyTo><a:Address>'+r+"</a:Address></e:NotifyTo>"+i+"</e:Delivery><e:Expires>PT0.000000S</e:Expires></e:Subscribe>";p.PerformAjax(u+"</Body></Envelope>",a,o,t,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing" xmlns:t="http://schemas.xmlsoap.org/ws/2005/02/trust" xmlns:se="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:m="http://x.com"')},p.ExecUnSubscribe=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo>"+w(o)+"</Header><Body><e:Unsubscribe/>";p.PerformAjax(t+"</Body></Envelope>",s,r,a,'xmlns:e="http://schemas.xmlsoap.org/ws/2004/08/eventing"')},p.ExecPut=function(e,s,r,a,o,t){var n="http://schemas.xmlsoap.org/ws/2004/09/transfer/Put</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60.000S</w:OperationTimeout>"+w(t)+"</Header><Body>"+function(e,s){if(!e||null==s)return"";var r=p.GetNameFromUrl(e),a="<r:"+r+' xmlns:r="'+e+'">';for(var o in s)if(s.hasOwnProperty(o)&&0!==o.indexOf("__")&&0!==o.indexOf("@")&&void 0!==s[o]&&null!==s[o]&&"function"!=typeof s[o])if("object"==typeof s[o]&&s[o].ReferenceParameters){a+="<r:"+o+"><a:Address>"+s[o].Address+"</a:Address><a:ReferenceParameters><w:ResourceURI>"+s[o].ReferenceParameters.ResourceURI+"</w:ResourceURI><w:SelectorSet>";var t=s[o].ReferenceParameters.SelectorSet.Selector;if(Array.isArray(t))for(var n=0;n<t.length;n++)a+="<w:Selector"+l(t[n])+">"+t[n].Value+"</w:Selector>";else a+="<w:Selector"+l(t)+">"+t.Value+"</w:Selector>";a+="</w:SelectorSet></a:ReferenceParameters></r:"+o+">"}else if(Array.isArray(s[o]))for(n=0;n<s[o].length;n++)a+="<r:"+o+">"+s[o][n].toString()+"</r:"+o+">";else a+="<r:"+o+">"+s[o].toString()+"</r:"+o+">";return a+="</r:"+r+">"}(e,s);p.PerformAjax(n+"</Body></Envelope>",r,a,o)},p.ExecCreate=function(e,s,r,a,o,t){var n=p.GetNameFromUrl(e),l="http://schemas.xmlsoap.org/ws/2004/09/transfer/Create</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(t)+"</Header><Body><g:"+n+' xmlns:g="'+e+'">';for(var c in s)l+="<g:"+c+">"+s[c]+"</g:"+c+">";p.PerformAjax(l+"</g:"+n+"></Body></Envelope>",r,a,o)},p.ExecCreateXml=function(e,s,r,a,o){var t=p.GetNameFromUrl(e);p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Create</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60.000S</w:OperationTimeout></Header><Body><r:"+t+' xmlns:r="'+e+'">'+s+"</r:"+t+"></Body></Envelope>",r,a,o)},p.ExecDelete=function(e,s,r,a,o){var t="http://schemas.xmlsoap.org/ws/2004/09/transfer/Delete</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(s)+"</Header><Body /></Envelope>";p.PerformAjax(t,r,a,o)},p.ExecGet=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/transfer/Get</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body /></Envelope>",s,r,a)},p.ExecMethod=function(e,s,r,a,o,t,n){var l="";for(var c in r)if(null!=r[c])if(Array.isArray(r[c]))for(var d in r[c])l+="<r:"+c+">"+r[c][d]+"</r:"+c+">";else l+="<r:"+c+">"+r[c]+"</r:"+c+">";p.ExecMethodXml(e,s,l,a,o,t,n)},p.ExecMethodXml=function(e,s,r,a,o,t,n){p.PerformAjax(e+"/"+s+"</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++"</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout>"+w(n)+"</Header><Body><r:"+s+'_INPUT xmlns:r="'+e+'">'+r+"</r:"+s+"_INPUT></Body></Envelope>",a,o,t)},p.ExecEnum=function(e,s,r,a){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Enumerate</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++'</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Enumerate xmlns="http://schemas.xmlsoap.org/ws/2004/09/enumeration" /></Body></Envelope>',s,r,a)},p.ExecPull=function(e,s,r,a,o){p.PerformAjax("http://schemas.xmlsoap.org/ws/2004/09/enumeration/Pull</a:Action><a:To>"+p.Address+"</a:To><w:ResourceURI>"+e+"</w:ResourceURI><a:MessageID>"+p.NextMessageId+++'</a:MessageID><a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address></a:ReplyTo><w:OperationTimeout>PT60S</w:OperationTimeout></Header><Body><Pull xmlns="http://schemas.xmlsoap.org/ws/2004/09/enumeration"><EnumerationContext>'+s+"</EnumerationContext><MaxElements>999</MaxElements><MaxCharacters>99999</MaxCharacters></Pull></Body></Envelope>",r,a,o)},p.ParseWsman=function(s){try{s.childNodes||(s=function(e){{if(window.DOMParser)return(new DOMParser).parseFromString(e,"text/xml");var s=new ActiveXObject("Microsoft.XMLDOM");return s.async=!1,s.loadXML(e),s}}(s));var e,r={Header:{}},a=s.getElementsByTagName("Header")[0];if(!(a=a||s.getElementsByTagName("a:Header")[0]))return null;for(var o=0;o<a.childNodes.length;o++){var t=a.childNodes[o];r.Header[t.localName]=t.textContent}var n=s.getElementsByTagName("Body")[0];return(n=n||s.getElementsByTagName("a:Body")[0])?(0<n.childNodes.length&&((e=n.childNodes[0].localName).indexOf("_OUTPUT")==e.length-7&&(e=e.substring(0,e.length-7)),r.Header.Method=e,r.Body=function e(s){var r,a={};for(var o=0;o<s.childNodes.length;o++){var t=s.childNodes[o];"true"==(r=0==t.childElementCount?t.textContent:e(t))&&(r=!0),"false"==r&&(r=!1);var n=r;if(0<t.attributes.length){n={Value:r};for(var l=0;l<t.attributes.length;l++)n["@"+t.attributes[l].name]=t.attributes[l].value}a[t.localName]instanceof Array?a[t.localName].push(n):null==a[t.localName]?a[t.localName]=n:a[t.localName]=[a[t.localName],n]}return a}(n.childNodes[0])),r):null}catch(e){return console.log("Unable to parse XML: "+s),null}},p}
\ No newline at end of file
translate/translate.json
+65 -31
@@ -1478,7 +1478,10 @@
1478 "nl": "64bit versie van de MacOS Mesh Agent",
1479 "pt": "Versão de 64 bits do MacOS Mesh Agent",
1480 "ru": "64-битная версия MacOS Mesh Agent",
1481 - "zh-chs": "64位版本的MacOS Mesh Agent",
1481 + "zh-chs": "64位版本的MacOS Mesh Agent"
1482 + },
1483 + {
1484 + "en": "64bit version of macOS Mesh Agent",
1485 "xloc": [
1486 "default.handlebars->27->377"
1487 ]
@@ -3608,10 +3611,7 @@
3611 "nl": "Apple MacOS",
3612 "pt": "Apple MacOS",
3613 "ru": "Apple MacOS",
3611 - "zh-chs": "蘋果MacOS",
3612 - "xloc": [
3613 - "default.handlebars->27->354"
3614 - ]
3614 + "zh-chs": "蘋果MacOS"
3615 },
3616 {
3617 "cs": "pouze Apple MacOS",
@@ -3625,7 +3625,16 @@
3625 "nl": "Alleen Apple MacOS",
3626 "pt": "Apenas Apple MacOS ",
3627 "ru": "Только Apple MacOS",
3628 - "zh-chs": "僅限Apple MacOS",
3628 + "zh-chs": "僅限Apple MacOS"
3629 + },
3630 + {
3631 + "en": "Apple macOS",
3632 + "xloc": [
3633 + "default.handlebars->27->354"
3634 + ]
3635 + },
3636 + {
3637 + "en": "Apple macOS only",
3638 "xloc": [
3639 "default.handlebars->27->325"
3640 ]
@@ -6819,10 +6828,7 @@
6828 "nl": "Kopieer MacOS agent link naar het klembord",
6829 "pt": "Copiar o URL do agente MacOS para a área de transferência",
6830 "ru": "Скопировать ссылку MacOS agent в буфер обмена",
6822 - "zh-chs": "將MacOS代理URL複製到剪貼板",
6823 - "xloc": [
6824 - "default.handlebars->27->378"
6825 - ]
6831 + "zh-chs": "將MacOS代理URL複製到剪貼板"
6832 },
6833 {
6834 "cs": "Zkopírujte adresu URL agenta Windows 32bit do schránky",
@@ -6910,6 +6916,12 @@
6916 "default.handlebars->27->348"
6917 ]
6918 },
6919 + {
6920 + "en": "Copy macOS agent URL to clipboard",
6921 + "xloc": [
6922 + "default.handlebars->27->378"
6923 + ]
6924 + },
6925 {
6926 "cs": "Zkopírovat jméno do schránky",
6927 "de": "Name in Zwischenablage kopieren",
@@ -15405,7 +15417,7 @@
15417 "ru": "Linux / BSD",
15418 "zh-chs": "Linux / BSD",
15419 "xloc": [
15408 - "default.handlebars->27->353"
15420 + "default.handlebars->27->352"
15421 ]
15422 },
15423 {
@@ -15425,6 +15437,12 @@
15437 "default.handlebars->27->356"
15438 ]
15439 },
15440 + {
15441 + "en": "Linux / BSD / macOS Binary Installer",
15442 + "xloc": [
15443 + "default.handlebars->27->353"
15444 + ]
15445 + },
15446 {
15447 "cs": "Linux 32bit",
15448 "de": "Linux 32bit",
@@ -15628,10 +15646,7 @@
15646 },
15647 {
15648 "en": "Linux/macOS Binary Installer",
15631 - "nl": "Linux/macOS binair installatieprogramma",
15632 - "xloc": [
15633 - "default.handlebars->27->350"
15634 - ]
15649 + "nl": "Linux/macOS binair installatieprogramma"
15650 },
15651 {
15652 "cs": "Seznam",
@@ -16322,10 +16337,7 @@
16337 "nl": "MacOS (64bit)",
16338 "pt": "MacOS (64 bits)",
16339 "ru": "MacOS (64bit)",
16325 - "zh-chs": "MacOS（64位）",
16326 - "xloc": [
16327 - "default.handlebars->27->735"
16328 - ]
16340 + "zh-chs": "MacOS（64位）"
16341 },
16342 {
16343 "cs": "macOS 32bit",
@@ -16341,8 +16353,7 @@
16353 "ru": "MacOS 32bit",
16354 "zh-chs": "MacOS 32位",
16355 "xloc": [
16344 - "default-mobile.handlebars->9->17",
16345 - "default.handlebars->27->24"
16356 + "default-mobile.handlebars->9->17"
16357 ]
16358 },
16359 {
@@ -16359,8 +16370,7 @@
16370 "ru": "MacOS 64bit",
16371 "zh-chs": "MacOS 64位",
16372 "xloc": [
16362 - "default-mobile.handlebars->9->22",
16363 - "default.handlebars->27->29"
16373 + "default-mobile.handlebars->9->22"
16374 ]
16375 },
16376 {
@@ -17255,10 +17265,7 @@
17265 "nl": "MeshCmd (MacOS, 64bit)",
17266 "pt": "MeshCmd (MacOS, 64bit)",
17267 "ru": "MeshCmd (MacOS, 64bit)",
17258 - "zh-chs": "MeshCmd（MacOS，64位）",
17259 - "xloc": [
17260 - "default.handlebars->27->750"
17261 - ]
17268 + "zh-chs": "MeshCmd（MacOS，64位）"
17269 },
17270 {
17271 "cs": "MeshCmd (spustitelný soubor Win32)",
@@ -17294,6 +17301,12 @@
17301 "default.handlebars->27->747"
17302 ]
17303 },
17304 + {
17305 + "en": "MeshCmd (macOS, 64bit)",
17306 + "xloc": [
17307 + "default.handlebars->27->750"
17308 + ]
17309 + },
17310 {
17311 "cs": "MeshCmd je nástroj příkazového řádku, který provádí mnoho různých operací. Soubor akcí lze volitelně stáhnout a upravit, aby poskytoval informace o serveru a přihlašovací údaje.",
17312 "de": "MeshCmd ist ein Befehlszeilenprogramm, das viele verschiedene Vorgänge ausführt. Die Aktionsdatei kann optional heruntergeladen und bearbeitet werden, um Serverinformationen und Anmeldeinformationen bereitzustellen.",
@@ -19677,7 +19690,7 @@
19690 "xloc": [
19691 "default-mobile.handlebars->9->328",
19692 "default.handlebars->27->321",
19680 - "default.handlebars->27->351",
19693 + "default.handlebars->27->350",
19694 "default.handlebars->27->560",
19695 "default.handlebars->27->739",
19696 "default.handlebars->27->862"
@@ -26358,12 +26371,15 @@
26371 ]
26372 },
26373 {
26361 - "en": "This is a executable that will only run as root and on OS's with graphical user interfaces.",
26362 - "nl": "Dit is een uitvoerbaar bestand dat alleen zal draaien als root en op besturingssystemen met grafische gebruikersinterfaces.",
26374 + "en": "This is a executable on OS's with graphical user interfaces. You need to 'chmod +x meshagent' and run this file.",
26375 "xloc": [
26376 "default.handlebars->27->387"
26377 ]
26378 },
26379 + {
26380 + "en": "This is a executable that will only run as root and on OS's with graphical user interfaces.",
26381 + "nl": "Dit is een uitvoerbaar bestand dat alleen zal draaien als root en op besturingssystemen met grafische gebruikersinterfaces."
26382 + },
26383 {
26384 "cs": "Toto je portál pro vzdálenou správu a podporu počítače.",
26385 "de": "Dies ist ein Portal für die Remoteverwaltung und den Support von Computern.",
@@ -29421,7 +29437,7 @@
29437 "ru": "Windows",
29438 "zh-chs": "視窗",
29439 "xloc": [
29424 - "default.handlebars->27->352"
29440 + "default.handlebars->27->351"
29441 ]
29442 },
29443 {
@@ -30825,6 +30841,24 @@
30841 "terms.handlebars->container->column_l->75->1"
30842 ]
30843 },
30844 + {
30845 + "en": "macOS (64bit)",
30846 + "xloc": [
30847 + "default.handlebars->27->735"
30848 + ]
30849 + },
30850 + {
30851 + "en": "macOS 32bit",
30852 + "xloc": [
30853 + "default.handlebars->27->24"
30854 + ]
30855 + },
30856 + {
30857 + "en": "macOS 64bit",
30858 + "xloc": [
30859 + "default.handlebars->27->29"
30860 + ]
30861 + },
30862 {
30863 "en": "meshagent",
30864 "cs": "MeshAgenta",
views/default.handlebars
+26 -33
@@ -1204,7 +1204,7 @@
1204 var autoReconnect = true;
1205 var powerStatetable = ['', "Powered", "Sleep", "Sleep", "Sleep", "Hibernating", "Power off", "Present"];
1206 var StatusStrs = ["Disconnected", "Connecting...", "Setup...", "Connected", "Intel&reg; AMT Connected"];
1207 - var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "MacOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "MacOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
1207 + var agentsStr = ["Unknown", "Windows 32bit console", "Windows 64bit console", "Windows 32bit service", "Windows 64bit service", "Linux 32bit", "Linux 64bit", "MIPS", "XENx86", "Android ARM", "Linux ARM", "macOS 32bit", "Android x86", "PogoPlug ARM", "Android APK", "Linux Poky x86-32bit", "macOS 64bit", "ChromeOS", "Linux Poky x86-64bit", "Linux NoKVM x86-32bit", "Linux NoKVM x86-64bit", "Windows MinCore console", "Windows MinCore service", "NodeJS", "ARM-Linaro", "ARMv6l / ARMv7l", "ARMv8 64bit", "ARMv6l / ARMv7l / NoKVM", "Unknown", "Unknown", "FreeBSD x86-64"];
1208 var sort = 0;
1209 var searchFocus = 0;
1210 var mapSearchFocus = 0;
@@ -4057,7 +4057,7 @@
4057 x += '<div id=emailInviteDiv style=display:none>' + format("Invite someone to install the mesh agent. An email with be sent with the link to the mesh agent installation for the \"{0}\" device group.", EscapeHtml(mesh.name)) + '<br /><br />';
4058 x += addHtmlValue("Name (optional)", '<input id=agentInviteName value="" style=width:230px maxlength=64 />');
4059 x += addHtmlValue("Email", '<input id=agentInviteEmail style=width:230px placeholder="' + "example@email.com" + '" onkeyup=validateAgentInvite()></input>');
4060 - x += addHtmlValue("Operating System", '<select id=agentInviteNameOs onchange=d2ChangedInviteType() style=width:236px><option value=4>' + "Send installation link" + '</option><option value=0 selected>' + "Any supported" + '</option><option value=1>' + "Windows only" + '</option><option value=3>' + "Apple MacOS only" + '</option><option value=2>' + "Linux only" + '</option></select>');
4060 + x += addHtmlValue("Operating System", '<select id=agentInviteNameOs onchange=d2ChangedInviteType() style=width:236px><option value=4>' + "Send installation link" + '</option><option value=0 selected>' + "Any supported" + '</option><option value=1>' + "Windows only" + '</option><option value=3>' + "Apple macOS only" + '</option><option value=2>' + "Linux only" + '</option></select>');
4061 x += '<div id=d2agentexpirediv>';
4062 x += addHtmlValue("Link Expiration", '<select id=agentInviteExpire style=width:236px><option value=1>' + "1 hour" + '</option><option value=8>' + "8 hours" + '</option><option value=24>' + "1 day" + '</option><option value=168>' + "1 week" + '</option><option value=5040>' + "1 month" + '</option><option value=0>' + "Unlimited" + '</option></select>');
4063 x += '</div>';
@@ -4106,18 +4106,16 @@
4106 function addAgentToMesh(meshid) {
4107 if (xxdialogMode) return false;
4108 var mesh = meshes[meshid], x = '', installType = 0, moreoptions = '';
4109 - if (debugmode > 0) { moreoptions = '<option value=5>' + "Linux/macOS Binary Installer" + '</option>'; }
4110 - x += addHtmlValue("Operating System", '<select id=aginsSelect onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Windows" + '</option><option value=1>' + "Linux / BSD" + '</option>' + moreoptions + '<option value=2>' + "Apple MacOS" + '</option><option value=3>' + "Windows (UnInstall)" + '</option><option value=4>' + "Linux / BSD (UnInstall)" + '</option></select>');
4111 -
4112 - if (debugmode > 0) {
4113 - var binaryInstallAgents = { 5 : 'Linux x86-32', 6 : 'Linux x86-64', 16 : 'Apple OSX x86-64', 25 : 'Linux ARM-HF, Rasberry Pi', 26 : 'Linux ARM64', 30 : 'FreeBSD x86-64' };
4114 - moreoptions = '';
4115 - for (var i in binaryInstallAgents) { moreoptions += '<option value=' + i + '>' + binaryInstallAgents[i] + '</option>' }
4116 - x += '<div id=aginsSysTypeDiv>';
4117 - x += addHtmlValue("System Type", '<select id=aginsSysType onchange=addAgentToMeshClick() style=width:236px>' + moreoptions + '</select>');
4118 - x += '</div>';
4119 - }
4109 + x += addHtmlValue("Operating System", '<select id=aginsSelect onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Windows" + '</option><option value=1>' + "Linux / BSD" + '</option><option value=5>' + "Linux / BSD / macOS Binary Installer" + '</option><option value=2>' + "Apple macOS" + '</option><option value=3>' + "Windows (UnInstall)" + '</option><option value=4>' + "Linux / BSD (UnInstall)" + '</option></select>');
4110 +
4111 + // Add Linux/macOS binary installer option
4112 + var binaryInstallAgents = { 6 : 'Linux x86-64', 5 : 'Linux x86-32', 16 : 'Apple OSX x86-64', 25 : 'Linux ARM-HF, Rasberry Pi', 26 : 'Linux ARM64-HF', 30 : 'FreeBSD x86-64' };
4113 + for (var i in binaryInstallAgents) { moreoptions += '<option value=' + i + '>' + binaryInstallAgents[i] + '</option>' }
4114 + x += '<div id=aginsSysTypeDiv>';
4115 + x += addHtmlValue("System Type", '<select id=aginsSysType onchange=addAgentToMeshClick() style=width:236px>' + moreoptions + '</select>');
4116 + x += '</div>';
4117
4118 + // Add installation type option
4119 x += '<div id=aginsTypeDiv>';
4120 x += addHtmlValue("Installation Type", '<select id=aginsType onchange=addAgentToMeshClick() style=width:236px><option value=0>' + "Background & interactive" + '</option><option value=2>' + "Background only" + '</option><option value=1>' + "Interactive only" + '</option></select>');
4121 x += '</div><hr>';
@@ -4127,7 +4125,6 @@
4125 meshfilename = meshfilename.split('\\').join('').split('/').join('').split(':').join('').split('*').join('').split('?').join('').split('"').join('').split('<').join('').split('>').join('').split('|').join('').split(' ').join('').split('\'').join('');
4126
4127 // Windows agent install
4130 - //x += "<div id=agins_windows>To add a new computer to device group \"" + EscapeHtml(mesh.name) + "\", download the mesh agent and configuration file and install the agent on the computer to manage.<br /><br />";
4128 x += '<div id=agins_windows>' + format("To add a new computer to device group \"{0}\", download the mesh agent and install it the computer to manage. This agent has server and device group information embedded within it.", EscapeHtml(mesh.name)) + '<br /><br />';
4129 x += addHtmlValue("Mesh Agent", '<a id=aginsw32lnk href="meshagents?id=3&meshid=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)" title="' + "32bit version of the MeshAgent" + '">' + "Windows (.exe)" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy Windows 32bit agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=3&meshid=' + meshid.split('/')[2] + '&installflags=",1)>');
4130 x += addHtmlValue("Mesh Agent", '<a id=aginsw64lnk href="meshagents?id=4&meshid=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)" title="' + "64bit version of the MeshAgent" + '">' + "Windows x64 (.exe)" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy Windows 64bit agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=4&meshid=' + meshid.split('/')[2] + '&installflags=",1)>');
@@ -4139,9 +4136,9 @@
4136 x += '<textarea id=agins_linux_area rows=2 cols=20 readonly=readonly style=width:100%;resize:none;height:120px;overflow:scroll;font-size:12px readonly></textarea>';
4137 x += '<div style=\'font-size:x-small\'>' + "* For BSD, run \"pkg install wget sudo bash\" first." + '</div></div>';
4138
4142 - // MacOS agent install
4139 + // macOS agent install
4140 x += '<div id=agins_osx style=display:none>' + format("To add a new computer to device group \"{0}\", download the mesh agent and install it the computer to manage. This agent installer has server and device group information embedded within it.", EscapeHtml(mesh.name)) + '<br /><br />';
4144 - x += addHtmlValue("Mesh Agent", '<a href="meshosxagent?id=16&meshid=' + meshid.split('/')[2] + (urlargs.key?('&key=' + urlargs.key):'') + '" download rel="noreferrer noopener" target="_blank" title="' + "64bit version of MacOS Mesh Agent" + '">MacOS Agent (64bit)</a> <img src=images/link4.png height=10 width=10 title="' + "Copy MacOS agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshosxagent?id=16&meshid=' + meshid.split('/')[2] + '",0)>');
4141 + x += addHtmlValue("Mesh Agent", '<a href="meshosxagent?id=16&meshid=' + meshid.split('/')[2] + (urlargs.key?('&key=' + urlargs.key):'') + '" download rel="noreferrer noopener" target="_blank" title="' + "64bit version of macOS Mesh Agent" + '">macOS Agent (64bit)</a> <img src=images/link4.png height=10 width=10 title="' + "Copy macOS agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshosxagent?id=16&meshid=' + meshid.split('/')[2] + '",0)>');
4142 x += '</div>';
4143
4144 // Windows agent uninstall
@@ -4155,12 +4152,10 @@
4152 x += '<textarea id=agins_linux_area_un rows=2 cols=20 readonly=readonly style=width:100%;resize:none;height:120px;overflow:scroll;font-size:12px readonly></textarea>';
4153 x += '</div>';
4154
4158 - if (debugmode > 0) {
4159 - // Linux binary installer
4160 - x += '<div id=agins_linux_inst style=display:none>' + "This is a executable that will only run as root and on OS's with graphical user interfaces." + '<br /><br />';
4161 - x += addHtmlValue("Mesh Agent", '<a id=aginsbinlnk href="meshagents?id=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)">' + "meshagent" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=' + meshid.split('/')[2] + '&installflags=",1)>');
4162 - x += '</div>';
4163 - }
4155 + // Linux binary installer
4156 + x += '<div id=agins_linux_inst style=display:none>' + "This is a executable on OS's with graphical user interfaces. You need to 'chmod +x meshagent' and run this file." + '<br /><br />';
4157 + x += addHtmlValue("Mesh Agent", '<a id=aginsbinlnk href="meshagents?id=' + meshid.split('/')[2] + '&installflags=0' + (urlargs.key?('&key=' + urlargs.key):'') + '" download onclick="setDialogMode(0)">' + "meshagent" + '</a> <img src=images/link4.png height=10 width=10 title="' + "Copy agent URL to clipboard" + '" style=cursor:pointer onclick=copyAgentUrl("meshagents?id=' + meshid.split('/')[2] + '&installflags=",1)>');
4158 + x += '</div>';
4159
4160 setDialogMode(2, "Add Mesh Agent", 2, null, x, 'fileDownload');
4161 var servername = serverinfo.name;
@@ -4210,7 +4205,7 @@
4205 var c = 'https://' + servername + portStr + domainUrl + url;
4206 if (addflag == 1) c += Q('aginsType').value;
4207 c += (urlargs.key?('&key=' + urlargs.key):'');
4213 - if (debugmode > 0) { if (Q('aginsSelect').value == 5) { c += '&meshinstall=' + Q('aginsSysType').value; } }
4208 + if (Q('aginsSelect').value == 5) { c += '&meshinstall=' + Q('aginsSysType').value; }
4209 copyTextToClip(c);
4210 }
4211
@@ -4221,17 +4216,15 @@
4216 QV('agins_osx', v == 2);
4217 QV('agins_windows_un', v == 3);
4218 QV('agins_linux_un', v == 4);
4224 - if (debugmode > 0) {
4225 - QV('agins_linux_inst', v == 5);
4226 - QV('aginsSysTypeDiv', v == 5);
4227 - Q('aginsbinlnk').href = (Q('aginsbinlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value;
4228 - }
4219 + QV('agins_linux_inst', v == 5);
4220 + QV('aginsSysTypeDiv', v == 5);
4221 + Q('aginsbinlnk').href = (Q('aginsbinlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'') + '&meshinstall=' + Q('aginsSysType').value;
4222 QV('aginsTypeDiv', (v == 0) || (v == 5));
4223
4224 // Fix the links if needed
4225 Q('aginsw32lnk').href = (Q('aginsw32lnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
4226 Q('aginsw64lnk').href = (Q('aginsw64lnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
4234 - if (debugmode > 0) { Q('aginswmshlnk').href = (Q('aginswmshlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):''); }
4227 + Q('aginswmshlnk').href = (Q('aginswmshlnk').href.split('installflags=')[0]) + 'installflags=' + Q('aginsType').value + (urlargs.key?('&key=' + urlargs.key):'');
4228 }
4229
4230 function validateDeviceToMesh() {
@@ -6287,7 +6280,7 @@
6280 y += '<option value=4>' + "Windows (64bit)" + '</option>';
6281 y += '<option value=5>' + "Linux x86 (32bit)" + '</option>';
6282 y += '<option value=6>' + "Linux x86 (64bit)" + '</option>';
6290 - y += '<option value=16>' + "MacOS (64bit)" + '</option>';
6283 + y += '<option value=16>' + "macOS (64bit)" + '</option>';
6284 y += '<option value=25>' + "Linux ARM, Raspberry Pi (32bit)" + '</option>';
6285 y += '</select>';
6286
@@ -6310,7 +6303,7 @@
6303 if (os == 4) { osn = "MeshCmd (Win64 executable)"; }
6304 if (os == 5) { osn = "MeshCmd (Linux x86, 32bit)"; }
6305 if (os == 6) { osn = "MeshCmd (Linux x86, 64bit)"; }
6313 - if (os == 16) { osn = "MeshCmd (MacOS, 64bit)"; }
6306 + if (os == 16) { osn = "MeshCmd (macOS, 64bit)"; }
6307 if (os == 25) { osn = "MeshCmd (Linux ARM, 32bit)"; }
6308 QH('meshcmddownloadid', osn);
6309 Q('meshcmddownloadid').setAttribute('href', 'meshagents?meshcmd=' + os + (urlargs.key?('&key=' + urlargs.key):''));
@@ -6447,7 +6440,7 @@
6440 var hwonline = ((currentNode.conn & 6) != 0); // If CIRA (2) or AMT (4) connected, enable hardware terminal
6441 QE('connectbutton1h', hwonline);
6442 QV('deskFocusBtn', (desktop != null) && (desktop.contype == 2) && (deskState != 0) && (desktopsettings.showfocus));
6450 - QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on MacOS
6443 + QV('DeskClip', (currentNode.agent) && (currentNode.agent.id != 11) && (currentNode.agent.id != 16) && ((desktop == null) || (desktop.contype != 2))); // Clipboard not supported on macOS
6444 QE('DeskClip', deskState == 3);
6445 QE('DeskType', deskState == 3);
6446 QV('DeskWD', inputAllowed);
@@ -7260,7 +7253,7 @@
7253 var deskPreferedStickyDisplay = -1;
7254 function deskSetDisplay(e) { desktop.m.SetDisplay(deskPreferedStickyDisplay = parseInt(Q('termdisplays').value)); Q('termdisplays').blur(); }
7255
7263 - // Double click detection. This is important for MacOS.
7256 + // Double click detection. This is important for macOS.
7257 var dblClickDetectArgs = { t:0, x:0, y:0 };
7258 function dblClickDetect(e) {
7259 if (e.buttons != 1) return;