From 20177e06fcde6e1ee1d62dd64c91dfe6ea9173ec Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 17 Oct 2018 11:45:25 +0200 Subject: [PATCH 1/3] Add missing semicolons This fixes warnings from LGTM: Avoid automated semicolon insertion (91% of all statements in the enclosing function have an explicit semicolon). Signed-off-by: Stefan Weil --- templates/Sparkle/assets/js/circular.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/Sparkle/assets/js/circular.js b/templates/Sparkle/assets/js/circular.js index 2a56e49e..085743bf 100644 --- a/templates/Sparkle/assets/js/circular.js +++ b/templates/Sparkle/assets/js/circular.js @@ -75,7 +75,7 @@ $(document).ready(function() { circularCircle(canvas, 42, 0, 270, 4, usedColor); circularCircle(canvas, 38, 0, 270, 4, assiColor); } - circularText(canvas, 60, 42, 26, "∞") + circularText(canvas, 60, 42, 26, "∞"); } else if (!isNaN(assigned)) { // Limited ressources but assigned available = parseFloat(available); @@ -90,7 +90,7 @@ $(document).ready(function() { circularText(canvas, 60, 42, 22, usedP + "%"); } else if (available == "∞") { circularCircle(canvas, 40, 0, 270, 8, unliColor); - circularText(canvas, 60, 42, 26, "∞") + circularText(canvas, 60, 42, 26, "∞"); } else { // Limited ressources available = parseFloat(available); @@ -111,7 +111,7 @@ $(document).ready(function() { if (usedP > 100) { circularText(canvas, 60, 42, 22, usedP + "%", overColor); } else { - circularText(canvas, 60, 42, 22, usedP + "%") + circularText(canvas, 60, 42, 22, usedP + "%"); } From 8cf797374d0051e3e9bb619258bad0e0704733df Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Wed, 17 Oct 2018 11:49:13 +0200 Subject: [PATCH 2/3] Add missing variable declarations This fixes warnings from LGTM: Variable i is used like a local variable, but is missing a declaration. Signed-off-by: Stefan Weil --- templates/Sparkle/assets/js/customers.js | 6 +++--- templates/Sparkle/assets/js/domains.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/Sparkle/assets/js/customers.js b/templates/Sparkle/assets/js/customers.js index 7863f345..46ff6e1e 100644 --- a/templates/Sparkle/assets/js/customers.js +++ b/templates/Sparkle/assets/js/customers.js @@ -30,7 +30,7 @@ $(document).ready(function() { }, dataType: "json", success: function(json) { - for (i in json) { + for (var i in json) { if (i == 'email_imap' || i == 'email_pop3' || i == 'perlenabled' || i == 'phpenabled' || i == 'dnsenabled') { /** handle checkboxes **/ if (json[i] == 1) { @@ -42,8 +42,8 @@ $(document).ready(function() { /** handle array of values **/ $("input[name='allowed_phpconfigs[]']").each(function(index) { $(this).prop('checked', false); - for (j in json[i]) { - if ($(this).val() == json[i][j]) { + for (var j in json[i]) { + if ($(this).val() == json[i][j]) { $(this).prop('checked', true); break; } diff --git a/templates/Sparkle/assets/js/domains.js b/templates/Sparkle/assets/js/domains.js index b95e04de..17304bce 100644 --- a/templates/Sparkle/assets/js/domains.js +++ b/templates/Sparkle/assets/js/domains.js @@ -35,7 +35,7 @@ $(document).ready(function() { $('#phpsettingid option').each(function() { var pid = $(this).val(); $(this).attr("disabled", "disabled"); - for (i in json) { + for (var i in json) { if (pid == json[i]) { $(this).removeAttr("disabled"); } From 090bdaaea8ebed67603c37c1b97d84ed41e1a76e Mon Sep 17 00:00:00 2001 From: quthla Date: Sat, 20 Oct 2018 13:29:25 +0200 Subject: [PATCH 3/3] Add TLSv1.3 --- actions/admin/settings/131.ssl.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php index 7bdeb3e4..0411f33d 100644 --- a/actions/admin/settings/131.ssl.php +++ b/actions/admin/settings/131.ssl.php @@ -40,7 +40,8 @@ return array( 'option_options' => array( 'TLSv1' => 'TLSv1', 'TLSv1.1' => 'TLSv1.1', - 'TLSv1.2' => 'TLSv1.2' + 'TLSv1.2' => 'TLSv1.2', + 'TLSv1.3' => 'TLSv1.3' ), 'save_method' => 'storeSettingField' ),