From b83050e4cefb2a9161f0690773d3fecddf69a456 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 26 May 2020 00:52:39 +0200
Subject: [PATCH 1/8] Add sprintf javascript function

---
 plugins/dynamix/javascript/dynamix.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/dynamix/javascript/dynamix.js b/plugins/dynamix/javascript/dynamix.js
index 23d4902ec..0e7836ccc 100644
--- a/plugins/dynamix/javascript/dynamix.js
+++ b/plugins/dynamix/javascript/dynamix.js
@@ -34,3 +34,5 @@ var context=context||function(){function b(b){a=$.extend({},a,b),$(document).on(
 !function(t,e,s){"use strict";var i=function(t,e){var s={};function i(t){return t?function(t){for(var e in i.prototype)t[e]=i.prototype[e];return t}(t):void 0}(function(){var i=["responseType","withCredentials","timeout","onprogress"];function r(t,e,s){t[e]=t[e]||s}s.ajax=function(s,n){var o=s.headers||{},a=s.body,h=s.method||(a?"POST":"GET"),c=!1,l=function(e){if(e&&t.XDomainRequest&&!/MSIE 1/.test(navigator.userAgent))return new XDomainRequest;if(t.XMLHttpRequest)return new XMLHttpRequest}(s.cors);function d(t,s){return function(){c||(n(l.status===e?t:l.status,0===l.status?"Error":l.response||l.responseText||s,l),c=!0)}}l.open(h,s.url,!0);var u=l.onload=d(200);l.onreadystatechange=function(){4===l.readyState&&u()},l.onerror=d(null,"Error"),l.ontimeout=d(null,"Timeout"),l.onabort=d(null,"Abort"),a&&(r(o,"X-Requested-With","XMLHttpRequest"),t.FormData&&a instanceof t.FormData||r(o,"Content-Type","application/x-www-form-urlencoded"));for(var p=0,m=i.length;p<m;p++)s[f=i[p]]!==e&&(l[f]=s[f]);for(var f in o)l.setRequestHeader(f,o[f]);return l.send(a),l}})(),i.prototype.on=i.prototype.addEventListener=function(t,e){return this._callbacks=this._callbacks||{},(this._callbacks["$"+t]=this._callbacks["$"+t]||[]).push(e),this},i.prototype.once=function(t,e){function s(){this.off(t,s),e.apply(this,arguments)}return s.fn=e,this.on(t,s),this},i.prototype.off=i.prototype.removeListener=i.prototype.removeAllListeners=i.prototype.removeEventListener=function(t,e){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var s=this._callbacks["$"+t];if(!s)return this;if(1==arguments.length)return delete this._callbacks["$"+t],this;for(var i,r=0;r<s.length;r++)if(i=s[r],i===e||i.fn===e){s.splice(r,1);break}return this},i.prototype.emit=function(t){this._callbacks=this._callbacks||{};var e=[].slice.call(arguments,1),s=this._callbacks["$"+t];if(s)for(var i=0,r=(s=s.slice(0)).length;r>i;++i)s[i].apply(this,e);return this},i.prototype.listeners=function(t){return this._callbacks=this._callbacks||{},this._callbacks["$"+t]||[]},i.prototype.hasListeners=function(t){return!!this.listeners(t).length};var r,n=Function.prototype.bind?function(t,e){return t.bind(e)}:function(t,e){return function(){t.apply(e,arguments)}},o={};function a(e,s){if("undefined"!=typeof window&&this===window)throw"use 'new NchanSubscriber(...)' to initialize";if(this.url=e,"string"==typeof(s=s||{})&&(s={subscriber:s}),s.transport&&!s.subscriber&&(s.subscriber=s.transport),"string"==typeof s.subscriber&&(s.subscriber=[s.subscriber]),this.desiredTransport=s.subscriber,s.shared){if(!("localStorage"in t))throw"localStorage unavailable for use in shared NchanSubscriber";var i="NchanSubscriber:"+this.url+":shared:",r=function(t){return i+t},o=t.localStorage;this.shared={id:""+Math.random()+Math.random(),key:r,get:function(t){return o.getItem(r(t))},set:function(t,e){return o.setItem(r(t),e)},setWithId:n(function(t,e){return this.shared.set(t,"##"+this.shared.id+":"+e)},this),getWithId:n(function(t){return this.shared.stripIdFromVal(this.shared.get(t))},this),stripIdFromVal:function(t){if(!t)return t;var e=t.indexOf(":");return t[0]==t[1]&&"#"==t[0]&&e?t.substring(e+1,t.length):t},remove:function(t){return o.removeItem(r(t))},matchEventKey:n(function(t,e){return(!t.storageArea||t.storageArea==o)&&t.key==r(e)},this),matchEventKeyWithId:n(function(t,e){if(this.shared.matchEventKey(t,e)){var s=t.newValue,i=s.indexOf(":");if(s[0]!=s[1]||"#"!=s[0]||!i)return!0;var r=s.substring(2,i);return r!=this.shared.id}return!1},this),setRole:n(function(t){if("master"==t&&"master"!=this.shared.role){var e=(new Date).getTime()/1e3;this.shared.setWithId("master:created",e),this.shared.setWithId("master:lastSeen",e)}return"slave"!=t||this.lastMessageId||(this.lastMessageId=this.shared.get("msg:id")),this.shared.role=t,this},this),demoteToSlave:n(function(){if("master"!=this.shared.role)throw"can't demote non-master to slave";this.running?(this.stop(),this.shared.setRole("slave"),this.initializeTransport(),this.start()):this.initializeTransport()},this),maybePromoteToMaster:n(function(){if(!this.running&&!this.starting)return this;if(!this.shared.maybePromotingToMaster){var e;this.shared.maybePromotingToMaster=!0;var s,i=0,r=Math.random(),o=r,a=n(function(t){var s=parseFloat(this.shared.getWithId("lotteryTime")),i=parseFloat(this.shared.getWithId("lottery")),r=!s||s>(new Date).getTime()-4e3;r&&i&&(!o||i>o)&&(o=i),t||e()},this);a(!0),this.shared.setWithId("lottery",r),this.shared.setWithId("lotteryTime",(new Date).getTime()/1e3);var h=n(function(t){if(this.shared.matchEventKeyWithId(t,"lottery")&&t.newValue){i+=1;var e=parseFloat(this.shared.stripIdFromVal(t.newValue)),s=parseFloat(this.shared.stripIdFromVal(t.oldValue));s>e&&this.shared.setWithId("lottery",s),(!o||e>=o)&&(o=e)}},this);t.addEventListener("storage",h);var c=n(function(){this.shared.maybePromotingToMaster=!1,t.removeEventListener("storage",h),s&&clearInterval(s),this.shared&&"master"==this.shared.role&&(this.shared.remove("lottery"),this.shared.remove("lotteryTime")),this.running?(this.stop(),this.initializeTransport(),this.start()):(this.initializeTransport(),this.starting&&this.start())},this);e=n(function(){r<o?(this.shared.setRole("slave"),c()):r>=o&&(0==i?(this.shared.setRole("master"),c()):i=0)},this),s=t.setInterval(a,2e3)}},this),masterCheckInterval:1e4}}var a;if(this.lastMessageId=s.id||s.msgId,this.reconnect=void 0===s.reconnect||s.reconnect,this.reconnectTimeout=s.reconnectTimeout||1e3,s.reconnect){var h,c="NchanSubscriber:"+e+":lastMessageId";if("persist"==s.reconnect){if(!(h="localStorage"in t&&t.localStorage))throw"can't use reconnect: 'persist' option: localStorage not available"}else{if("session"!=s.reconnect)throw"invalid 'reconnect' option value "+s.reconnect;if(!(h="sessionStorage"in t&&t.sessionStorage))throw"can't use reconnect: 'session' option: sessionStorage not available"}a=n(function(t){this.shared&&"slave"==this.shared.role||h.setItem(c,t)},this),this.lastMessageId=h.getItem(c)}else a=function(){};var l,d,u=n(function(){this.running&&this.stop(),this.shared&&"master"==this.shared.role&&this.shared.setWithId("status","disconnected")},this);t.addEventListener("beforeunload",u,!1),t.addEventListener("DOMContentLoaded",function(){t.removeEventListener("beforeunload",u,!1),t.addEventListener("unload",u,!1)},!1),l=this.shared?n(function(t,e){"master"==this.shared.role&&("message"==t?(this.shared.set("msg:id",e[1]&&e[1].id||""),this.shared.set("msg:content-type",e[1]&&e[1]["content-type"]||""),this.shared.set("msg",e[0])):"error"==t||("connecting"==t?this.shared.setWithId("status","connecting"):"connect"==t?this.shared.setWithId("status","connected"):"reconnect"==t?this.shared.setWithId("status","reconnecting"):"disconnect"==t&&this.shared.setWithId("status","disconnected")))},this):function(){};var p=n(function(){d||!this.running||!this.reconnect||this.transport.reconnecting||this.transport.doNotReconnect?l("disconnect"):(l("reconnect"),d=t.setTimeout(n(function(){d=null,this.stop(),this.start()},this),this.reconnectTimeout))},this);this.on("message",function(t,e){this.lastMessageId=e.id,e.id&&a(e.id),l("message",[t,e])}),this.on("error",function(t,e){p(t,e),l("error",[t,e])}),this.on("connect",function(){this.connected=!0,l("connect")}),this.on("__disconnect",function(t,e){this.connected=!1,this.emit("disconnect",t,e),p(t,e)})}function h(t,e){if(e){var s=t.match(/(\?.*)$/);t+=(s?"&":"?")+"last_event_id="+encodeURIComponent(e)}return t}return i(a.prototype),a.prototype.initializeTransport=function(t){if(t&&(this.desiredTransport=t),this.shared&&"slave"==this.shared.role)this.transport=new this.SubscriberClass.__slave(n(this.emit,this));else{var e,s=n(function(t){if(!this.SubscriberClass[t])throw"unknown subscriber type "+t;try{return this.transport=new this.SubscriberClass[t](n(this.emit,this)),this.transport}catch(t){}},this);if(this.desiredTransport)for(e=0;e<this.desiredTransport.length&&!s(this.desiredTransport[e]);e++);else for(e in this.SubscriberClass)if(this.SubscriberClass.hasOwnProperty(e)&&"_"!=e[0]&&s(e))break}if(!this.transport)throw"can't use any transport type"},a.prototype.start=function(){if(this.running)throw"Can't start NchanSubscriber, it's already started.";if(this.starting=!0,this.shared){if(o[this.url]&&o[this.url]!=this)throw"Only 1 shared subscriber allowed per url per window/tab.";if(o[this.url]=this,!this.shared.role){var e=this.shared.getWithId("status");r=n(function(t){this.shared.matchEventKeyWithId(t,"status")?"disconnected"==this.shared.stripIdFromVal(t.newValue)&&("slave"==this.shared.role?this.shared.maybePromoteToMaster():this.shared.role):"master"==this.shared.role&&this.shared.matchEventKeyWithId(t,"master:created")&&t.newValue&&this.shared.demoteToSlave()},this),t.addEventListener("storage",r),"disconnected"==e?this.shared.maybePromoteToMaster():(this.shared.setRole(e?"slave":"master"),this.initializeTransport())}"master"==this.shared.role?(this.shared.setWithId("status","connecting"),this.transport.listen(this.url,this.lastMessageId),this.running=!0,delete this.starting,this.shared.masterIntervalCheckID=t.setInterval(n(function(){this.shared.setWithId("master:lastSeen",(new Date).getTime()/1e3)},this),.8*this.shared.masterCheckInterval)):"slave"==this.shared.role&&(this.transport.listen(this.url,this.shared),this.running=!0,delete this.starting,this.shared.masterIntervalCheckID=t.setInterval(n(function(){var t=parseFloat(this.shared.getWithId("master:lastSeen"));(!t||t<(new Date).getTime()/1e3-this.shared.masterCheckInterval/1e3)&&this.shared.maybePromoteToMaster()},this),this.shared.masterCheckInterval))}else this.transport||this.initializeTransport(),this.transport.listen(this.url,this.lastMessageId),this.running=!0,delete this.starting;return this},a.prototype.stop=function(){if(!this.running)throw"Can't stop NchanSubscriber, it's not running.";return this.running=!1,r&&t.removeEventListener("storage",r),this.transport.cancel(),this.shared&&(delete o[this.url],this.shared.masterIntervalCheckID&&(clearInterval(this.shared.masterIntervalCheckID),delete this.shared.masterIntervalCheckID)),this},a.prototype.SubscriberClass={websocket:function(){function t(t){WebSocket,this.emit=t,this.name="websocket",this.opt={url:null,msgid:null,headers:{"Sec-WebSocket-Protocol":"ws+meta.nchan"}}}return t.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(1!=e&&"Sec-WebSocket-Protocol"in this.opt.headers)throw"WebSocket only supports one header; Sec-WebSocket-Protocol"},t.prototype.websocketizeURL=function(t){var e,s=t.match(/^((\w+:)?\/\/([^/]+))?(\/)?(.*)/),i=s[2],r=s[3],n=s[4],o=s[5];return"object"==typeof window?e=window.location:"object"==typeof document&&(e=document.location),!i&&e&&(i=e.protocol),"https:"==i?i="wss:":"http:"==i?i="ws:":"ws:"!=i&&(i="wss:"),!r&&e&&(r=e.host),i+"//"+r+(o=n?"/"+o:e?e.pathname.match(/(.*\/)[^/]*/)[1]+o:"/"+o)},t.prototype.listen=function(t,e){if(this.listener)throw"websocket already listening";this.opt.url=t,this.opt.msgid=e,this.setup(),t=h(t=this.websocketizeURL(this.opt.url),this.opt.msgid),this.listener=new WebSocket(t,this.opt.headers["Sec-WebSocket-Protocol"]);var s=this.listener;this.emit("transportNativeCreated",s,this.name),s.onmessage=n(function(t){if(t.data instanceof Blob){var e=t.data.slice(0,255),s=new FileReader;s.addEventListener("loadend",n(function(){var e=s.result.match(/^id: (.*)\n(content-type: (.*)\n)?\n/m);this.emit("message",t.data.slice(e[0].length),{id:e[1],"content-type":e[3]})},this)),s.readAsText(e)}else{var i=t.data.match(/^id: (.*)\n(content-type: (.*)\n)?\n/m);this.emit("message",t.data.substr(i[0].length),{id:i[1],"content-type":i[3]})}},this),s.onopen=n(function(t){this.emit("connect",t)},this),s.onerror=n(function(t){this.emit("error",t,s),delete this.listener},this),s.onclose=n(function(t){this.emit("__disconnect",t),delete this.listener},this)},t.prototype.cancel=function(){this.listener&&(this.emit("transportNativeBeforeDestroy",this.listener,this.name),this.listener.close(),delete this.listener)},t}(),eventsource:function(){function t(t){EventSource,this.emit=t,this.name="eventsource",this.opt={url:null,msgid:null,headers:{}}}return t.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(0!=e)throw"EventSource does not support headers"},t.prototype.listen=function(t,e){if(this.listener)throw"there's a ES listener running already";this.opt.url=t,this.opt.msgid=e,this.setup(),t=h(this.opt.url,this.opt.msgid),this.listener=new EventSource(t);var s=this.listener;this.emit("transportNativeCreated",s,this.name),s.onmessage=n(function(t){this.emit("message",t.data,{id:t.lastEventId})},this),s.onopen=n(function(t){this.reconnecting=!1,this.emit("connect",t)},this),s.onerror=n(function(t){this.listener.readyState!=EventSource.CONNECTING||this.reconnecting?this.emit("__disconnect",t):this.reconnecting||(this.reconnecting=!0,this.emit("__disconnect",t))},this)},t.prototype.cancel=function(){this.listener&&(this.emit("transportNativeBeforeDestroy",this.listener,this.name),this.listener.close(),delete this.listener)},t}(),longpoll:function(){function t(t){this.pollingRequest=null,this.longPollStartTime=null,this.maxLongPollTime=3e5,this.emit=t,this.name="longpoll",this.opt={url:null,msgid:null,headers:{}}}return t.prototype.setup=function(){var t;this.emit("transportSetup",this.opt,this.name);for(t in this.opt.headers);},t.prototype.listen=function(t,e){if(this.req)throw"already listening";this.opt.url=t,this.opt.msgid=e,e&&(this.opt.headers.Etag=e),this.setup();var i,r=n(function(t,e){t&&(this.opt.headers[e]=t)},this);return this.pollingRequest=n(function(){this.req&&this.emit("transportNativeBeforeDestroy",this.req,this.name),this.reqStartTime=(new Date).getTime(),this.req=s.ajax({url:this.opt.url,headers:this.opt.headers},i),this.emit("transportNativeCreated",this.req,this.name)},this),i=n(function(t,e,s){if(r(s.getResponseHeader("Last-Modified"),"If-Modified-Since"),r(s.getResponseHeader("Etag"),"If-None-Match"),t>=200&&t<=210){var i=s.getResponseHeader("Content-Type");this.parseMultipartMixedMessage(i,e,s)||this.emit("message",e||"",{"content-type":i,id:this.msgIdFromResponseHeaders(s)}),this.req&&this.pollingRequest()}else 0==t&&"Error"==e&&4==s.readyState||null===t&&"Abort"!=e?(this.emit("__disconnect",t||0,e),delete this.req):null!==t?(this.emit("error",t,e),delete this.req):(delete this.req,this.emit("__disconnect"))},this),this.pollingRequest(),this.emit("connect"),this},t.prototype.parseMultipartMixedMessage=function(t,e,s){var i=t&&t.match(/^multipart\/mixed;\s+boundary=(.*)$/);if(!i)return!1;var r=i[1],n=e.split("--"+r);if(""!=n[0]||!n[n.length-1].match(/--\r?\n/))throw"weird multipart/mixed split";n=n.slice(1,-1);for(var o in n){var a=(i=n[o].match(/^(.*)\r?\n\r?\n([\s\S]*)\r?\n$/m))[1].split("\n"),h={};for(var c in a){var l=a[c].match(/^([^:]+):\s+(.*)/);l&&"Content-Type"==l[1]&&(h["content-type"]=l[2])}o==n.length-1&&(h.id=this.msgIdFromResponseHeaders(s)),this.emit("message",i[2],h)}return!0},t.prototype.msgIdFromResponseHeaders=function(t){var e,s;return e=t.getResponseHeader("Last-Modified"),s=t.getResponseHeader("Etag"),e?Date.parse(e)/1e3+":"+(s||"0"):s||null},t.prototype.cancel=function(){return this.req&&(this.emit("transportNativeBeforeDestroy",this.req,this.name),this.req.abort(),delete this.req),this},t}(),__slave:function(){function s(t){this.emit=t,this.doNotReconnect=!0,this.shared=null,this.name="__slave",this.opt={url:null,msgid:null,headers:{}}}return s.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(0!=e)throw"__slave does not support headers"},s.prototype.listen=function(s,i){this.shared=i,this.opt.url=s,this.setup(),this.statusChangeChecker=n(function(t){if(this.shared.matchEventKey(t,"msg")){var s=this.shared.get("msg:id"),i=this.shared.get("msg:content-type"),r=this.shared.get("msg");this.emit("message",r,{id:""==s?e:s,"content-type":""==i?e:i})}},this),t.addEventListener("storage",this.statusChangeChecker)},s.prototype.cancel=function(){t.removeEventListener("storage",this.statusChangeChecker)},s}()},a}(t);"object"==typeof module&&null!=module&&module.exports?module.exports=i:"function"==typeof define&&define.amd?define(function(){return i}):t.NchanSubscriber=i}("undefined"!=typeof window?window:this);
 /* shortcuts, Version: 2.01.B, Copyright Binny V A */
 shortcut={all_shortcuts:{},add:function(l,p,i){var e={type:"keydown",propagate:!1,disable_in_input:!1,target:document,keycode:!1};if(i)for(var t in e)void 0===i[t]&&(i[t]=e[t]);else i=e;var a=i.target;"string"==typeof i.target&&(a=document.getElementById(i.target));l=l.toLowerCase();function r(e){var t;if(e=e||window.event,!i.disable_in_input||(e.target?t=e.target:e.srcElement&&(t=e.srcElement),3==t.nodeType&&(t=t.parentNode),"INPUT"!=t.tagName&&"TEXTAREA"!=t.tagName)){e.keyCode?code=e.keyCode:e.which&&(code=e.which);var a=String.fromCharCode(code).toLowerCase();188==code&&(a=","),190==code&&(a=".");var r=l.split("+"),n=0,s={"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":":","'":'"',",":"<",".":">","/":"?","\\":"|"},o={esc:27,escape:27,tab:9,space:32,return:13,enter:13,backspace:8,scrolllock:145,scroll_lock:145,scroll:145,capslock:20,caps_lock:20,caps:20,numlock:144,num_lock:144,num:144,pause:19,break:19,insert:45,home:36,delete:46,end:35,pageup:33,page_up:33,pu:33,pagedown:34,page_down:34,pd:34,left:37,up:38,right:39,down:40,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},d={shift:{wanted:!1,pressed:!1},ctrl:{wanted:!1,pressed:!1},alt:{wanted:!1,pressed:!1},meta:{wanted:!1,pressed:!1}};e.ctrlKey&&(d.ctrl.pressed=!0),e.shiftKey&&(d.shift.pressed=!0),e.altKey&&(d.alt.pressed=!0),e.metaKey&&(d.meta.pressed=!0);for(var c=0;k=r[c],c<r.length;c++)"ctrl"==k||"control"==k?(n++,d.ctrl.wanted=!0):"shift"==k?(n++,d.shift.wanted=!0):"alt"==k?(n++,d.alt.wanted=!0):"meta"==k?(n++,d.meta.wanted=!0):1<k.length?o[k]==code&&n++:i.keycode?i.keycode==code&&n++:a==k?n++:s[a]&&e.shiftKey&&(a=s[a])==k&&n++;return n!=r.length||d.ctrl.pressed!=d.ctrl.wanted||d.shift.pressed!=d.shift.wanted||d.alt.pressed!=d.alt.wanted||d.meta.pressed!=d.meta.wanted||(p(e),i.propagate)?void 0:(e.cancelBubble=!0,e.returnValue=!1,e.stopPropagation&&(e.stopPropagation(),e.preventDefault()),!1)}}this.all_shortcuts[l]={callback:r,target:a,event:i.type},a.addEventListener?a.addEventListener(i.type,r,!1):a.attachEvent?a.attachEvent("on"+i.type,r):a["on"+i.type]=r},remove:function(e){e=e.toLowerCase();var t=this.all_shortcuts[e];if(delete this.all_shortcuts[e],t){var a=t.event,r=t.target,n=t.callback;r.detachEvent?r.detachEvent("on"+a,n):r.removeEventListener?r.removeEventListener(a,n,!1):r["on"+a]=!1}}};
+/* sprintf function */
+function sprintf(){var r=arguments,e=r[0],n=1;return e.replace(/%((%)|s|d)/g,function(e){var a=null;if(e[2])a=e[2];else{switch(a=r[n],e){case"%d":a=parseFloat(a),isNaN(a)&&(a=0)}n++}return a})}
\ No newline at end of file

From 2693fef3e3ea1772b09ea531ee9f3a10b81b261b Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 26 May 2020 10:53:26 +0200
Subject: [PATCH 2/8] Multi-language support

---
 logging.htm                                   | 9 +++++++--
 plugins/dynamix/include/DefaultPageLayout.php | 2 +-
 update.htm                                    | 6 +++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/logging.htm b/logging.htm
index 5ffdbb5ec..378041704 100644
--- a/logging.htm
+++ b/logging.htm
@@ -1,8 +1,12 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<meta name="robots" content="noindex, nofollow">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+<meta name="format-detection" content="telephone=no">
+<meta name="viewport" content="width=1600">
+<meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <style>
 @font-face{
@@ -79,7 +83,8 @@ function addLog(logLine) {
   }
 }
 function addCloseButton() {
-  addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (top.Shadowbox ? "top.Shadowbox" : "window") + ".close()'>Done</button></p>");
+  var done = location.search.substr(1).split("&").slice(-1)[0].split('=')[1];
+  addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (top.Shadowbox ? "top.Shadowbox" : "window") + ".close()'>"+done+"</button></p>");
 }
 </script>
 </head>
diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 268f9dc23..462be421f 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -175,7 +175,7 @@ function chkDelete(form, button) {
 }
 function openBox(cmd,title,height,width,load,func,id) {
   // open shadowbox window (run in foreground)
-  var run = cmd.split('?')[0].substr(-4)=='.php' ? cmd : '/logging.htm?cmd='+cmd+'&csrf_token=<?=$var['csrf_token']?>';
+  var run = cmd.split('?')[0].substr(-4)=='.php' ? cmd+'&done=<?=_("Done")?>' : '/logging.htm?cmd='+cmd+'&csrf_token=<?=$var["csrf_token"]?>&done=<?=_("Done")?>';
   var options = load ? (func ? {modal:true,onClose:function(){setTimeout(func+'('+'"'+(id||'')+'")',0);}} : {modal:true,onClose:function(){location=location;}}) : {modal:false};
   Shadowbox.open({content:run, player:'iframe', title:title, height:Math.min(height,screen.availHeight), width:Math.min(width,screen.availWidth), options:options});
 }
diff --git a/update.htm b/update.htm
index 84bd75b53..24f6c9743 100644
--- a/update.htm
+++ b/update.htm
@@ -1,8 +1,12 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<meta name="robots" content="noindex, nofollow">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+<meta name="format-detection" content="telephone=no">
+<meta name="viewport" content="width=1600">
+<meta name="robots" content="noindex, nofollow">
 <meta name="referrer" content="same-origin">
 <style>
 @font-face{

From b9e7c9cc85464e0879eda5f14eb413999bb3c1bd Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 26 May 2020 11:40:51 +0200
Subject: [PATCH 3/8] Revert "Add sprintf javascript function"

This reverts commit b83050e4cefb2a9161f0690773d3fecddf69a456.
---
 plugins/dynamix/javascript/dynamix.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/dynamix/javascript/dynamix.js b/plugins/dynamix/javascript/dynamix.js
index 0e7836ccc..23d4902ec 100644
--- a/plugins/dynamix/javascript/dynamix.js
+++ b/plugins/dynamix/javascript/dynamix.js
@@ -34,5 +34,3 @@ var context=context||function(){function b(b){a=$.extend({},a,b),$(document).on(
 !function(t,e,s){"use strict";var i=function(t,e){var s={};function i(t){return t?function(t){for(var e in i.prototype)t[e]=i.prototype[e];return t}(t):void 0}(function(){var i=["responseType","withCredentials","timeout","onprogress"];function r(t,e,s){t[e]=t[e]||s}s.ajax=function(s,n){var o=s.headers||{},a=s.body,h=s.method||(a?"POST":"GET"),c=!1,l=function(e){if(e&&t.XDomainRequest&&!/MSIE 1/.test(navigator.userAgent))return new XDomainRequest;if(t.XMLHttpRequest)return new XMLHttpRequest}(s.cors);function d(t,s){return function(){c||(n(l.status===e?t:l.status,0===l.status?"Error":l.response||l.responseText||s,l),c=!0)}}l.open(h,s.url,!0);var u=l.onload=d(200);l.onreadystatechange=function(){4===l.readyState&&u()},l.onerror=d(null,"Error"),l.ontimeout=d(null,"Timeout"),l.onabort=d(null,"Abort"),a&&(r(o,"X-Requested-With","XMLHttpRequest"),t.FormData&&a instanceof t.FormData||r(o,"Content-Type","application/x-www-form-urlencoded"));for(var p=0,m=i.length;p<m;p++)s[f=i[p]]!==e&&(l[f]=s[f]);for(var f in o)l.setRequestHeader(f,o[f]);return l.send(a),l}})(),i.prototype.on=i.prototype.addEventListener=function(t,e){return this._callbacks=this._callbacks||{},(this._callbacks["$"+t]=this._callbacks["$"+t]||[]).push(e),this},i.prototype.once=function(t,e){function s(){this.off(t,s),e.apply(this,arguments)}return s.fn=e,this.on(t,s),this},i.prototype.off=i.prototype.removeListener=i.prototype.removeAllListeners=i.prototype.removeEventListener=function(t,e){if(this._callbacks=this._callbacks||{},0==arguments.length)return this._callbacks={},this;var s=this._callbacks["$"+t];if(!s)return this;if(1==arguments.length)return delete this._callbacks["$"+t],this;for(var i,r=0;r<s.length;r++)if(i=s[r],i===e||i.fn===e){s.splice(r,1);break}return this},i.prototype.emit=function(t){this._callbacks=this._callbacks||{};var e=[].slice.call(arguments,1),s=this._callbacks["$"+t];if(s)for(var i=0,r=(s=s.slice(0)).length;r>i;++i)s[i].apply(this,e);return this},i.prototype.listeners=function(t){return this._callbacks=this._callbacks||{},this._callbacks["$"+t]||[]},i.prototype.hasListeners=function(t){return!!this.listeners(t).length};var r,n=Function.prototype.bind?function(t,e){return t.bind(e)}:function(t,e){return function(){t.apply(e,arguments)}},o={};function a(e,s){if("undefined"!=typeof window&&this===window)throw"use 'new NchanSubscriber(...)' to initialize";if(this.url=e,"string"==typeof(s=s||{})&&(s={subscriber:s}),s.transport&&!s.subscriber&&(s.subscriber=s.transport),"string"==typeof s.subscriber&&(s.subscriber=[s.subscriber]),this.desiredTransport=s.subscriber,s.shared){if(!("localStorage"in t))throw"localStorage unavailable for use in shared NchanSubscriber";var i="NchanSubscriber:"+this.url+":shared:",r=function(t){return i+t},o=t.localStorage;this.shared={id:""+Math.random()+Math.random(),key:r,get:function(t){return o.getItem(r(t))},set:function(t,e){return o.setItem(r(t),e)},setWithId:n(function(t,e){return this.shared.set(t,"##"+this.shared.id+":"+e)},this),getWithId:n(function(t){return this.shared.stripIdFromVal(this.shared.get(t))},this),stripIdFromVal:function(t){if(!t)return t;var e=t.indexOf(":");return t[0]==t[1]&&"#"==t[0]&&e?t.substring(e+1,t.length):t},remove:function(t){return o.removeItem(r(t))},matchEventKey:n(function(t,e){return(!t.storageArea||t.storageArea==o)&&t.key==r(e)},this),matchEventKeyWithId:n(function(t,e){if(this.shared.matchEventKey(t,e)){var s=t.newValue,i=s.indexOf(":");if(s[0]!=s[1]||"#"!=s[0]||!i)return!0;var r=s.substring(2,i);return r!=this.shared.id}return!1},this),setRole:n(function(t){if("master"==t&&"master"!=this.shared.role){var e=(new Date).getTime()/1e3;this.shared.setWithId("master:created",e),this.shared.setWithId("master:lastSeen",e)}return"slave"!=t||this.lastMessageId||(this.lastMessageId=this.shared.get("msg:id")),this.shared.role=t,this},this),demoteToSlave:n(function(){if("master"!=this.shared.role)throw"can't demote non-master to slave";this.running?(this.stop(),this.shared.setRole("slave"),this.initializeTransport(),this.start()):this.initializeTransport()},this),maybePromoteToMaster:n(function(){if(!this.running&&!this.starting)return this;if(!this.shared.maybePromotingToMaster){var e;this.shared.maybePromotingToMaster=!0;var s,i=0,r=Math.random(),o=r,a=n(function(t){var s=parseFloat(this.shared.getWithId("lotteryTime")),i=parseFloat(this.shared.getWithId("lottery")),r=!s||s>(new Date).getTime()-4e3;r&&i&&(!o||i>o)&&(o=i),t||e()},this);a(!0),this.shared.setWithId("lottery",r),this.shared.setWithId("lotteryTime",(new Date).getTime()/1e3);var h=n(function(t){if(this.shared.matchEventKeyWithId(t,"lottery")&&t.newValue){i+=1;var e=parseFloat(this.shared.stripIdFromVal(t.newValue)),s=parseFloat(this.shared.stripIdFromVal(t.oldValue));s>e&&this.shared.setWithId("lottery",s),(!o||e>=o)&&(o=e)}},this);t.addEventListener("storage",h);var c=n(function(){this.shared.maybePromotingToMaster=!1,t.removeEventListener("storage",h),s&&clearInterval(s),this.shared&&"master"==this.shared.role&&(this.shared.remove("lottery"),this.shared.remove("lotteryTime")),this.running?(this.stop(),this.initializeTransport(),this.start()):(this.initializeTransport(),this.starting&&this.start())},this);e=n(function(){r<o?(this.shared.setRole("slave"),c()):r>=o&&(0==i?(this.shared.setRole("master"),c()):i=0)},this),s=t.setInterval(a,2e3)}},this),masterCheckInterval:1e4}}var a;if(this.lastMessageId=s.id||s.msgId,this.reconnect=void 0===s.reconnect||s.reconnect,this.reconnectTimeout=s.reconnectTimeout||1e3,s.reconnect){var h,c="NchanSubscriber:"+e+":lastMessageId";if("persist"==s.reconnect){if(!(h="localStorage"in t&&t.localStorage))throw"can't use reconnect: 'persist' option: localStorage not available"}else{if("session"!=s.reconnect)throw"invalid 'reconnect' option value "+s.reconnect;if(!(h="sessionStorage"in t&&t.sessionStorage))throw"can't use reconnect: 'session' option: sessionStorage not available"}a=n(function(t){this.shared&&"slave"==this.shared.role||h.setItem(c,t)},this),this.lastMessageId=h.getItem(c)}else a=function(){};var l,d,u=n(function(){this.running&&this.stop(),this.shared&&"master"==this.shared.role&&this.shared.setWithId("status","disconnected")},this);t.addEventListener("beforeunload",u,!1),t.addEventListener("DOMContentLoaded",function(){t.removeEventListener("beforeunload",u,!1),t.addEventListener("unload",u,!1)},!1),l=this.shared?n(function(t,e){"master"==this.shared.role&&("message"==t?(this.shared.set("msg:id",e[1]&&e[1].id||""),this.shared.set("msg:content-type",e[1]&&e[1]["content-type"]||""),this.shared.set("msg",e[0])):"error"==t||("connecting"==t?this.shared.setWithId("status","connecting"):"connect"==t?this.shared.setWithId("status","connected"):"reconnect"==t?this.shared.setWithId("status","reconnecting"):"disconnect"==t&&this.shared.setWithId("status","disconnected")))},this):function(){};var p=n(function(){d||!this.running||!this.reconnect||this.transport.reconnecting||this.transport.doNotReconnect?l("disconnect"):(l("reconnect"),d=t.setTimeout(n(function(){d=null,this.stop(),this.start()},this),this.reconnectTimeout))},this);this.on("message",function(t,e){this.lastMessageId=e.id,e.id&&a(e.id),l("message",[t,e])}),this.on("error",function(t,e){p(t,e),l("error",[t,e])}),this.on("connect",function(){this.connected=!0,l("connect")}),this.on("__disconnect",function(t,e){this.connected=!1,this.emit("disconnect",t,e),p(t,e)})}function h(t,e){if(e){var s=t.match(/(\?.*)$/);t+=(s?"&":"?")+"last_event_id="+encodeURIComponent(e)}return t}return i(a.prototype),a.prototype.initializeTransport=function(t){if(t&&(this.desiredTransport=t),this.shared&&"slave"==this.shared.role)this.transport=new this.SubscriberClass.__slave(n(this.emit,this));else{var e,s=n(function(t){if(!this.SubscriberClass[t])throw"unknown subscriber type "+t;try{return this.transport=new this.SubscriberClass[t](n(this.emit,this)),this.transport}catch(t){}},this);if(this.desiredTransport)for(e=0;e<this.desiredTransport.length&&!s(this.desiredTransport[e]);e++);else for(e in this.SubscriberClass)if(this.SubscriberClass.hasOwnProperty(e)&&"_"!=e[0]&&s(e))break}if(!this.transport)throw"can't use any transport type"},a.prototype.start=function(){if(this.running)throw"Can't start NchanSubscriber, it's already started.";if(this.starting=!0,this.shared){if(o[this.url]&&o[this.url]!=this)throw"Only 1 shared subscriber allowed per url per window/tab.";if(o[this.url]=this,!this.shared.role){var e=this.shared.getWithId("status");r=n(function(t){this.shared.matchEventKeyWithId(t,"status")?"disconnected"==this.shared.stripIdFromVal(t.newValue)&&("slave"==this.shared.role?this.shared.maybePromoteToMaster():this.shared.role):"master"==this.shared.role&&this.shared.matchEventKeyWithId(t,"master:created")&&t.newValue&&this.shared.demoteToSlave()},this),t.addEventListener("storage",r),"disconnected"==e?this.shared.maybePromoteToMaster():(this.shared.setRole(e?"slave":"master"),this.initializeTransport())}"master"==this.shared.role?(this.shared.setWithId("status","connecting"),this.transport.listen(this.url,this.lastMessageId),this.running=!0,delete this.starting,this.shared.masterIntervalCheckID=t.setInterval(n(function(){this.shared.setWithId("master:lastSeen",(new Date).getTime()/1e3)},this),.8*this.shared.masterCheckInterval)):"slave"==this.shared.role&&(this.transport.listen(this.url,this.shared),this.running=!0,delete this.starting,this.shared.masterIntervalCheckID=t.setInterval(n(function(){var t=parseFloat(this.shared.getWithId("master:lastSeen"));(!t||t<(new Date).getTime()/1e3-this.shared.masterCheckInterval/1e3)&&this.shared.maybePromoteToMaster()},this),this.shared.masterCheckInterval))}else this.transport||this.initializeTransport(),this.transport.listen(this.url,this.lastMessageId),this.running=!0,delete this.starting;return this},a.prototype.stop=function(){if(!this.running)throw"Can't stop NchanSubscriber, it's not running.";return this.running=!1,r&&t.removeEventListener("storage",r),this.transport.cancel(),this.shared&&(delete o[this.url],this.shared.masterIntervalCheckID&&(clearInterval(this.shared.masterIntervalCheckID),delete this.shared.masterIntervalCheckID)),this},a.prototype.SubscriberClass={websocket:function(){function t(t){WebSocket,this.emit=t,this.name="websocket",this.opt={url:null,msgid:null,headers:{"Sec-WebSocket-Protocol":"ws+meta.nchan"}}}return t.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(1!=e&&"Sec-WebSocket-Protocol"in this.opt.headers)throw"WebSocket only supports one header; Sec-WebSocket-Protocol"},t.prototype.websocketizeURL=function(t){var e,s=t.match(/^((\w+:)?\/\/([^/]+))?(\/)?(.*)/),i=s[2],r=s[3],n=s[4],o=s[5];return"object"==typeof window?e=window.location:"object"==typeof document&&(e=document.location),!i&&e&&(i=e.protocol),"https:"==i?i="wss:":"http:"==i?i="ws:":"ws:"!=i&&(i="wss:"),!r&&e&&(r=e.host),i+"//"+r+(o=n?"/"+o:e?e.pathname.match(/(.*\/)[^/]*/)[1]+o:"/"+o)},t.prototype.listen=function(t,e){if(this.listener)throw"websocket already listening";this.opt.url=t,this.opt.msgid=e,this.setup(),t=h(t=this.websocketizeURL(this.opt.url),this.opt.msgid),this.listener=new WebSocket(t,this.opt.headers["Sec-WebSocket-Protocol"]);var s=this.listener;this.emit("transportNativeCreated",s,this.name),s.onmessage=n(function(t){if(t.data instanceof Blob){var e=t.data.slice(0,255),s=new FileReader;s.addEventListener("loadend",n(function(){var e=s.result.match(/^id: (.*)\n(content-type: (.*)\n)?\n/m);this.emit("message",t.data.slice(e[0].length),{id:e[1],"content-type":e[3]})},this)),s.readAsText(e)}else{var i=t.data.match(/^id: (.*)\n(content-type: (.*)\n)?\n/m);this.emit("message",t.data.substr(i[0].length),{id:i[1],"content-type":i[3]})}},this),s.onopen=n(function(t){this.emit("connect",t)},this),s.onerror=n(function(t){this.emit("error",t,s),delete this.listener},this),s.onclose=n(function(t){this.emit("__disconnect",t),delete this.listener},this)},t.prototype.cancel=function(){this.listener&&(this.emit("transportNativeBeforeDestroy",this.listener,this.name),this.listener.close(),delete this.listener)},t}(),eventsource:function(){function t(t){EventSource,this.emit=t,this.name="eventsource",this.opt={url:null,msgid:null,headers:{}}}return t.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(0!=e)throw"EventSource does not support headers"},t.prototype.listen=function(t,e){if(this.listener)throw"there's a ES listener running already";this.opt.url=t,this.opt.msgid=e,this.setup(),t=h(this.opt.url,this.opt.msgid),this.listener=new EventSource(t);var s=this.listener;this.emit("transportNativeCreated",s,this.name),s.onmessage=n(function(t){this.emit("message",t.data,{id:t.lastEventId})},this),s.onopen=n(function(t){this.reconnecting=!1,this.emit("connect",t)},this),s.onerror=n(function(t){this.listener.readyState!=EventSource.CONNECTING||this.reconnecting?this.emit("__disconnect",t):this.reconnecting||(this.reconnecting=!0,this.emit("__disconnect",t))},this)},t.prototype.cancel=function(){this.listener&&(this.emit("transportNativeBeforeDestroy",this.listener,this.name),this.listener.close(),delete this.listener)},t}(),longpoll:function(){function t(t){this.pollingRequest=null,this.longPollStartTime=null,this.maxLongPollTime=3e5,this.emit=t,this.name="longpoll",this.opt={url:null,msgid:null,headers:{}}}return t.prototype.setup=function(){var t;this.emit("transportSetup",this.opt,this.name);for(t in this.opt.headers);},t.prototype.listen=function(t,e){if(this.req)throw"already listening";this.opt.url=t,this.opt.msgid=e,e&&(this.opt.headers.Etag=e),this.setup();var i,r=n(function(t,e){t&&(this.opt.headers[e]=t)},this);return this.pollingRequest=n(function(){this.req&&this.emit("transportNativeBeforeDestroy",this.req,this.name),this.reqStartTime=(new Date).getTime(),this.req=s.ajax({url:this.opt.url,headers:this.opt.headers},i),this.emit("transportNativeCreated",this.req,this.name)},this),i=n(function(t,e,s){if(r(s.getResponseHeader("Last-Modified"),"If-Modified-Since"),r(s.getResponseHeader("Etag"),"If-None-Match"),t>=200&&t<=210){var i=s.getResponseHeader("Content-Type");this.parseMultipartMixedMessage(i,e,s)||this.emit("message",e||"",{"content-type":i,id:this.msgIdFromResponseHeaders(s)}),this.req&&this.pollingRequest()}else 0==t&&"Error"==e&&4==s.readyState||null===t&&"Abort"!=e?(this.emit("__disconnect",t||0,e),delete this.req):null!==t?(this.emit("error",t,e),delete this.req):(delete this.req,this.emit("__disconnect"))},this),this.pollingRequest(),this.emit("connect"),this},t.prototype.parseMultipartMixedMessage=function(t,e,s){var i=t&&t.match(/^multipart\/mixed;\s+boundary=(.*)$/);if(!i)return!1;var r=i[1],n=e.split("--"+r);if(""!=n[0]||!n[n.length-1].match(/--\r?\n/))throw"weird multipart/mixed split";n=n.slice(1,-1);for(var o in n){var a=(i=n[o].match(/^(.*)\r?\n\r?\n([\s\S]*)\r?\n$/m))[1].split("\n"),h={};for(var c in a){var l=a[c].match(/^([^:]+):\s+(.*)/);l&&"Content-Type"==l[1]&&(h["content-type"]=l[2])}o==n.length-1&&(h.id=this.msgIdFromResponseHeaders(s)),this.emit("message",i[2],h)}return!0},t.prototype.msgIdFromResponseHeaders=function(t){var e,s;return e=t.getResponseHeader("Last-Modified"),s=t.getResponseHeader("Etag"),e?Date.parse(e)/1e3+":"+(s||"0"):s||null},t.prototype.cancel=function(){return this.req&&(this.emit("transportNativeBeforeDestroy",this.req,this.name),this.req.abort(),delete this.req),this},t}(),__slave:function(){function s(t){this.emit=t,this.doNotReconnect=!0,this.shared=null,this.name="__slave",this.opt={url:null,msgid:null,headers:{}}}return s.prototype.setup=function(){this.emit("transportSetup",this.opt,this.name);var t,e=0;for(t in this.opt.headers)e++;if(0!=e)throw"__slave does not support headers"},s.prototype.listen=function(s,i){this.shared=i,this.opt.url=s,this.setup(),this.statusChangeChecker=n(function(t){if(this.shared.matchEventKey(t,"msg")){var s=this.shared.get("msg:id"),i=this.shared.get("msg:content-type"),r=this.shared.get("msg");this.emit("message",r,{id:""==s?e:s,"content-type":""==i?e:i})}},this),t.addEventListener("storage",this.statusChangeChecker)},s.prototype.cancel=function(){t.removeEventListener("storage",this.statusChangeChecker)},s}()},a}(t);"object"==typeof module&&null!=module&&module.exports?module.exports=i:"function"==typeof define&&define.amd?define(function(){return i}):t.NchanSubscriber=i}("undefined"!=typeof window?window:this);
 /* shortcuts, Version: 2.01.B, Copyright Binny V A */
 shortcut={all_shortcuts:{},add:function(l,p,i){var e={type:"keydown",propagate:!1,disable_in_input:!1,target:document,keycode:!1};if(i)for(var t in e)void 0===i[t]&&(i[t]=e[t]);else i=e;var a=i.target;"string"==typeof i.target&&(a=document.getElementById(i.target));l=l.toLowerCase();function r(e){var t;if(e=e||window.event,!i.disable_in_input||(e.target?t=e.target:e.srcElement&&(t=e.srcElement),3==t.nodeType&&(t=t.parentNode),"INPUT"!=t.tagName&&"TEXTAREA"!=t.tagName)){e.keyCode?code=e.keyCode:e.which&&(code=e.which);var a=String.fromCharCode(code).toLowerCase();188==code&&(a=","),190==code&&(a=".");var r=l.split("+"),n=0,s={"`":"~",1:"!",2:"@",3:"#",4:"$",5:"%",6:"^",7:"&",8:"*",9:"(",0:")","-":"_","=":"+",";":":","'":'"',",":"<",".":">","/":"?","\\":"|"},o={esc:27,escape:27,tab:9,space:32,return:13,enter:13,backspace:8,scrolllock:145,scroll_lock:145,scroll:145,capslock:20,caps_lock:20,caps:20,numlock:144,num_lock:144,num:144,pause:19,break:19,insert:45,home:36,delete:46,end:35,pageup:33,page_up:33,pu:33,pagedown:34,page_down:34,pd:34,left:37,up:38,right:39,down:40,f1:112,f2:113,f3:114,f4:115,f5:116,f6:117,f7:118,f8:119,f9:120,f10:121,f11:122,f12:123},d={shift:{wanted:!1,pressed:!1},ctrl:{wanted:!1,pressed:!1},alt:{wanted:!1,pressed:!1},meta:{wanted:!1,pressed:!1}};e.ctrlKey&&(d.ctrl.pressed=!0),e.shiftKey&&(d.shift.pressed=!0),e.altKey&&(d.alt.pressed=!0),e.metaKey&&(d.meta.pressed=!0);for(var c=0;k=r[c],c<r.length;c++)"ctrl"==k||"control"==k?(n++,d.ctrl.wanted=!0):"shift"==k?(n++,d.shift.wanted=!0):"alt"==k?(n++,d.alt.wanted=!0):"meta"==k?(n++,d.meta.wanted=!0):1<k.length?o[k]==code&&n++:i.keycode?i.keycode==code&&n++:a==k?n++:s[a]&&e.shiftKey&&(a=s[a])==k&&n++;return n!=r.length||d.ctrl.pressed!=d.ctrl.wanted||d.shift.pressed!=d.shift.wanted||d.alt.pressed!=d.alt.wanted||d.meta.pressed!=d.meta.wanted||(p(e),i.propagate)?void 0:(e.cancelBubble=!0,e.returnValue=!1,e.stopPropagation&&(e.stopPropagation(),e.preventDefault()),!1)}}this.all_shortcuts[l]={callback:r,target:a,event:i.type},a.addEventListener?a.addEventListener(i.type,r,!1):a.attachEvent?a.attachEvent("on"+i.type,r):a["on"+i.type]=r},remove:function(e){e=e.toLowerCase();var t=this.all_shortcuts[e];if(delete this.all_shortcuts[e],t){var a=t.event,r=t.target,n=t.callback;r.detachEvent?r.detachEvent("on"+a,n):r.removeEventListener?r.removeEventListener(a,n,!1):r["on"+a]=!1}}};
-/* sprintf function */
-function sprintf(){var r=arguments,e=r[0],n=1;return e.replace(/%((%)|s|d)/g,function(e){var a=null;if(e[2])a=e[2];else{switch(a=r[n],e){case"%d":a=parseFloat(a),isNaN(a)&&(a=0)}n++}return a})}
\ No newline at end of file

From 94c208b2e4af9e60a3403dae43ea473834c8f2b7 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 26 May 2020 12:39:40 +0200
Subject: [PATCH 4/8] Multi-language support

---
 plugins/dynamix/include/DefaultPageLayout.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index 462be421f..cfc32cd57 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -175,7 +175,8 @@ function chkDelete(form, button) {
 }
 function openBox(cmd,title,height,width,load,func,id) {
   // open shadowbox window (run in foreground)
-  var run = cmd.split('?')[0].substr(-4)=='.php' ? cmd+'&done=<?=_("Done")?>' : '/logging.htm?cmd='+cmd+'&csrf_token=<?=$var["csrf_token"]?>&done=<?=_("Done")?>';
+  var uri = cmd.split('?');
+  var run = uri[0].substr(-4)=='.php' ? cmd+(uri[1]?'&':'?')+'done=<?=_("Done")?>' : '/logging.htm?cmd='+cmd+'&csrf_token=<?=$var["csrf_token"]?>&done=<?=_("Done")?>';
   var options = load ? (func ? {modal:true,onClose:function(){setTimeout(func+'('+'"'+(id||'')+'")',0);}} : {modal:true,onClose:function(){location=location;}}) : {modal:false};
   Shadowbox.open({content:run, player:'iframe', title:title, height:Math.min(height,screen.availHeight), width:Math.min(width,screen.availWidth), options:options});
 }

From 73eaea201da9c18084929f1f082ffe24821d0a99 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 26 May 2020 17:39:36 +0200
Subject: [PATCH 5/8] Multi-language support

---
 logging.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging.htm b/logging.htm
index 378041704..129022f2d 100644
--- a/logging.htm
+++ b/logging.htm
@@ -83,7 +83,7 @@ function addLog(logLine) {
   }
 }
 function addCloseButton() {
-  var done = location.search.substr(1).split("&").slice(-1)[0].split('=')[1];
+  var done = location.search.split('&').pop().split('=')[1];
   addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (top.Shadowbox ? "top.Shadowbox" : "window") + ".close()'>"+done+"</button></p>");
 }
 </script>

