From 702f403696f15fa273494e0cf577a3fdac11a7eb Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Fri, 30 Jun 2023 19:26:27 -0300 Subject: [PATCH 1/4] Fix donate button - This is an external link Signed-off-by: RD WebDesign --- scripts/pi-hole/lua/sidebar.lp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/pi-hole/lua/sidebar.lp index 78394e75..4087c288 100644 --- a/scripts/pi-hole/lua/sidebar.lp +++ b/scripts/pi-hole/lua/sidebar.lp @@ -245,7 +245,7 @@
  • Donate
  • - + Donate
    • From ef513c2c48714920b19cb6a49f67ce7d4b0aecbd Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Fri, 30 Jun 2023 20:35:34 -0300 Subject: [PATCH 2/4] Fix previous spellcheck errors Signed-off-by: RD WebDesign --- scripts/pi-hole/js/groups.js | 2 +- scripts/pi-hole/js/queries.js | 2 +- scripts/pi-hole/js/settings-dns-records.js | 2 +- scripts/pi-hole/lua/theme.lua | 2 +- settings-api.lp | 2 +- settings-dhcp.lp | 4 ++-- settings-dns.lp | 2 +- settings-dnsrecords.lp | 2 +- settings-privacy.lp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js index 27ed8ce3..0beab5ba 100644 --- a/scripts/pi-hole/js/groups.js +++ b/scripts/pi-hole/js/groups.js @@ -14,7 +14,7 @@ function handleAjaxError(xhr, textStatus) { if (textStatus === "timeout") { alert("The server took too long to send the data."); } else { - alert("An unknown error occured while loading the data.\n" + xhr.responseText); + alert("An unknown error occurred while loading the data.\n" + xhr.responseText); } table.clear(); diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js index 4657c4d9..0e86974f 100644 --- a/scripts/pi-hole/js/queries.js +++ b/scripts/pi-hole/js/queries.js @@ -69,7 +69,7 @@ function handleAjaxError(xhr, textStatus) { if (textStatus === "timeout") { alert("The server took too long to send the data."); } else { - alert("An unknown error occured while loading the data.\n" + xhr.responseText); + alert("An unknown error occurred while loading the data.\n" + xhr.responseText); } $("#all-queries_processing").hide(); diff --git a/scripts/pi-hole/js/settings-dns-records.js b/scripts/pi-hole/js/settings-dns-records.js index fe3dd07d..869e7ba8 100644 --- a/scripts/pi-hole/js/settings-dns-records.js +++ b/scripts/pi-hole/js/settings-dns-records.js @@ -38,7 +38,7 @@ $(function () { rowCallback: function (row, data) { // Split record in format IP NAME1 [NAME2 [NAME3 [NAME...]]] var ip = data.substring(0, data.indexOf(" ")); - // The name can be mulitple domains separated by spaces + // The name can be multiple domains separated by spaces var name = data.substring(data.indexOf(" ") + 1); $(row).attr("data-id", data); diff --git a/scripts/pi-hole/lua/theme.lua b/scripts/pi-hole/lua/theme.lua index a6c5a953..788d6379 100644 --- a/scripts/pi-hole/lua/theme.lua +++ b/scripts/pi-hole/lua/theme.lua @@ -52,6 +52,6 @@ available_themes['lcars'] = { color = '#4488FF' } --- Get properties of currenty selected theme by asking FTL what the currently +-- Get properties of currently selected theme by asking FTL what the currently -- enabled theme is theme = available_themes[pihole.webtheme()] diff --git a/settings-api.lp b/settings-api.lp index 4fd926be..c7eac186 100644 --- a/settings-api.lp +++ b/settings-api.lp @@ -203,7 +203,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r') -

    IMPORTANT: If you lose your 2FA token, you will not be able to login. You will need to disable 2FA on the comand line and re-enable 2FA to generate a new secret.

    +

    IMPORTANT: If you lose your 2FA token, you will not be able to login. You will need to disable 2FA on the command line and re-enable 2FA to generate a new secret.

    diff --git a/settings-dhcp.lp b/settings-dhcp.lp index 7c584b0b..ff93911d 100644 --- a/settings-dhcp.lp +++ b/settings-dhcp.lp @@ -97,7 +97,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     
    -

    The DHCPv4 rapid commit option allows the Pi-hole DHCP server to assign an IP address to a client right away. This can noteably speed up the address assignment process and you will notice, e.g., faster WiFi joins in your network. This option should only be enabled if the Pi-hole DHCP server is the only DHCP server in your network.

    +

    The DHCPv4 rapid commit option allows the Pi-hole DHCP server to assign an IP address to a client right away. This can notably speed up the address assignment process and you will notice, e.g., faster WiFi joins in your network. This option should only be enabled if the Pi-hole DHCP server is the only DHCP server in your network.

     
    @@ -176,7 +176,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    • Addresses allocated like this are not constrained to be in the DHCP range specified above but they must be in the same subnet. For subnets which don't need a pool of dynamically allocated addresses, you can set a one-address range above and specify only static leases here.
    • It is allowed to use client identifiers (called client DUID in IPv6-land) rather than hardware addresses to identify hosts by prefixing with id:. Thus lines like id:01:02:03:04,..... refer to the host with client identifier 01:02:03:04. It is also allowed to specify the client ID as text, like this: id:clientidastext,.....
      • -
    • A single line may contain an IPv4 address or one or more IPv6 addresses, or both. IPv6 addresses must be bracketed by square brackets thus: laptop,[1234::56] IPv6 addresses may contain only the host-identifier part: laptop,[::56] in which case they act as wildcards in constructed DHCP ranges, with the appropriate network part inserted. For IPv6, an address may include a prefix length: laptop,[1234:50/126] which (in this case) specifies four addresses, 1234::50 to 1234::53. This (an the ability to specify multiple addresses) is useful when a host presents either a consistent name or hardware-ID, but varying DUIDs, since it allows dnsmasq to honour the static address allocation but assign a different adddress for each DUID. This typically occurs when chain netbooting, as each stage of the chain gets in turn allocates an address.
      • +
    • A single line may contain an IPv4 address or one or more IPv6 addresses, or both. IPv6 addresses must be bracketed by square brackets thus: laptop,[1234::56] IPv6 addresses may contain only the host-identifier part: laptop,[::56] in which case they act as wildcards in constructed DHCP ranges, with the appropriate network part inserted. For IPv6, an address may include a prefix length: laptop,[1234:50/126] which (in this case) specifies four addresses, 1234::50 to 1234::53. This (an the ability to specify multiple addresses) is useful when a host presents either a consistent name or hardware-ID, but varying DUIDs, since it allows dnsmasq to honour the static address allocation but assign a different address for each DUID. This typically occurs when chain netbooting, as each stage of the chain gets in turn allocates an address.
    • For DHCPv4, the special option id:* means "ignore any client-id and use MAC addresses only." This is useful when a client presents a client-id sometimes but not others.
    • If a name appears in /etc/hosts, the associated address can be allocated to a DHCP lease, but only if a separate line specifying the name also exists. Only one hostname can be given per line, but aliases are possible by using CNAMEs. Note that /etc/hosts is NOT used when the DNS server side of dnsmasq is disabled by setting the DNS server port to zero.
      • diff --git a/settings-dns.lp b/settings-dns.lp index c4f923f8..697b5e9b 100644 --- a/settings-dns.lp +++ b/settings-dns.lp @@ -42,7 +42,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    -

    The following list contains all DNS servers selected above. Furthermore, you can add your own custom DNS servers here. The expected format is one server per line in form of IP#port, where the port is optional. If given, it has to be separated by a hash # from the address (e.g. 127.0.0.1#5335 for a local unbound istance running on port 5335). The port defaults to 53 if omitted.

    +

    The following list contains all DNS servers selected above. Furthermore, you can add your own custom DNS servers here. The expected format is one server per line in form of IP#port, where the port is optional. If given, it has to be separated by a hash # from the address (e.g. 127.0.0.1#5335 for a local unbound instance running on port 5335). The port defaults to 53 if omitted.

    diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp index be4c2131..e89d6992 100644 --- a/settings-dnsrecords.lp +++ b/settings-dnsrecords.lp @@ -99,7 +99,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    - +
    diff --git a/settings-privacy.lp b/settings-privacy.lp index a4e9ef9a..42643d17 100644 --- a/settings-privacy.lp +++ b/settings-privacy.lp @@ -20,7 +20,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
    -

    The currently configued logging file is

    +

    The currently configured logging file is

    From a43ea6ae5fa5f897f7a5f64688e20559620b20a9 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Fri, 30 Jun 2023 21:36:13 -0300 Subject: [PATCH 3/4] Fix previous prettier error Signed-off-by: RD WebDesign --- style/pi-hole.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/style/pi-hole.css b/style/pi-hole.css index c3f91802..89598b34 100644 --- a/style/pi-hole.css +++ b/style/pi-hole.css @@ -1133,9 +1133,13 @@ table.dataTable tbody > tr > .selected { } @keyframes error-border { - 0% { border-color: rgba(255,0,0,0.5) } - 50% { border-color: rgba(255,0,0,0.2) } - 100% { border-color: rgba(255,0,0,0.5) } + 0%, + 100% { + border-color: rgba(255, 0, 0, 0.5); + } + 50% { + border-color: rgba(255, 0, 0, 0.2); + } } .error-box { From e8703f8182631f9834a9975ea3e0e04e0483d47e Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Fri, 30 Jun 2023 21:41:04 -0300 Subject: [PATCH 4/4] Replacing "splitted" with "CNAMEarr" to avoid Spellcheck errors Signed-off-by: RD WebDesign --- scripts/pi-hole/js/settings-dns-records.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pi-hole/js/settings-dns-records.js b/scripts/pi-hole/js/settings-dns-records.js index 869e7ba8..a0b2a5e1 100644 --- a/scripts/pi-hole/js/settings-dns-records.js +++ b/scripts/pi-hole/js/settings-dns-records.js @@ -110,7 +110,7 @@ $(function () { }, rowCallback: function (row, data) { // Split record in format ,[,] - var splitted = data.split(","); + var CNAMEarr = data.split(","); $(row).attr("data-id", data); var button = @@ -122,9 +122,9 @@ $(function () { '' + ""; $("td:eq(3)", row).html(button); - $("td:eq(0)", row).text(splitted[0]); - $("td:eq(1)", row).text(splitted[1]); - if (splitted.length > 2) $("td:eq(2)", row).text(splitted[2]); + $("td:eq(0)", row).text(CNAMEarr[0]); + $("td:eq(1)", row).text(CNAMEarr[1]); + if (CNAMEarr.length > 2) $("td:eq(2)", row).text(CNAMEarr[2]); else $("td:eq(2)", row).text("-"); }, dom: