diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt index 5dc965035..35087acfc 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/arp.volt @@ -67,11 +67,11 @@ POSSIBILITY OF SUCH DAMAGE. title: "{{ lang._('Flush ARP Table') }}", message: "{{ lang._('Flush the ARP cache manually, in case your ARP cache contains invalid data.') }}", buttons: [{ - label: "", + label: "", action: function(dialogRef) { dialogRef.close(); }}, { - label: "", + label: "", action: function(dialogRef) { ajaxCall("/api/diagnostics/interface/flushArp", {}, function (data, status) { $("#refresh").click(); diff --git a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt index 2d067c06e..66737514c 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Diagnostics/networkinsight.volt @@ -439,7 +439,7 @@ POSSIBILITY OF SUCH DAMAGE. }); if (total > 0) { var ndx = Math.floor( Math.log(total) / Math.log(kb) ); - var total = (total / Math.pow(kb, ndx)).toFixed(2) + ' ' + fileSizeTypes[ndx]; + total = (total / Math.pow(kb, ndx)).toFixed(2) + ' ' + fileSizeTypes[ndx]; } $("#total_interface_"+measure+" > td:eq(1)").html(total_in); $("#total_interface_"+measure+" > td:eq(2)").html(total_out); diff --git a/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt b/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt index 7a78c5356..7c034ed16 100644 --- a/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt +++ b/src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt @@ -156,19 +156,10 @@ case "is_resolvable": show_line("pac\\.match\\.hostname"); break; - case "dns_domain_is": - show_line("pac\\.match\\.hostname"); - break; case "dns_domain_levels": show_line("pac\\.match\\.domain_level_from"); show_line("pac\\.match\\.domain_level_to"); break; - case "dns_domain_is": - show_line("pac\\.match\\.hostname"); - break; - case "dns_domain_is": - show_line("pac\\.match\\.hostname"); - break; case "weekday_range": show_line("pac\\.match\\.weekday_from"); show_line("pac\\.match\\.weekday_to"); diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js index a144be311..2bf0f2e91 100644 --- a/src/opnsense/www/js/opnsense.js +++ b/src/opnsense/www/js/opnsense.js @@ -200,17 +200,17 @@ function clearFormValidation(parent) { */ function ajaxCall(url, sendData, callback) { return $.ajax({ - type: "POST", + type: 'POST', url: url, - dataType:"json", - contentType: "application/json", + dataType:'json', + contentType: 'application/json', complete: function(data, status) { - if ( callback == null ) { - null; - } else if ( "responseJSON" in data ) { - callback(data['responseJSON'],status); - } else { - callback(data,status); + if (callback != null) { + if ('responseJSON' in data) { + callback(data['responseJSON'], status); + } else { + callback(data, status); + } } }, data: JSON.stringify(sendData) @@ -226,17 +226,17 @@ function ajaxCall(url, sendData, callback) { */ function ajaxGet(url,sendData,callback) { return $.ajax({ - type: "GET", + type: 'GET', url: url, - dataType:"json", - contentType: "application/json", + dataType:'json', + contentType: 'application/json', complete: function(data,status) { - if ( callback == null ) { - null; - } else if ( "responseJSON" in data ) { - callback(data['responseJSON'],status); - } else { - callback({},status); + if (callback != null) { + if ('responseJSON' in data) { + callback(data['responseJSON'], status); + } else { + callback({}, status); + } } }, data: sendData diff --git a/src/www/firewall_schedule_edit.php b/src/www/firewall_schedule_edit.php index cb3bf4b15..20ef41d2e 100644 --- a/src/www/firewall_schedule_edit.php +++ b/src/www/firewall_schedule_edit.php @@ -487,7 +487,7 @@ function addTimeRange(){ var firstprint = false; var tempFriendlyMonthArray = monthstr.split(","); var tempFriendlyDayArray = daystr.split(","); - var currentDay, firstDay, nextDay, currentMonth, nextMonth, firstDay, firstMonth = ""; + var currentDay, firstDay, nextDay, firstMonth = 0; for (var k=0; k