From 643771f902d497c4270e4b8a8725a705c0777bf0 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 28 May 2020 17:40:42 +0200
Subject: [PATCH 6/8] Minor code optimisation

---
 plugins/dynamix/include/PageBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/dynamix/include/PageBuilder.php b/plugins/dynamix/include/PageBuilder.php
index 5e197a79e..ea616aa85 100644
--- a/plugins/dynamix/include/PageBuilder.php
+++ b/plugins/dynamix/include/PageBuilder.php
@@ -18,13 +18,13 @@ function get_ini_key($key,$default) {
   $var = $x>0 ? substr($key,1,$x-1) : substr($key,1);
   global $$var;
   eval("\$var=$key;");
-  return $var ? $var : $default;
+  return $var ?: $default;
 }
 
 function get_file_key($file,$default) {
   [$key, $default] = explode('=',$default,2);
   $var = @parse_ini_file($file);
-  return isset($var[$key]) ? $var[$key] : $default;
+  return $var[$key] ?? $default;
 }
 
 function build_pages($pattern) {

From 24473d2971c5abe6d72ae7a622a63aa3eab8bc99 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 28 May 2020 17:44:33 +0200
Subject: [PATCH 7/8] Multi-language support

---
 plugins/dynamix/include/DefaultPageLayout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/dynamix/include/DefaultPageLayout.php b/plugins/dynamix/include/DefaultPageLayout.php
index cfc32cd57..0d959fc6f 100644
--- a/plugins/dynamix/include/DefaultPageLayout.php
+++ b/plugins/dynamix/include/DefaultPageLayout.php
@@ -633,7 +633,7 @@ $(function() {
 <?if ($notify['entity'] & 1 == 1):?>
   $.post('/webGui/include/Notify.php',{cmd:'init'},function(){timers.notifier = setTimeout(notifier,0);});
 <?endif;?>
-  $('input[value="<?=_('Apply')?>"],input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').prop('disabled',true);
+  $('input[value="<?=_("Apply")?>"],input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').prop('disabled',true);
   $('form').find('select,input[type=text],input[type=number],input[type=password],input[type=checkbox],input[type=radio],input[type=file],textarea').each(function(){$(this).on('input change',function() {
     var form = $(this).parentsUntil('form').parent();
     form.find('input[value="<?=_("Apply")?>"],input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').not('input.lock').prop('disabled',false);

From 8f4f9b0682d5de79e25e3aaa1a6bff655ae23945 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Thu, 28 May 2020 18:36:57 +0200
Subject: [PATCH 8/8] Multi-language support

---
 plugins/dynamix/DashStats.page | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/plugins/dynamix/DashStats.page b/plugins/dynamix/DashStats.page
index dbf3ba1a7..fc77b9dd3 100644
--- a/plugins/dynamix/DashStats.page
+++ b/plugins/dynamix/DashStats.page
@@ -358,10 +358,24 @@ foreach ($ports as $port) {
 <i class='fa fa-fw chevron' id='fan_view' onclick='toggleChevron("fan_view",0)'></i>
 <a href='/Dashboard/FanSettings' title="_(Go to fan settings)_"><i class='fa fa-fw fa-cog chevron'></i></a>
 </td><td></td></tr>
-<?for ($f=0; $f<$fans; $f+=2) {
-  if ($f+1<$fans) echo "<tr class='fan_view'><td></td><td>"._("FAN")." ".($f)." - "._("FAN")." ".($f+1)."</td><td id='fan{$f}'>"."</td><td id='fan".($f+1)."'></td><td></td></tr>";
-  else echo "<tr class='fan_view'><td></td><td>"._("FAN")." ".($f)."</td><td colspan='2' id='fan{$f}'></td><td></td></tr>";
-}?>
+<?
+$tr_fan = "<tr class='fan_view'><td></td>";
+$tr_end = "<td></td></tr>";
+$hdr = []; $row = []; $i = 0;
+$hdr[0] = $row[0] = $tr_fan;
+for ($fan=0; $fan<$fans; $fan++) {
+  if ($fan && $fan%3==0) {
+    $hdr[$i] .= $tr_end; $row[$i] .= $tr_end; $i++;
+    $hdr[$i] = $row[$i] = $tr_fan;
+  }
+  $hdr[$i] .= "<td>"._('FAN')." $fan</td>";
+  $row[$i] .= "<td id='fan$fan'></td>";
+}
+$rest = ($fans%3) ? 3-($fans%3) : 0;
+for ($fan=0; $fan<$rest; $fan++) $hdr[$i] .= "<td></td>"; $row[$i] .= "<td></td>";
+if ($rest) {$hdr[$i] .= $tr_end; $row[$i] .= $tr_end;}
+for ($n=0; $n<=$i; $n++) echo $hdr[$n].$row[$n];
+?>
 </tbody>
 <?endif;?>
 </table>