pi-hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2024-12-06 19:36:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not use unicorn/switch-case-braces

Browse Source 
Signed-off-by: Christian König <ckoenig@posteo.de>
This commit is contained in:
Christian König
2022-11-24 20:13:19 +01:00
parent 7b172c5cbc
commit 65dd61845e
11 changed files with 113 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/pi-hole/js/db_queries.js
+24 -70
View File
@@ -233,35 +233,24 @@ $(function () {
var replyid = parseInt(data[6], 10);
var dnssecStatus;
switch (data[8]) {
case 1: {
case 1:
dnssecStatus = '<br><span class="text-green">SECURE';
break;
}
case 2: {
case 2:
dnssecStatus = '<br><span class="text-orange">INSECURE';
break;
}
case 3: {
case 3:
dnssecStatus = '<br><span class="text-red">BOGUS';
break;
}
case 4: {
case 4:
dnssecStatus = '<br><span class="text-red">ABANDONED';
break;
}
case 5: {
case 5:
dnssecStatus = '<br><span class="text-orange">UNKNOWN';
break;
}
default: {
default:
// No DNSSEC
dnssecStatus = "";
}
}
if (dnssecStatus.length > 0) {
@@ -273,15 +262,13 @@ $(function () {
buttontext = "",
blocked = false;
switch (data[4]) {
case 1: {
case 1:
fieldtext = "<span class='text-red'>Blocked (gravity)</span>";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 2: {
case 2:
fieldtext =
replyid === 0
? "<span class='text-green'>OK</span> (sent to <br class='hidden-lg'>"
@@ -290,124 +277,91 @@ $(function () {
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case 3: {
case 3:
fieldtext =
"<span class='text-green'>OK</span> <br class='hidden-lg'>(cache)" + dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case 4: {
case 4:
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist)";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 5: {
case 5:
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(exact blacklist)";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 6: {
case 6:
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(external, IP)";
blocked = true;
break;
}
case 7: {
case 7:
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(external, NULL)</span>";
blocked = true;
break;
}
case 8: {
case 8:
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(external, NXRA)</span>";
blocked = true;
break;
}
case 9: {
case 9:
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(gravity, CNAME)</span>";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 10: {
case 10:
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist, CNAME)</span>";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 11: {
case 11:
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(exact blacklist, CNAME)</span>";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case 12: {
case 12:
fieldtext = "<span class='text-green'>Retried</span>";
break;
}
case 13: {
case 13:
fieldtext = "<span class='text-green'>Retried</span> <br class='hidden-lg'>(ignored)";
break;
}
case 14: {
case 14:
fieldtext =
"<span class='text-green'>OK</span> <br class='hidden-lg'>(already forwarded)" +
dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case 15: {
case 15:
fieldtext =
"<span class='text-orange'>Blocked <br class='hidden-lg'>(database is busy)</span>";
blocked = true;
break;
}
case 16: {
case 16:
fieldtext =
"<span class='text-orange'>Blocked <br class='hidden-lg'>(special domain)</span>";
blocked = true;
break;
}
case 17: {
case 17:
fieldtext =
"<span class='text-orange'>OK</span> <br class='hidden-lg'>(stale cache)" +
dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
default: {
default:
fieldtext = "Unknown (" + parseInt(data[4], 10) + ")";
}
}
// Cannot block internal queries of this type
scripts/pi-hole/js/footer.js
+7 -14
View File
@@ -23,20 +23,18 @@ function piholeChanged(action) {
var dis = $("#pihole-disable");
switch (action) {
case "enabled": {
case "enabled":
status.html("<i class='fa fa-circle text-green-light'></i> Active");
ena.hide();
dis.show();
dis.removeClass("active");
break;
}
case "disabled": {
case "disabled":
status.html("<i class='fa fa-circle text-red'></i> Blocking disabled");
ena.show();
dis.hide();
break;
}
default:
// nothing
@@ -73,7 +71,7 @@ function piholeChange(action, duration) {
var btnStatus;
switch (action) {
case "enable": {
case "enable":
btnStatus = $("#flip-status-enable");
btnStatus.html("<i class='fa fa-spinner'> </i>");
$.getJSON("api.php?enable&token=" + token, function (data) {
@@ -83,9 +81,8 @@ function piholeChange(action, duration) {
}
});
break;
}
case "disable": {
case "disable":
btnStatus = $("#flip-status-disable");
btnStatus.html("<i class='fa fa-spinner'> </i>");
$.getJSON("api.php?disable=" + duration + "&token=" + token, function (data) {
@@ -99,7 +96,6 @@ function piholeChange(action, duration) {
}
});
break;
}
default:
// nothing
@@ -172,22 +168,19 @@ function initCPUtemp() {
var displaytemp = $("#tempdisplay");
if (!isNaN(temperature)) {
switch (unit) {
case "K": {
case "K":
temperature += 273.15;
displaytemp.html(temperature.toFixed(1) + "&nbsp;K");
break;
}
case "F": {
case "F":
temperature = (temperature * 9) / 5 + 32;
displaytemp.html(temperature.toFixed(1) + "&nbsp;&deg;F");
break;
}
default: {
default:
displaytemp.html(temperature.toFixed(1) + "&nbsp;&deg;C");
break;
}
}
}
}
scripts/pi-hole/js/groups-adlists.js
+15 -41
View File
@@ -44,44 +44,34 @@ function format(data) {
var numbers = true;
if (data.status !== null) {
switch (parseInt(data.status, 10)) {
case 0: {
case 0:
statusText =
data.enabled === 0
? "List is disabled and not checked"
: "List was not downloaded so far";
numbers = false;
break;
}
case 1: {
case 1:
statusText = 'List download was successful (<span class="list-status-1">OK</span>)';
break;
}
case 2: {
case 2:
statusText =
'List unchanged upstream, Pi-hole used a local copy (<span class="list-status-2">OK</span>)';
break;
}
case 3: {
case 3:
statusText =
'List unavailable, Pi-hole used a local copy (<span class="list-status-3">check list</span>)';
break;
}
case 4: {
case 4:
statusText =
'List unavailable, there is no local copy of this list available on your Pi-hole (<span class="list-status-4">replace list</span>)';
numbers = false;
break;
}
default: {
default:
statusText =
'Unknown (<span class="list-status-0">' + parseInt(data.status, 10) + "</span>)";
break;
}
}
}
@@ -178,30 +168,21 @@ function initTable() {
}
switch (statusCode) {
case 1: {
case 1:
statusIcon = "fa-check";
break;
}
case 2: {
case 2:
statusIcon = "fa-history";
break;
}
case 3: {
case 3:
statusIcon = "fa-exclamation-circle";
break;
}
case 4: {
case 4:
statusIcon = "fa-times";
break;
}
default: {
default:
statusIcon = "fa-question-circle";
break;
}
}
// Append red exclamation-triangle when there are invalid lines on the list
@@ -586,7 +567,7 @@ function editAdlist() {
var done = "edited";
var notDone = "editing";
switch (elem) {
case "status_" + id: {
case "status_" + id:
if (status === 0) {
done = "disabled";
notDone = "disabling";
@@ -596,24 +577,17 @@ function editAdlist() {
}
break;
}
case "comment_" + id: {
case "comment_" + id:
done = "edited comment of";
notDone = "editing comment of";
break;
}
case "multiselect_" + id: {
case "multiselect_" + id:
done = "edited groups of";
notDone = "editing groups of";
break;
}
default: {
default:
alert("bad element or invalid data-id!");
return;
}
}
utils.disableAll();
scripts/pi-hole/js/groups-clients.js
+3 -8
View File
@@ -467,22 +467,17 @@ function editClient() {
var done = "edited";
var notDone = "editing";
switch (elem) {
case "multiselect_" + id: {
case "multiselect_" + id:
done = "edited groups of";
notDone = "editing groups of";
break;
}
case "comment_" + id: {
case "comment_" + id:
done = "edited comment of";
notDone = "editing comment of";
break;
}
default: {
default:
alert("bad element or invalid data-id!");
return;
}
}
if (name.length > 0) {
scripts/pi-hole/js/groups-domains.js
+6 -17
View File
@@ -596,7 +596,7 @@ function editDomain() {
var done = "edited";
var notDone = "editing";
switch (elem) {
case "status_" + id: {
case "status_" + id:
if (status === 0) {
done = "disabled";
notDone = "disabling";
@@ -606,36 +606,25 @@ function editDomain() {
}
break;
}
case "name_" + id: {
case "name_" + id:
done = "edited name of";
notDone = "editing name of";
break;
}
case "comment_" + id: {
case "comment_" + id:
done = "edited comment of";
notDone = "editing comment of";
break;
}
case "type_" + id: {
case "type_" + id:
done = "edited type of";
notDone = "editing type of";
break;
}
case "multiselect_" + id: {
case "multiselect_" + id:
done = "edited groups of";
notDone = "editing groups of";
break;
}
default: {
default:
alert("bad element or invalid data-id!");
return;
}
}
utils.disableAll();
scripts/pi-hole/js/groups.js
+4 -11
View File
@@ -312,7 +312,7 @@ function editGroup() {
var done = "edited";
var notDone = "editing";
switch (elem) {
case "status_" + id: {
case "status_" + id:
if (status === 0) {
done = "disabled";
notDone = "disabling";
@@ -322,24 +322,17 @@ function editGroup() {
}
break;
}
case "name_" + id: {
case "name_" + id:
done = "edited name of";
notDone = "editing name of";
break;
}
case "desc_" + id: {
case "desc_" + id:
done = "edited description of";
notDone = "editing description of";
break;
}
default: {
default:
alert("bad element or invalid data-id!");
return;
}
}
utils.disableAll();
scripts/pi-hole/js/index.js
+12 -33
View File
@@ -123,7 +123,7 @@ var customTooltips = function (context) {
tooltipX = offsetX + caretX;
if (tooltip.yAlign === "top" || tooltip.yAlign === "bottom") {
switch (tooltip.xAlign) {
case "center": {
case "center":
// set a minimal X position to 5px to prevent
// the tooltip to stick out left of the viewport
var minX = 5;
@@ -135,44 +135,30 @@ var customTooltips = function (context) {
}
break;
}
case "left": {
case "left":
tooltipX -= arrowMinIndent;
arrowX = arrowMinIndent;
break;
}
case "right": {
case "right":
tooltipX -= tooltipWidth - arrowMinIndent;
arrowX = tooltipWidth - arrowMinIndent;
break;
}
default: {
default:
break;
}
}
} else if (tooltip.yAlign === "center") {
switch (tooltip.xAlign) {
case "left": {
case "left":
tooltipX += caretPadding;
break;
}
case "right": {
case "right":
tooltipX -= tooltipWidth - caretPadding;
break;
}
case "center": {
case "center":
tooltipX -= tooltipWidth / 2;
break;
}
default: {
default:
break;
}
}
}
} else {
@@ -193,12 +179,10 @@ var customTooltips = function (context) {
// Compute Y position
switch (tooltip.yAlign) {
case "top": {
case "top":
tooltipY = offsetY + caretY + arrowSize + caretPadding;
break;
}
case "center": {
case "center":
tooltipY = offsetY + caretY - tooltipHeight / 2;
if (tooltip.xAlign === "left") {
tooltipX += arrowSize;
@@ -207,16 +191,11 @@ var customTooltips = function (context) {
}
break;
}
case "bottom": {
case "bottom":
tooltipY = offsetY + caretY - tooltipHeight - arrowSize - caretPadding;
break;
}
default: {
default:
break;
}
}
// Position tooltip and display
scripts/pi-hole/js/messages.js
+11 -22
View File
@@ -26,7 +26,7 @@ function multiline(input) {
function renderMessage(data, type, row) {
// Display and search content
switch (row.type) {
case "REGEX": {
case "REGEX":
return (
'Encountered an error when processing <a href="groups-domains.php?domainid=' +
row.blob3 +
@@ -40,9 +40,8 @@ function renderMessage(data, type, row) {
row.message +
"</pre>"
);
}
case "SUBNET": {
case "SUBNET":
return (
"Client <code>" +
row.message +
@@ -57,9 +56,8 @@ function renderMessage(data, type, row) {
row.blob4 +
"</pre> to get the group configuration for this client."
);
}
case "HOSTNAME": {
case "HOSTNAME":
// eslint-disable-next-line unicorn/no-new-array
var hint = new Array(row.blob2 + row.message.length + 3).join(" ");
return (
@@ -75,13 +73,11 @@ function renderMessage(data, type, row) {
hint +
"&uarr;</pre>"
);
}
case "DNSMASQ_CONFIG": {
case "DNSMASQ_CONFIG":
return "FTL failed to start due to " + row.message;
}
case "RATE_LIMIT": {
case "RATE_LIMIT":
return (
"Client " +
row.message +
@@ -91,17 +87,15 @@ function renderMessage(data, type, row) {
parseInt(row.blob2, 10) +
" seconds)"
);
}
case "DNSMASQ_WARN": {
case "DNSMASQ_WARN":
return (
"Warning in <code>dnsmasq</code> core:<pre>" +
row.message +
'</pre> Check out <a href="https://docs.pi-hole.net/ftldns/dnsmasq_warn/" target="_blank">our documentation</a> for further information.'
);
}
case "LOAD": {
case "LOAD":
return (
"Long-term load (15min avg) larger than number of processors: <strong>" +
parseFloat(row.blob1).toFixed(1) +
@@ -109,9 +103,8 @@ function renderMessage(data, type, row) {
parseInt(row.blob2, 10) +
"</strong><br>This may slow down DNS resolution and can cause bottlenecks."
);
}
case "SHMEM": {
case "SHMEM":
return (
"RAM shortage (<code>" +
utils.escapeHtml(row.message) +
@@ -121,9 +114,8 @@ function renderMessage(data, type, row) {
utils.escapeHtml(row.blob2) +
"</pre>"
);
}
case "DISK": {
case "DISK":
return (
"Disk shortage (<code>" +
utils.escapeHtml(row.message) +
@@ -133,9 +125,8 @@ function renderMessage(data, type, row) {
utils.escapeHtml(row.blob2) +
"</pre>"
);
}
case "ADLIST": {
case "ADLIST":
return (
'<a href="groups-adlists.php?adlistid=' +
parseInt(row.blob1, 10) +
@@ -147,11 +138,9 @@ function renderMessage(data, type, row) {
utils.escapeHtml(row.message) +
"</pre>"
);
}
default: {
default:
return "Unknown message type<pre>" + JSON.stringify(row) + "</pre>";
}
}
}
scripts/pi-hole/js/queries.js
+25 -72
View File
@@ -82,35 +82,24 @@ $(function () {
var dnssecStatus;
var ede = data[11] ? data[11] : "";
switch (data[6]) {
case "1": {
case "1":
dnssecStatus = '<br><span class="text-green">SECURE';
break;
}
case "2": {
case "2":
dnssecStatus = '<br><span class="text-orange">INSECURE';
break;
}
case "3": {
case "3":
dnssecStatus = '<br><span class="text-red">BOGUS';
break;
}
case "4": {
case "4":
dnssecStatus = '<br><span class="text-red">ABANDONED';
break;
}
case "5": {
case "5":
dnssecStatus = '<br><span class="text-orange">UNKNOWN';
break;
}
default: {
default:
// No DNSSEC
dnssecStatus = "";
}
}
if (dnssecStatus.length > 0) {
@@ -132,15 +121,13 @@ $(function () {
}
switch (data[4]) {
case "1": {
case "1":
fieldtext = "<span class='text-red'>Blocked (gravity)</span>";
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
blocked = true;
break;
}
case "2": {
case "2":
fieldtext =
replyid === 0
? "<span class='text-green'>OK</span> (sent to <br class='hidden-lg'>"
@@ -150,57 +137,42 @@ $(function () {
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case "3": {
case "3":
fieldtext =
"<span class='text-green'>OK</span> <br class='hidden-lg'>(cache)" + dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case "4": {
fieldtext =
"<span class='text-red'>Blocked <https://eslint.org/docs/latest/rules/prefer-regex-literalsbr class='hidden-lg'>(regex blacklist)";
case "4":
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist)";
blocked = true;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
break;
}
case "5": {
case "5":
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(exact blacklist)";
blocked = true;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
break;
}
case "6": {
case "6":
fieldtext = "<span class='text-red'>Blocked <br class='hidden-lg'>(external, IP)";
blocked = true;
buttontext = "";
break;
}
case "7": {
case "7":
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(external, NULL)</span>";
blocked = true;
buttontext = "";
break;
}
case "8": {
case "8":
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(external, NXRA)</span>";
blocked = true;
buttontext = "";
break;
}
case "9": {
case "9":
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(gravity, CNAME)</span>";
blocked = true;
@@ -208,9 +180,7 @@ $(function () {
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
isCNAME = true;
break;
}
case "10": {
case "10":
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(regex blacklist, CNAME)</span>";
blocked = true;
@@ -218,9 +188,7 @@ $(function () {
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
isCNAME = true;
break;
}
case "11": {
case "11":
fieldtext =
"<span class='text-red'>Blocked <br class='hidden-lg'>(exact blacklist, CNAME)</span>";
blocked = true;
@@ -228,53 +196,38 @@ $(function () {
'<button type="button" class="btn btn-default btn-sm text-green"><i class="fas fa-check"></i> Whitelist</button>';
isCNAME = true;
break;
}
case "12": {
case "12":
fieldtext = "<span class='text-green'>Retried</span>";
break;
}
case "13": {
case "13":
fieldtext = "<span class='text-green'>Retried</span> <br class='hidden-lg'>(ignored)";
break;
}
case "14": {
case "14":
fieldtext =
"<span class='text-green'>OK</span> <br class='hidden-lg'>(already forwarded)" +
dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
case "15": {
case "15":
fieldtext =
"<span class='text-orange'>Blocked <br class='hidden-lg'>(database is busy)</span>";
blocked = true;
break;
}
case "16": {
case "16":
fieldtext =
"<span class='text-orange'>Blocked <br class='hidden-lg'>(special domain)</span>";
blocked = true;
break;
}
case "17": {
case "17":
fieldtext =
"<span class='text-orange'>OK</span> <br class='hidden-lg'>(stale cache)" +
dnssecStatus;
buttontext =
'<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
break;
}
default: {
default:
fieldtext = "Unknown (" + parseInt(data[4], 10) + ")";
}
}
// Add EDE here if available and not included in dnssecStatus
scripts/pi-hole/js/utils.js
+4 -12
View File
@@ -77,7 +77,7 @@ function showAlert(type, icon, title, message) {
var opts = {};
title = "&nbsp;<strong>" + title + "</strong><br>";
switch (type) {
case "info": {
case "info":
opts = {
type: "info",
icon: "far fa-clock",
@@ -86,9 +86,7 @@ function showAlert(type, icon, title, message) {
};
info = $.notify(opts);
break;
}
case "success": {
case "success":
opts = {
type: "success",
icon: icon,
@@ -102,9 +100,7 @@ function showAlert(type, icon, title, message) {
}
break;
}
case "warning": {
case "warning":
opts = {
type: "warning",
icon: "fas fa-exclamation-triangle",
@@ -118,9 +114,7 @@ function showAlert(type, icon, title, message) {
}
break;
}
case "error": {
case "error":
opts = {
type: "danger",
icon: "fas fa-times",
@@ -134,8 +128,6 @@ function showAlert(type, icon, title, message) {
}
break;
}
default:
}
}