maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge remote-tracking branch 'origin/master' into 0.10.0

Browse Source
This commit is contained in:
Michael Kaufmann
2018-10-20 14:06:19 +02:00
parent 95b305b865 c1809fc084
commit 3b31cd8432
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
actions/admin/settings/131.ssl.php
View File

@@ -40,7 +40,8 @@ return array(
'option_options' => array( 'option_options' => array(
'TLSv1' => 'TLSv1', 'TLSv1' => 'TLSv1',
'TLSv1.1' => 'TLSv1.1', 'TLSv1.1' => 'TLSv1.1',
'TLSv1.2' => 'TLSv1.2' 'TLSv1.2' => 'TLSv1.2',
'TLSv1.3' => 'TLSv1.3'
), ),
'save_method' => 'storeSettingField' 'save_method' => 'storeSettingField'
), ),

6
templates/Sparkle/assets/js/circular.js vendored
View File

@@ -75,7 +75,7 @@ $(document).ready(function() {
circularCircle(canvas, 42, 0, 270, 4, usedColor); circularCircle(canvas, 42, 0, 270, 4, usedColor);
circularCircle(canvas, 38, 0, 270, 4, assiColor); circularCircle(canvas, 38, 0, 270, 4, assiColor);
} }
circularText(canvas, 60, 42, 26, "∞") circularText(canvas, 60, 42, 26, "∞");
} else if (!isNaN(assigned)) { } else if (!isNaN(assigned)) {
// Limited ressources but assigned // Limited ressources but assigned
available = parseFloat(available); available = parseFloat(available);
@@ -90,7 +90,7 @@ $(document).ready(function() {
circularText(canvas, 60, 42, 22, usedP + "%"); circularText(canvas, 60, 42, 22, usedP + "%");
} else if (available == "∞") { } else if (available == "∞") {
circularCircle(canvas, 40, 0, 270, 8, unliColor); circularCircle(canvas, 40, 0, 270, 8, unliColor);
circularText(canvas, 60, 42, 26, "∞") circularText(canvas, 60, 42, 26, "∞");
} else { } else {
// Limited ressources // Limited ressources
available = parseFloat(available); available = parseFloat(available);
@@ -111,7 +111,7 @@ $(document).ready(function() {
if (usedP > 100) { if (usedP > 100) {
circularText(canvas, 60, 42, 22, usedP + "%", overColor); circularText(canvas, 60, 42, 22, usedP + "%", overColor);
} else { } else {
circularText(canvas, 60, 42, 22, usedP + "%") circularText(canvas, 60, 42, 22, usedP + "%");
} }

6
templates/Sparkle/assets/js/customers.js vendored
View File

@@ -30,7 +30,7 @@ $(document).ready(function() {
}, },
dataType: "json", dataType: "json",
success: function(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') { if (i == 'email_imap' || i == 'email_pop3' || i == 'perlenabled' || i == 'phpenabled' || i == 'dnsenabled') {
/** handle checkboxes **/ /** handle checkboxes **/
if (json[i] == 1) { if (json[i] == 1) {
@@ -42,8 +42,8 @@ $(document).ready(function() {
/** handle array of values **/ /** handle array of values **/
$("input[name='allowed_phpconfigs[]']").each(function(index) { $("input[name='allowed_phpconfigs[]']").each(function(index) {
$(this).prop('checked', false); $(this).prop('checked', false);
for (j in json[i]) { for (var j in json[i]) {
if ($(this).val() == json[i][j]) { if ($(this).val() == json[i][j]) {
$(this).prop('checked', true); $(this).prop('checked', true);
break; break;
} }

2
templates/Sparkle/assets/js/domains.js vendored
View File

@@ -35,7 +35,7 @@ $(document).ready(function() {
$('#phpsettingid option').each(function() { $('#phpsettingid option').each(function() {
var pid = $(this).val(); var pid = $(this).val();
$(this).attr("disabled", "disabled"); $(this).attr("disabled", "disabled");
for (i in json) { for (var i in json) {
if (pid == json[i]) { if (pid == json[i]) {
$(this).removeAttr("disabled"); $(this).removeAttr("disabled");
} }