From 05eb5a9962d9c1646527f063beeba22bf3f7793b Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 24 Feb 2025 18:52:26 +0100
Subject: [PATCH 01/45] Tweak convertUptime() to not rely on external date

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/padd.sh b/padd.sh
index 8fa5ef8..a4d0878 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1413,8 +1413,12 @@ truncateString() {
 # Converts seconds to days, hours, minutes
 # https://unix.stackexchange.com/a/338844
 convertUptime() {
-    # shellcheck disable=SC2016
-    eval "echo $(date -ud "@$1" +'$((%s/3600/24)) days, %H hours, %M minutes')"
+
+  local D=$(($1/60/60/24))
+  local H=$(($1/60/60%24))
+  local M=$(($1/60%60))
+
+  printf "%d days, %02d hours, %02d minutes" $D $H $M
 }
 
 secretRead() {

From 2f7ebaa84e4a405aa3fe19a976024477c50847ab Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Thu, 27 Feb 2025 17:59:46 +0100
Subject: [PATCH 02/45] Fix resize during startup

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/padd.sh b/padd.sh
index 8fa5ef8..32c7110 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1887,6 +1887,9 @@ main(){
 
     StartupRoutine ${padd_size}
 
+    # Run SizeChecker again to account for resizing during startup
+    SizeChecker
+
     # Run PADD
     NormalPADD
 }

From 8233ca6a35959f9d495f7f1c56727c58121560e4 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Thu, 27 Feb 2025 22:14:05 +0100
Subject: [PATCH 03/45] Fix indention

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 732 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 366 insertions(+), 366 deletions(-)

diff --git a/padd.sh b/padd.sh
index a4d0878..b7f43e4 100755
--- a/padd.sh
+++ b/padd.sh
@@ -261,82 +261,82 @@ DeleteSession() {
             "401") moveXOffset; printf "%b" "Logout attempt without a valid session. Unauthorized!\n";;
          esac;
     else
-      # no session to delete, just print a newline for nicer output
-      echo
+        # no session to delete, just print a newline for nicer output
+        echo
     fi
 
 }
 
 Authenticate() {
-  sessionResponse="$(curl --connect-timeout 2 -skS -X POST "${API_URL}auth" --user-agent "PADD ${padd_version}" --data "{\"password\":\"${password}\", \"totp\":${totp:-null}}" )"
+    sessionResponse="$(curl --connect-timeout 2 -skS -X POST "${API_URL}auth" --user-agent "PADD ${padd_version}" --data "{\"password\":\"${password}\", \"totp\":${totp:-null}}" )"
 
-  if [ -z "${sessionResponse}" ]; then
-    moveXOffset; echo "No response from FTL server. Please check connectivity and use the options to set the API URL"
-    moveXOffset; echo "Usage: $0 [--server <domain|IP>]"
-    exit 1
-  fi
-  # obtain validity, session ID and sessionMessage from session response
-  validSession=$(echo "${sessionResponse}"| jq .session.valid 2>/dev/null)
-  SID=$(echo "${sessionResponse}"| jq --raw-output .session.sid 2>/dev/null)
-  sessionMessage=$(echo "${sessionResponse}"| jq --raw-output .session.message 2>/dev/null)
+    if [ -z "${sessionResponse}" ]; then
+        moveXOffset; echo "No response from FTL server. Please check connectivity and use the options to set the API URL"
+        moveXOffset; echo "Usage: $0 [--server <domain|IP>]"
+        exit 1
+    fi
+    # obtain validity, session ID and sessionMessage from session response
+    validSession=$(echo "${sessionResponse}"| jq .session.valid 2>/dev/null)
+    SID=$(echo "${sessionResponse}"| jq --raw-output .session.sid 2>/dev/null)
+    sessionMessage=$(echo "${sessionResponse}"| jq --raw-output .session.message 2>/dev/null)
 
-  # obtain the error message from the session response
-  sessionError=$(echo "${sessionResponse}"| jq --raw-output .error.message 2>/dev/null)
+    # obtain the error message from the session response
+    sessionError=$(echo "${sessionResponse}"| jq --raw-output .error.message 2>/dev/null)
 }
 
 GetFTLData() {
-  local response
-  local data
-  local status
+    local response
+    local data
+    local status
 
-  # get the data from querying the API as well as the http status code
-  response=$(curl --connect-timeout 2 -sk -w "%{http_code}" -X GET "${API_URL}$1$2" -H "Accept: application/json" -H "sid: ${SID}" )
+    # get the data from querying the API as well as the http status code
+    response=$(curl --connect-timeout 2 -sk -w "%{http_code}" -X GET "${API_URL}$1$2" -H "Accept: application/json" -H "sid: ${SID}" )
 
-  # status are the last 3 characters
-  # not using ${response#"${response%???}"}" here because it's extremely slow on big responses
-  status=$(printf "%s" "${response}" | tail -c 3)
-  # data is everything from response without the last 3 characters
-  data=$(printf %s "${response%???}")
+    # status are the last 3 characters
+    # not using ${response#"${response%???}"}" here because it's extremely slow on big responses
+    status=$(printf "%s" "${response}" | tail -c 3)
+    # data is everything from response without the last 3 characters
+    data=$(printf %s "${response%???}")
 
-  if [ "${status}" = 200 ]; then
-    echo "${data}"
-  elif [ "${status}" = 000 ]; then
-    # connection lost
-    echo "000"
-  elif [ "${status}" = 401 ]; then
-    # unauthorized
-    echo "401"
-  fi
+    if [ "${status}" = 200 ]; then
+        echo "${data}"
+    elif [ "${status}" = 000 ]; then
+        # connection lost
+        echo "000"
+    elif [ "${status}" = 401 ]; then
+        # unauthorized
+        echo "401"
+    fi
 }
 
 
 ############################################# GETTERS ##############################################
 
 GetPADDData() {
-  local response
-  response=$(GetFTLData "padd" "$1")
+    local response
+    response=$(GetFTLData "padd" "$1")
 
-  if [ "${response}" = 000 ]; then
-    # connection lost
-    padd_data="000"
-  elif [ "${response}" = 401 ]; then
-    # unauthorized
-    padd_data="401"
-  else
-    # Iterate over all the leaf paths in the JSON object and creates key-value
-    # pairs in the format "key=value". Nested objects are flattened using the dot
-    # notation, e.g., { "a": { "b": 1 } } becomes "a.b=1".
-    # We cannot use leaf_paths here as it was deprecated in jq 1.6 and removed in
-    # current master
-    # Using "paths(scalars | true)" will return null and false values.
-    # We also check if the value is exactly `null` and, in this case, return the
-    # string "null", as jq would return an empty string for nulls.
-    padd_data=$(echo "$response" | jq -r 'paths(scalars | true) as $p | [$p | join(".")] + [if getpath($p)!=null then getpath($p) else "null" end] | join("=")' 2>/dev/null)
-  fi
+    if [ "${response}" = 000 ]; then
+        # connection lost
+        padd_data="000"
+    elif [ "${response}" = 401 ]; then
+        # unauthorized
+        padd_data="401"
+    else
+        # Iterate over all the leaf paths in the JSON object and creates key-value
+        # pairs in the format "key=value". Nested objects are flattened using the dot
+        # notation, e.g., { "a": { "b": 1 } } becomes "a.b=1".
+        # We cannot use leaf_paths here as it was deprecated in jq 1.6 and removed in
+        # current master
+        # Using "paths(scalars | true)" will return null and false values.
+        # We also check if the value is exactly `null` and, in this case, return the
+        # string "null", as jq would return an empty string for nulls.
+        padd_data=$(echo "$response" | jq -r 'paths(scalars | true) as $p | [$p | join(".")] + [if getpath($p)!=null then getpath($p) else "null" end] | join("=")' 2>/dev/null)
+    fi
 }
 
 GetPADDValue() {
-  echo "$padd_data" | sed -n "s/^$1=//p" 2>/dev/null
+    echo "$padd_data" | sed -n "s/^$1=//p" 2>/dev/null
 }
 
 GetSummaryInformation() {
@@ -358,33 +358,33 @@ GetSummaryInformation() {
     fi
 
 
-  clients=$(GetPADDValue active_clients)
+    clients=$(GetPADDValue active_clients)
 
-  blocking_enabled=$(GetPADDValue blocking)
+    blocking_enabled=$(GetPADDValue blocking)
 
-  domains_being_blocked_raw=$(GetPADDValue gravity_size)
-  domains_being_blocked=$(printf "%.f" "${domains_being_blocked_raw}")
+    domains_being_blocked_raw=$(GetPADDValue gravity_size)
+    domains_being_blocked=$(printf "%.f" "${domains_being_blocked_raw}")
 
-  dns_queries_today_raw=$(GetPADDValue queries.total)
-  dns_queries_today=$(printf "%.f" "${dns_queries_today_raw}")
+    dns_queries_today_raw=$(GetPADDValue queries.total)
+    dns_queries_today=$(printf "%.f" "${dns_queries_today_raw}")
 
-  ads_blocked_today_raw=$(GetPADDValue queries.blocked)
-  ads_blocked_today=$(printf "%.f" "${ads_blocked_today_raw}")
+    ads_blocked_today_raw=$(GetPADDValue queries.blocked)
+    ads_blocked_today=$(printf "%.f" "${ads_blocked_today_raw}")
 
-  ads_percentage_today_raw=$(GetPADDValue queries.percent_blocked)
-  ads_percentage_today=$(printf "%.1f" "${ads_percentage_today_raw}")
+    ads_percentage_today_raw=$(GetPADDValue queries.percent_blocked)
+    ads_percentage_today=$(printf "%.1f" "${ads_percentage_today_raw}")
 
-  cache_size=$(GetPADDValue cache.size)
-  cache_evictions=$(GetPADDValue cache.evicted)
-  cache_inserts=$(echo "${padd_data}"| GetPADDValue cache.inserted)
+    cache_size=$(GetPADDValue cache.size)
+    cache_evictions=$(GetPADDValue cache.evicted)
+    cache_inserts=$(echo "${padd_data}"| GetPADDValue cache.inserted)
 
-  latest_blocked_raw=$(GetPADDValue recent_blocked)
+    latest_blocked_raw=$(GetPADDValue recent_blocked)
 
-  top_blocked_raw=$(GetPADDValue top_blocked)
+    top_blocked_raw=$(GetPADDValue top_blocked)
 
-  top_domain_raw=$(GetPADDValue top_domain)
+    top_domain_raw=$(GetPADDValue top_domain)
 
-  top_client_raw=$(GetPADDValue top_client)
+    top_client_raw=$(GetPADDValue top_client)
 }
 
 GetSystemInformation() {
@@ -685,19 +685,19 @@ GetPiholeInformation() {
 
 
 
-  # ${ftl_dns_port} == 0 DNS server part of dnsmasq disabled
-  dns_down_flag=false
-  if [ "${ftl_dns_port}" = 0 ]; then
-    dns_status="DNS offline"
-    dns_heatmap=${red_text}
-    dns_check_box=${check_box_bad}
-    # set flag to change the status message in SetStatusMessage()
-    dns_down_flag=true
-  else
-    dns_check_box=${check_box_good}
-    dns_status="Active"
-    dns_heatmap=${green_text}
-fi
+    # ${ftl_dns_port} == 0 DNS server part of dnsmasq disabled
+    dns_down_flag=false
+    if [ "${ftl_dns_port}" = 0 ]; then
+        dns_status="DNS offline"
+        dns_heatmap=${red_text}
+        dns_check_box=${check_box_bad}
+        # set flag to change the status message in SetStatusMessage()
+        dns_down_flag=true
+    else
+        dns_check_box=${check_box_good}
+        dns_status="Active"
+        dns_heatmap=${green_text}
+    fi
 }
 
 GetVersionInformation() {
@@ -863,89 +863,89 @@ GetVersionInformation() {
 }
 
 GetPADDInformation() {
-  # If PADD is running inside docker, immediately return without checking for an update
-  if [ ! "${DOCKER_VERSION}" = "null" ]; then
-    return
-  fi
-
-  # PADD version information...
-  padd_version_latest="$(curl --connect-timeout 5 --silent https://api.github.com/repos/pi-hole/PADD/releases/latest | grep '"tag_name":' | awk -F \" '{print $4}')"
-  # is PADD up-to-date?
-  padd_out_of_date_flag=false
-  if [ -z "${padd_version_latest}" ]; then
-    padd_version_heatmap=${yellow_text}
-  else
-    padd_version_latest_converted="$(VersionConverter "${padd_version_latest}")"
-    padd_version_converted=$(VersionConverter "${padd_version}")
-
-    if [ "${padd_version_converted}" -lt "${padd_version_latest_converted}" ]; then
-      padd_out_of_date_flag="true"
-      padd_version_heatmap=${red_text}
-    else
-      # local and remote PADD version match or local is newer
-      padd_version_heatmap=${green_text}
+    # If PADD is running inside docker, immediately return without checking for an update
+    if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        return
+    fi
+
+    # PADD version information...
+    padd_version_latest="$(curl --connect-timeout 5 --silent https://api.github.com/repos/pi-hole/PADD/releases/latest | grep '"tag_name":' | awk -F \" '{print $4}')"
+    # is PADD up-to-date?
+    padd_out_of_date_flag=false
+    if [ -z "${padd_version_latest}" ]; then
+        padd_version_heatmap=${yellow_text}
+    else
+        padd_version_latest_converted="$(VersionConverter "${padd_version_latest}")"
+        padd_version_converted=$(VersionConverter "${padd_version}")
+
+        if [ "${padd_version_converted}" -lt "${padd_version_latest_converted}" ]; then
+        padd_out_of_date_flag="true"
+        padd_version_heatmap=${red_text}
+        else
+        # local and remote PADD version match or local is newer
+        padd_version_heatmap=${green_text}
+        fi
     fi
-  fi
 }
 
 GenerateSizeDependendOutput() {
-  if [ "$1" = "pico" ] || [ "$1" = "nano" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 9 "color")
+    if [ "$1" = "pico" ] || [ "$1" = "nano" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 9 "color")
 
-  elif  [ "$1" = "micro" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 10 "color")
+    elif  [ "$1" = "micro" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 10 "color")
 
-  elif [ "$1" = "mini" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 20 "color")
+    elif [ "$1" = "mini" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 20 "color")
 
-    latest_blocked=$(truncateString "$latest_blocked_raw" 29)
-    top_blocked=$(truncateString "$top_blocked_raw" 29)
+        latest_blocked=$(truncateString "$latest_blocked_raw" 29)
+        top_blocked=$(truncateString "$top_blocked_raw" 29)
 
-  elif [ "$1" = "tiny" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
+    elif [ "$1" = "tiny" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
 
-    latest_blocked=$(truncateString "$latest_blocked_raw" 41)
-    top_blocked=$(truncateString "$top_blocked_raw" 41)
-    top_domain=$(truncateString "$top_domain_raw" 41)
-    top_client=$(truncateString "$top_client_raw" 41)
+        latest_blocked=$(truncateString "$latest_blocked_raw" 41)
+        top_blocked=$(truncateString "$top_blocked_raw" 41)
+        top_domain=$(truncateString "$top_domain_raw" 41)
+        top_client=$(truncateString "$top_client_raw" 41)
 
-  elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 40 "color")
+    elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 40 "color")
 
-    latest_blocked=$(truncateString "$latest_blocked_raw" 48)
-    top_blocked=$(truncateString "$top_blocked_raw" 48)
-    top_domain=$(truncateString "$top_domain_raw" 48)
-    top_client=$(truncateString "$top_client_raw" 48)
+        latest_blocked=$(truncateString "$latest_blocked_raw" 48)
+        top_blocked=$(truncateString "$top_blocked_raw" 48)
+        top_domain=$(truncateString "$top_domain_raw" 48)
+        top_client=$(truncateString "$top_client_raw" 48)
 
 
-  elif [ "$1" = "mega" ]; then
-    ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
+    elif [ "$1" = "mega" ]; then
+        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
 
-    latest_blocked=$(truncateString "$latest_blocked_raw" 68)
-    top_blocked=$(truncateString "$top_blocked_raw" 68)
-    top_domain=$(truncateString "$top_domain_raw" 68)
-    top_client=$(truncateString "$top_client_raw" 68)
+        latest_blocked=$(truncateString "$latest_blocked_raw" 68)
+        top_blocked=$(truncateString "$top_blocked_raw" 68)
+        top_domain=$(truncateString "$top_domain_raw" 68)
+        top_client=$(truncateString "$top_client_raw" 68)
 
-  fi
+    fi
 
-  # System uptime
-  if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
-    system_uptime="$(convertUptime "${system_uptime_raw}" | awk -F ',' '{print $1 "," $2}')"
-  else
-    system_uptime="$(convertUptime "${system_uptime_raw}")"
-  fi
+    # System uptime
+    if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
+        system_uptime="$(convertUptime "${system_uptime_raw}" | awk -F ',' '{print $1 "," $2}')"
+    else
+        system_uptime="$(convertUptime "${system_uptime_raw}")"
+    fi
 
-  #  Bar generations
-  if [ "$1" = "mini" ]; then
-    cpu_bar=$(BarGenerator "${cpu_percent}" 20)
-    memory_bar=$(BarGenerator "${memory_percent}" 20)
-  elif [ "$1" = "tiny" ]; then
-    cpu_bar=$(BarGenerator "${cpu_percent}" 7)
-    memory_bar=$(BarGenerator "${memory_percent}" 7)
-  else
-    cpu_bar=$(BarGenerator "${cpu_percent}" 10)
-    memory_bar=$(BarGenerator "${memory_percent}" 10)
-  fi
+    #  Bar generations
+    if [ "$1" = "mini" ]; then
+        cpu_bar=$(BarGenerator "${cpu_percent}" 20)
+        memory_bar=$(BarGenerator "${memory_percent}" 20)
+    elif [ "$1" = "tiny" ]; then
+        cpu_bar=$(BarGenerator "${cpu_percent}" 7)
+        memory_bar=$(BarGenerator "${memory_percent}" 7)
+    else
+        cpu_bar=$(BarGenerator "${cpu_percent}" 10)
+        memory_bar=$(BarGenerator "${memory_percent}" 10)
+    fi
 }
 
 SetStatusMessage() {
@@ -1014,43 +1014,43 @@ SetStatusMessage() {
 ############################################# PRINTERS #############################################
 
 PrintLogo() {
-  if [ ! "${DOCKER_VERSION}" = "null" ]; then
-      version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
-    else
-      version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
-  fi
+    if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
+        else
+        version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
+    fi
 
-  # Screen size checks
-  if [ "$1" = "pico" ]; then
-    printf "%s${clear_line}\n" "p${padd_text} ${pico_status}"
-  elif [ "$1" = "nano" ]; then
-    printf "%s${clear_line}\n" "n${padd_text} ${mini_status}"
-  elif [ "$1" = "micro" ]; then
-    printf "%s${clear_line}\n${clear_line}\n" "µ${padd_text}     ${mini_status}"
-  elif [ "$1" = "mini" ]; then
-    printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}mini${reset_text}  ${mini_status}"
-  elif [ "$1" = "tiny" ]; then
-    printf "%s${clear_line}\n" "${padd_text}${dim_text}tiny${reset_text}   ${version_info}${reset_text}"
-    printf "%s${clear_line}\n" "           PADD ${padd_version_heatmap}${padd_version}${reset_text} ${tiny_status}${reset_text}"
-  elif [ "$1" = "slim" ]; then
-    printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}slim${reset_text}   ${full_status}"
-  elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
-    printf "%s${clear_line}\n" "${padd_logo_1}"
-    printf "%s${clear_line}\n" "${padd_logo_2}${version_info}${reset_text}"
-    printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_3}PADD ${padd_version_heatmap}${padd_version}${reset_text}   ${full_status}${reset_text}"
-  # normal or not defined
-  else
-    printf "%s${clear_line}\n" "${padd_logo_retro_1}"
-    printf "%s${clear_line}\n" "${padd_logo_retro_2}   ${version_info}, PADD ${padd_version_heatmap}${padd_version}${reset_text}"
-    printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_retro_3}   ${dns_check_box} DNS   ${ftl_check_box} FTL   ${mega_status}${reset_text}"
-  fi
+    # Screen size checks
+    if [ "$1" = "pico" ]; then
+        printf "%s${clear_line}\n" "p${padd_text} ${pico_status}"
+    elif [ "$1" = "nano" ]; then
+        printf "%s${clear_line}\n" "n${padd_text} ${mini_status}"
+    elif [ "$1" = "micro" ]; then
+        printf "%s${clear_line}\n${clear_line}\n" "µ${padd_text}     ${mini_status}"
+    elif [ "$1" = "mini" ]; then
+        printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}mini${reset_text}  ${mini_status}"
+    elif [ "$1" = "tiny" ]; then
+        printf "%s${clear_line}\n" "${padd_text}${dim_text}tiny${reset_text}   ${version_info}${reset_text}"
+        printf "%s${clear_line}\n" "           PADD ${padd_version_heatmap}${padd_version}${reset_text} ${tiny_status}${reset_text}"
+    elif [ "$1" = "slim" ]; then
+        printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}slim${reset_text}   ${full_status}"
+    elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
+        printf "%s${clear_line}\n" "${padd_logo_1}"
+        printf "%s${clear_line}\n" "${padd_logo_2}${version_info}${reset_text}"
+        printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_3}PADD ${padd_version_heatmap}${padd_version}${reset_text}   ${full_status}${reset_text}"
+    # normal or not defined
+    else
+        printf "%s${clear_line}\n" "${padd_logo_retro_1}"
+        printf "%s${clear_line}\n" "${padd_logo_retro_2}   ${version_info}, PADD ${padd_version_heatmap}${padd_version}${reset_text}"
+        printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_retro_3}   ${dns_check_box} DNS   ${ftl_check_box} FTL   ${mega_status}${reset_text}"
+    fi
 }
 
 PrintDashboard() {
     if [ ! "${DOCKER_VERSION}" = "null" ]; then
-      version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
+        version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
     else
-      version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
+        version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
     fi
     # Move cursor to (0,0).
     printf '\e[H'
@@ -1216,26 +1216,26 @@ PrintDashboard() {
 # Provides a color based on a provided percentage
 # takes in one or two parameters
 HeatmapGenerator () {
-  # if one number is provided, just use that percentage to figure out the colors
-  if [ -z "$2" ]; then
-    load=$(printf "%.0f" "$1")
-  # if two numbers are provided, do some math to make a percentage to figure out the colors
-  else
-    load=$(printf "%.0f" "$(echo "$1 $2" | awk '{print ($1 / $2) * 100}')")
-  fi
+    # if one number is provided, just use that percentage to figure out the colors
+    if [ -z "$2" ]; then
+        load=$(printf "%.0f" "$1")
+    # if two numbers are provided, do some math to make a percentage to figure out the colors
+    else
+        load=$(printf "%.0f" "$(echo "$1 $2" | awk '{print ($1 / $2) * 100}')")
+    fi
 
-  # Color logic
-  #  |<-                 green                  ->| yellow |  red ->
-  #  0  5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100
-  if [ "${load}" -lt 75 ]; then
-    out=${green_text}
-  elif [ "${load}" -lt 90 ]; then
-    out=${yellow_text}
-  else
-    out=${red_text}
-  fi
+    # Color logic
+    #  |<-                 green                  ->| yellow |  red ->
+    #  0  5 10 15 20 25 30 35 40 45 50 55 60 65 70 75 80 85 90 95 100
+    if [ "${load}" -lt 75 ]; then
+        out=${green_text}
+    elif [ "${load}" -lt 90 ]; then
+        out=${yellow_text}
+    else
+        out=${red_text}
+    fi
 
-  echo "$out"
+    echo "$out"
 }
 
 # Provides a "bar graph"
@@ -1244,32 +1244,32 @@ HeatmapGenerator () {
 # $2: max length of the bar
 # $3: colored flag, if "color" backfill with color
 BarGenerator() {
-  # number of filled in cells in the bar
-  barNumber=$(printf %.f "$(echo "$1 $2" | awk '{print ($1 / 100) * $2}')")
-  frontFill=$(for i in $(seq "$barNumber"); do printf "%b" "■"; done)
+    # number of filled in cells in the bar
+    barNumber=$(printf %.f "$(echo "$1 $2" | awk '{print ($1 / 100) * $2}')")
+    frontFill=$(for i in $(seq "$barNumber"); do printf "%b" "■"; done)
 
-  # remaining "unfilled" cells in the bar
-  backfillNumber=$(($2-barNumber))
+    # remaining "unfilled" cells in the bar
+    backfillNumber=$(($2-barNumber))
 
-  # if the filled in cells is less than the max length of the bar, fill it
-  if [ "$barNumber" -lt "$2" ]; then
-    # if the bar should be colored
-    if [ "$3" = "color" ]; then
-      # fill the rest in color
-      backFill=$(for i in $(seq $backfillNumber); do printf "%b" "■"; done)
-      out="${red_text}${frontFill}${green_text}${backFill}${reset_text}"
-    # else, it shouldn't be colored in
+    # if the filled in cells is less than the max length of the bar, fill it
+    if [ "$barNumber" -lt "$2" ]; then
+        # if the bar should be colored
+        if [ "$3" = "color" ]; then
+        # fill the rest in color
+        backFill=$(for i in $(seq $backfillNumber); do printf "%b" "■"; done)
+        out="${red_text}${frontFill}${green_text}${backFill}${reset_text}"
+        # else, it shouldn't be colored in
+        else
+        # fill the rest with "space"
+        backFill=$(for i in $(seq $backfillNumber); do printf "%b" "·"; done)
+        out="${frontFill}${reset_text}${backFill}"
+        fi
+    # else, fill it all the way
     else
-      # fill the rest with "space"
-      backFill=$(for i in $(seq $backfillNumber); do printf "%b" "·"; done)
-      out="${frontFill}${reset_text}${backFill}"
+        out=$(for i in $(seq "$2"); do printf "%b" "■"; done)
     fi
-  # else, fill it all the way
-  else
-    out=$(for i in $(seq "$2"); do printf "%b" "■"; done)
-  fi
 
-  echo "$out"
+    echo "$out"
 }
 
 # Checks the size of the screen and sets the value of ${padd_data}_size
@@ -1355,7 +1355,7 @@ SizeChecker(){
 # converts a given version string e.g. v3.7.1 to 3007001000 to allow for easier comparison of multi digit version numbers
 # credits https://apple.stackexchange.com/a/123408
 VersionConverter() {
-  echo "$@" | tr -d '[:alpha:]' | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }';
+    echo "$@" | tr -d '[:alpha:]' | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }';
 }
 
 moveYOffset(){
@@ -1414,11 +1414,11 @@ truncateString() {
 # https://unix.stackexchange.com/a/338844
 convertUptime() {
 
-  local D=$(($1/60/60/24))
-  local H=$(($1/60/60%24))
-  local M=$(($1/60%60))
+    local D=$(($1/60/60/24))
+    local H=$(($1/60/60%24))
+    local M=$(($1/60%60))
 
-  printf "%d days, %02d hours, %02d minutes" $D $H $M
+    printf "%d days, %02d hours, %02d minutes" $D $H $M
 }
 
 secretRead() {
@@ -1535,144 +1535,144 @@ ShowVersion() {
         version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
     else
         printf "%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
-  fi
+    fi
 }
 
 StartupRoutine(){
 
-  if [ "$1" = "ants" ]; then
-    # If the screen is too small from the beginning, exit
-    printf "%b" "${check_box_bad} Error!\n    PADD isn't\n    for ants!\n"
-    exit 1
-  fi
-
-  # Clear the screen and move cursor to (0,0).
-  # This mimics the 'clear' command.
-  # https://vt100.net/docs/vt510-rm/ED.html
-  # https://vt100.net/docs/vt510-rm/CUP.html
-  # E3 extension `\e[3J` to clear the scrollback buffer see 'man clear'
-  printf '\e[H\e[2J\e[3J'
-
-  # adds the y-offset
-  moveYOffset
-
-  if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
-    moveXOffset; PrintLogo "$1"
-    moveXOffset; printf "%b" "START-UP ===========\n"
-
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-
-    # Authenticate with the FTL server
-    moveXOffset; printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    moveXOffset; printf "%b" "Starting PADD...\n"
-
-    moveXOffset; printf "%b" " [■·········]  10%\r"
-
-    # Request PADD data
-    GetPADDData
-
-    # Check for updates
-    moveXOffset; printf "%b" " [■■········]  20%\r"
-    moveXOffset; printf "%b" " [■■■·······]  30%\r"
-
-    # Get our information for the first time
-    moveXOffset; printf "%b" " [■■■■······]  40%\r"
-    GetVersionInformation
-    moveXOffset; printf "%b" " [■■■■■·····]  50%\r"
-    GetSummaryInformation
-    moveXOffset; printf "%b" " [■■■■■■····]  60%\r"
-    GetPiholeInformation
-    moveXOffset; printf "%b" " [■■■■■■■···]  70%\r"
-    GetNetworkInformation
-    moveXOffset; printf "%b" " [■■■■■■■■··]  80%\r"
-    GetSystemInformation
-    moveXOffset; printf "%b" " [■■■■■■■■■·]  90%\r"
-    GetPADDInformation
-    moveXOffset; printf "%b" " [■■■■■■■■■■] 100%\n"
-
-  elif [ "$1" = "mini" ]; then
-    moveXOffset; PrintLogo "$1"
-    moveXOffset; echo "START UP ====================="
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-    # Authenticate with the FTL server
-    moveXOffset; printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    # Request PADD data
-    moveXOffset; echo "- Requesting PADD information..."
-    GetPADDData
-
-    # Get our information for the first time
-    moveXOffset; echo "- Gathering version info."
-    GetVersionInformation
-    moveXOffset; echo "- Gathering system info."
-    GetSystemInformation
-    moveXOffset; echo "- Gathering CPU/DNS info."
-    GetPiholeInformation
-    GetSummaryInformation
-    moveXOffset; echo "- Gathering network info."
-    GetNetworkInformation
-    GetPADDInformation
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-      moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
-    else
-      moveXOffset; echo "  - Core $CORE_VERSION, Web $WEB_VERSION"
-      moveXOffset; echo "  - FTL $FTL_VERSION, PADD ${padd_version}"
+    if [ "$1" = "ants" ]; then
+        # If the screen is too small from the beginning, exit
+        printf "%b" "${check_box_bad} Error!\n    PADD isn't\n    for ants!\n"
+        exit 1
     fi
 
-  else
-    moveXOffset; printf "%b" "${padd_logo_retro_1}\n"
-    moveXOffset; printf "%b" "${padd_logo_retro_2}Pi-hole® Ad Detection Display\n"
-    moveXOffset; printf "%b" "${padd_logo_retro_3}A client for Pi-hole\n\n"
-    if [ "$1" = "tiny" ]; then
-      moveXOffset; echo "START UP ============================================"
+    # Clear the screen and move cursor to (0,0).
+    # This mimics the 'clear' command.
+    # https://vt100.net/docs/vt510-rm/ED.html
+    # https://vt100.net/docs/vt510-rm/CUP.html
+    # E3 extension `\e[3J` to clear the scrollback buffer see 'man clear'
+    printf '\e[H\e[2J\e[3J'
+
+    # adds the y-offset
+    moveYOffset
+
+    if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
+        moveXOffset; PrintLogo "$1"
+        moveXOffset; printf "%b" "START-UP ===========\n"
+
+        # Test if the authentication endpoint is available
+        TestAPIAvailability
+
+        # Authenticate with the FTL server
+        moveXOffset; printf "%b" "Establishing connection with FTL...\n"
+        LoginAPI
+
+        moveXOffset; printf "%b" "Starting PADD...\n"
+
+        moveXOffset; printf "%b" " [■·········]  10%\r"
+
+        # Request PADD data
+        GetPADDData
+
+        # Check for updates
+        moveXOffset; printf "%b" " [■■········]  20%\r"
+        moveXOffset; printf "%b" " [■■■·······]  30%\r"
+
+        # Get our information for the first time
+        moveXOffset; printf "%b" " [■■■■······]  40%\r"
+        GetVersionInformation
+        moveXOffset; printf "%b" " [■■■■■·····]  50%\r"
+        GetSummaryInformation
+        moveXOffset; printf "%b" " [■■■■■■····]  60%\r"
+        GetPiholeInformation
+        moveXOffset; printf "%b" " [■■■■■■■···]  70%\r"
+        GetNetworkInformation
+        moveXOffset; printf "%b" " [■■■■■■■■··]  80%\r"
+        GetSystemInformation
+        moveXOffset; printf "%b" " [■■■■■■■■■·]  90%\r"
+        GetPADDInformation
+        moveXOffset; printf "%b" " [■■■■■■■■■■] 100%\n"
+
+    elif [ "$1" = "mini" ]; then
+        moveXOffset; PrintLogo "$1"
+        moveXOffset; echo "START UP ====================="
+        # Test if the authentication endpoint is available
+        TestAPIAvailability
+        # Authenticate with the FTL server
+        moveXOffset; printf "%b" "Establishing connection with FTL...\n"
+        LoginAPI
+
+        # Request PADD data
+        moveXOffset; echo "- Requesting PADD information..."
+        GetPADDData
+
+        # Get our information for the first time
+        moveXOffset; echo "- Gathering version info."
+        GetVersionInformation
+        moveXOffset; echo "- Gathering system info."
+        GetSystemInformation
+        moveXOffset; echo "- Gathering CPU/DNS info."
+        GetPiholeInformation
+        GetSummaryInformation
+        moveXOffset; echo "- Gathering network info."
+        GetNetworkInformation
+        GetPADDInformation
+        if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
+        else
+        moveXOffset; echo "  - Core $CORE_VERSION, Web $WEB_VERSION"
+        moveXOffset; echo "  - FTL $FTL_VERSION, PADD ${padd_version}"
+        fi
+
     else
-      moveXOffset; echo "START UP ==================================================="
+        moveXOffset; printf "%b" "${padd_logo_retro_1}\n"
+        moveXOffset; printf "%b" "${padd_logo_retro_2}Pi-hole® Ad Detection Display\n"
+        moveXOffset; printf "%b" "${padd_logo_retro_3}A client for Pi-hole\n\n"
+        if [ "$1" = "tiny" ]; then
+        moveXOffset; echo "START UP ============================================"
+        else
+        moveXOffset; echo "START UP ==================================================="
+        fi
+
+        # Test if the authentication endpoint is available
+        TestAPIAvailability
+
+        # Authenticate with the FTL server
+        moveXOffset; printf "%b" "Establishing connection with FTL...\n"
+        LoginAPI
+
+        # Request PADD data
+        moveXOffset; echo "- Requesting PADD information..."
+        GetPADDData
+
+        # Get our information for the first time
+        moveXOffset; echo "- Gathering version information..."
+        GetVersionInformation
+        moveXOffset; echo "- Gathering system information..."
+        GetSystemInformation
+        moveXOffset; echo "- Gathering CPU/DNS information..."
+        GetSummaryInformation
+        GetPiholeInformation
+        moveXOffset; echo "- Gathering network information..."
+        GetNetworkInformation
+
+        GetPADDInformation
+        if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
+        else
+        moveXOffset; echo "  - Pi-hole Core $CORE_VERSION"
+        moveXOffset; echo "  - Web Admin $WEB_VERSION"
+        moveXOffset; echo "  - FTL $FTL_VERSION"
+        moveXOffset; echo "  - PADD ${padd_version}"
+        fi
     fi
 
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-
-    # Authenticate with the FTL server
-    moveXOffset; printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    # Request PADD data
-    moveXOffset; echo "- Requesting PADD information..."
-    GetPADDData
-
-    # Get our information for the first time
-    moveXOffset; echo "- Gathering version information..."
-    GetVersionInformation
-    moveXOffset; echo "- Gathering system information..."
-    GetSystemInformation
-    moveXOffset; echo "- Gathering CPU/DNS information..."
-    GetSummaryInformation
-    GetPiholeInformation
-    moveXOffset; echo "- Gathering network information..."
-    GetNetworkInformation
-
-    GetPADDInformation
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-      moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
-    else
-      moveXOffset; echo "  - Pi-hole Core $CORE_VERSION"
-      moveXOffset; echo "  - Web Admin $WEB_VERSION"
-      moveXOffset; echo "  - FTL $FTL_VERSION"
-      moveXOffset; echo "  - PADD ${padd_version}"
-    fi
-  fi
-
-  moveXOffset; printf "%s" "- Starting in "
-  for i in 3 2 1
-  do
-    printf "%s..." "$i"
-    sleep 1
-  done
+    moveXOffset; printf "%s" "- Starting in "
+    for i in 3 2 1
+    do
+        printf "%s..." "$i"
+        sleep 1
+    done
 }
 
 NormalPADD() {
@@ -1897,19 +1897,19 @@ main(){
 
 # Process all options (if present)
 while [ "$#" -gt 0 ]; do
-  case "$1" in
-    "-j" | "--json"     ) xOffset=0; OutputJSON; exit 0;;
-    "-u" | "--update"   ) Update;;
-    "-h" | "--help"     ) DisplayHelp; exit 0;;
-    "-v" | "--version"  ) xOffset=0; ShowVersion; exit 0;;
-    "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
-    "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
-    "--server"          ) SERVER="$2"; shift;;
-    "--secret"          ) password="$2"; shift;;
-    "--2fa"             ) totp="$2"; shift;;
-    *                   ) DisplayHelp; exit 1;;
-  esac
-  shift
+    case "$1" in
+        "-j" | "--json"     ) xOffset=0; OutputJSON; exit 0;;
+        "-u" | "--update"   ) Update;;
+        "-h" | "--help"     ) DisplayHelp; exit 0;;
+        "-v" | "--version"  ) xOffset=0; ShowVersion; exit 0;;
+        "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
+        "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
+        "--server"          ) SERVER="$2"; shift;;
+        "--secret"          ) password="$2"; shift;;
+        "--2fa"             ) totp="$2"; shift;;
+        *                   ) DisplayHelp; exit 1;;
+    esac
+    shift
 done
 
 main

From cde0ac75165d8fc0e0d788286d2dd6986f5e83a3 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Thu, 27 Feb 2025 22:34:09 -0300
Subject: [PATCH 04/45] Fix typo: replace "remmote" with "remote"

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 padd.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/padd.sh b/padd.sh
index 32c7110..7dcdefc 100755
--- a/padd.sh
+++ b/padd.sh
@@ -739,7 +739,7 @@ GetVersionInformation() {
     # Gather core version information...
     CORE_BRANCH="$(GetPADDValue version.core.local.branch)"
     CORE_VERSION="$(GetPADDValue version.core.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
-    GITHUB_CORE_VERSION="$(GetPADDValue version.core.remmote.version  | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
+    GITHUB_CORE_VERSION="$(GetPADDValue version.core.remote.version  | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
     CORE_HASH="$(GetPADDValue version.core.local.hash)"
     GITHUB_CORE_HASH="$(GetPADDValue version.core.remote.hash)"
 
@@ -780,7 +780,7 @@ GetVersionInformation() {
     if [ ! "$WEB_VERSION" = "null" ]; then
         WEB_BRANCH="$(GetPADDValue version.web.local.branch)"
         WEB_VERSION="$(GetPADDValue version.web.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
-        GITHUB_WEB_VERSION="$(GetPADDValue version.web.remmote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
+        GITHUB_WEB_VERSION="$(GetPADDValue version.web.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
         WEB_HASH="$(GetPADDValue version.web.local.hash)"
         GITHUB_WEB_HASH="$(GetPADDValue version.web.remote.hash)"
 
@@ -824,7 +824,7 @@ GetVersionInformation() {
     # Gather FTL version information...
     FTL_BRANCH="$(GetPADDValue version.ftl.local.branch)"
     FTL_VERSION="$(GetPADDValue version.ftl.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
-    GITHUB_FTL_VERSION="$(GetPADDValue version.ftl.remmote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
+    GITHUB_FTL_VERSION="$(GetPADDValue version.ftl.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
     FTL_HASH="$(GetPADDValue version.ftl.local.hash)"
     GITHUB_FTL_HASH="$(GetPADDValue version.ftl.remote.hash)"
 

From 9745bdbaa5230e591ed7beab4c1122090632c2a5 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Fri, 28 Feb 2025 11:44:08 +0100
Subject: [PATCH 05/45] Minor Readme tweaks

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1165c55..9c24de2 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ PADD (formerly Chronometer2) is a more expansive version of the original chronom
 
 ### PADD from other machine
 
-With PADD v4.0.0 and Pi-hole v6 it is also possible to run PADD from a machine that is not running Pi-hole
+- With PADD v4.0.0 and Pi-hole v6 it is also possible to run PADD from a machine that is not running Pi-hole
 
   ```bash
   ./padd.sh --server <DOMAIN|IP>
@@ -50,7 +50,7 @@ With PADD v4.0.0 and Pi-hole v6 it is also possible to run PADD from a machine t
 
 Pi-hole v6 uses a completely new API with a new authentication mechanism
 
-If you run PADD on the same machine as Pi-hole, it's possible to bypass authentication when your local user is member of the `pihole` group (specifically, if you can access `/etc/pihole/cli_pw).
+If you run PADD on the same machine as Pi-hole, it's possible to bypass authentication when your local user is member of the `pihole` group (specifically, if you can access `/etc/pihole/cli_pw`).
 For details see [https://github.com/pi-hole/FTL/pull/1999](https://github.com/pi-hole/FTL/pull/1999)
 
 If this is not the case, PADD will ask you for your password and (if configured) your two factor authentication token. You can also pass those as arguments

From 506c0b6d78aca2289ef7386cbcba96d3bcbd7cd7 Mon Sep 17 00:00:00 2001
From: Rob Gill <rrobgill@protonmail.com>
Date: Tue, 4 Mar 2025 18:55:38 +1000
Subject: [PATCH 06/45] Prevent transient error messages where no temperature
 is provided (#428)

Signed-off-by: Rob Gill <rrobgill@protonmail.com>
---
 padd.sh | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/padd.sh b/padd.sh
index e48facd..ae2be77 100755
--- a/padd.sh
+++ b/padd.sh
@@ -414,27 +414,33 @@ GetSystemInformation() {
 
     # CPU temperature and unit
     cpu_temp_raw=$(GetPADDValue sensors.cpu_temp)
-    cpu_temp=$(printf "%.1f" "${cpu_temp_raw}")
-    temp_unit=$(echo "${padd_data}"  | GetPADDValue sensors.unit)
+    if [ $cpu_temp_raw != null ]; then
+        cpu_temp=$(printf "%.1f" "${cpu_temp_raw}")
+        temp_unit=$(echo "${padd_data}"  | GetPADDValue sensors.unit)
+    fi
 
     # Temp + Unit
     if [ "${temp_unit}" = "C" ]; then
         temperature="${cpu_temp}°${temp_unit}"
         # no conversion needed
         cpu_temp_celsius="$(echo "${cpu_temp}" | awk -F '.' '{print $1}')"
+        temp_unicode=true
     elif [ "${temp_unit}" = "F" ]; then
         temperature="${cpu_temp}°${temp_unit}"
         # convert to Celsius for limit checking
         cpu_temp_celsius="$(echo "${cpu_temp}" | awk '{print ($1-32) * 5 / 9}' | awk -F '.' '{print $1}')"
+        temp_unicode=true
     elif [ "${temp_unit}" = "K" ]; then
         # no ° for Kelvin
         temperature="${cpu_temp}${temp_unit}"
         # convert to Celsius for limit checking
         cpu_temp_celsius="$(echo "${cpu_temp}" | awk '{print $1 - 273.15}' | awk -F '.' '{print $1}')"
+        temp_unicode=false
     else # unknown unit
-        temperature="${cpu_temp}°?"
+        temperature="N/A"
         # no conversion needed
-        cpu_temp_celsius=0
+        cpu_temp_celsius=-274
+        temp_unicode=false
     fi
 
     # CPU temperature heatmap
@@ -448,8 +454,10 @@ GetSystemInformation() {
         temp_heatmap=${magenta_text}
     elif [ "${cpu_temp_celsius}" -gt 60 ]; then
         temp_heatmap=${blue_text}
-    else
+    elif [ "${cpu_temp_celsius}" -gt -274 ]; then
         temp_heatmap=${cyan_text}
+    else
+        temp_heatmap=${clear_text}
     fi
 
     # CPU, load, heatmap
@@ -889,6 +897,7 @@ GetPADDInformation() {
 }
 
 GenerateSizeDependendOutput() {
+
     if [ "$1" = "pico" ] || [ "$1" = "nano" ]; then
         ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 9 "color")
 
@@ -917,6 +926,11 @@ GenerateSizeDependendOutput() {
         top_domain=$(truncateString "$top_domain_raw" 48)
         top_client=$(truncateString "$top_client_raw" 48)
 
+        if [ "$temp_unicode" = true ]; then
+            temp_padding=21
+        else
+            temp_padding=20
+        fi
 
     elif [ "$1" = "mega" ]; then
         ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
@@ -926,6 +940,12 @@ GenerateSizeDependendOutput() {
         top_domain=$(truncateString "$top_domain_raw" 68)
         top_client=$(truncateString "$top_client_raw" 68)
 
+        if [ "$temp_unicode" = true ]; then
+            temp_padding=10
+        else
+            temp_padding=9
+        fi
+
     fi
 
     # System uptime
@@ -1174,7 +1194,7 @@ PrintDashboard() {
         moveXOffset; printf " %-10s%-16s%-6s${dhcp_range_heatmap}%-36s${reset_text}${clear_line}\n" "DHCP:" "${dhcp_check_box}" "Range" "${dhcp_range}"
         moveXOffset; printf "%s${clear_line}\n" "${bold_text}SYSTEM =====================================================${reset_text}"
         moveXOffset; printf " %-10s%-39s${clear_line}\n" "Uptime:" "${system_uptime}"
-        moveXOffset; printf " %-10s${temp_heatmap}%-21s${reset_text}%-10s${cpu_load_1_heatmap}%-4s${reset_text}, ${cpu_load_5_heatmap}%-4s${reset_text}, ${cpu_load_15_heatmap}%-4s${reset_text}${clear_line}\n" "CPU Temp:" "${temperature}" "CPU Load:" "${cpu_load_1}" "${cpu_load_5}" "${cpu_load_15}"
+        moveXOffset; printf " %-10s${temp_heatmap}%-""${temp_padding}""s${reset_text}%-10s${cpu_load_1_heatmap}%-4s${reset_text}, ${cpu_load_5_heatmap}%-4s${reset_text}, ${cpu_load_15_heatmap}%-4s${reset_text}${clear_line}\n" "CPU Temp:" "${temperature}" "CPU Load:" "${cpu_load_1}" "${cpu_load_5}" "${cpu_load_15}"
         moveXOffset; printf " %-10s[${memory_heatmap}%-10s${reset_text}] %-6s %-10s[${cpu_load_1_heatmap}%-10s${reset_text}] %-5s${clear_line}" "Memory:" "${memory_bar}" "${memory_percent}%" "CPU Load:" "${cpu_bar}" "${cpu_percent}%"
     else # ${padd_size} = mega
          # mega is a screen with at least 80 columns and 26 lines
@@ -1203,7 +1223,7 @@ PrintDashboard() {
         moveXOffset; printf "%s${clear_line}\n" "${bold_text}SYSTEM =========================================================================${reset_text}"
         moveXOffset; printf " %-10s%-39s${clear_line}\n" "Device:" "${sys_model}"
         moveXOffset; printf " %-10s%-39s %-10s[${memory_heatmap}%-10s${reset_text}] %-6s${clear_line}\n" "Uptime:" "${system_uptime}" "Memory:" "${memory_bar}" "${memory_percent}%"
-        moveXOffset; printf " %-10s${temp_heatmap}%-10s${reset_text} %-10s${cpu_load_1_heatmap}%-4s${reset_text}, ${cpu_load_5_heatmap}%-4s${reset_text}, ${cpu_load_15_heatmap}%-7s${reset_text} %-10s[${memory_heatmap}%-10s${reset_text}] %-6s${clear_line}" "CPU Temp:" "${temperature}" "CPU Load:" "${cpu_load_1}" "${cpu_load_5}" "${cpu_load_15}" "CPU Load:" "${cpu_bar}" "${cpu_percent}%"
+        moveXOffset; printf " %-10s${temp_heatmap}%-""${temp_padding}""s${reset_text} %-10s${cpu_load_1_heatmap}%-4s${reset_text}, ${cpu_load_5_heatmap}%-4s${reset_text}, ${cpu_load_15_heatmap}%-7s${reset_text} %-10s[${memory_heatmap}%-10s${reset_text}] %-6s${clear_line}" "CPU Temp:" "${temperature}" "CPU Load:" "${cpu_load_1}" "${cpu_load_5}" "${cpu_load_15}" "CPU Load:" "${cpu_bar}" "${cpu_percent}%"
     fi
 
     # Clear to end of screen (below the drawn dashboard)

From 5b00f068f2527ae36094abc6fd4b592103b5033e Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sat, 8 Mar 2025 15:22:52 +0200
Subject: [PATCH 07/45] .gitattributes: enforce LF (#442)

Signed-off-by: XhmikosR <xhmikosr@gmail.com>
---
 .gitattributes | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index bdb0cab..205021e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,17 +1,2 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# Enforce Unix newlines
+* text=auto eol=lf

From 5c2febd6c56c40158501d3eb02b72a999a2f708a Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Wed, 26 Feb 2025 13:11:01 +0100
Subject: [PATCH 08/45] Allow JSON, Update and Version to be combined with
 other flags

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/padd.sh b/padd.sh
index ae2be77..e869ffb 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1523,6 +1523,7 @@ OutputJSON() {
     GetPADDData
     GetSummaryInformation
     printf "%b" "{\"domains_being_blocked\":${domains_being_blocked_raw},\"dns_queries_today\":${dns_queries_today_raw},\"ads_blocked_today\":${ads_blocked_today_raw},\"ads_percentage_today\":${ads_percentage_today},\"clients\": ${clients}}"
+    exit 0
 }
 
 ShowVersion() {
@@ -1556,6 +1557,7 @@ ShowVersion() {
     else
         printf "%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
     fi
+    exit 0
 }
 
 StartupRoutine(){
@@ -1921,10 +1923,10 @@ main(){
 # Process all options (if present)
 while [ "$#" -gt 0 ]; do
     case "$1" in
-        "-j" | "--json"     ) xOffset=0; OutputJSON; exit 0;;
-        "-u" | "--update"   ) Update;;
+        "-j" | "--json"     ) xOffset=0; showJSON=true;;
+        "-u" | "--update"   ) xOffset=0; doUpdate=true;;
         "-h" | "--help"     ) DisplayHelp; exit 0;;
-        "-v" | "--version"  ) xOffset=0; ShowVersion; exit 0;;
+        "-v" | "--version"  ) xOffset=0; versionOnly=true ;;
         "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
         "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
         "--server"          ) SERVER="$2"; shift;;
@@ -1935,4 +1937,16 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
+if [ "${showJSON}" = true ]; then
+    OutputJSON
+fi
+
+if [ "${versionOnly}" ]; then
+    ShowVersion
+fi
+
+if [ "${doUpdate}" ]; then
+    Update
+fi
+
 main

From 68afc9a4412209f6979af76f3427caedb23748c7 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Wed, 26 Feb 2025 13:32:40 +0100
Subject: [PATCH 09/45] Remove function to output some data as json - Pi-hole
 v6 has an API for that

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 33 ++-------------------------------
 1 file changed, 2 insertions(+), 31 deletions(-)

diff --git a/padd.sh b/padd.sh
index e869ffb..e9ba6b5 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1503,29 +1503,6 @@ check_dependencies() {
 
 ########################################## MAIN FUNCTIONS ##########################################
 
-OutputJSON() {
-    # Hiding the cursor.
-    # https://vt100.net/docs/vt510-rm/DECTCEM.html
-    printf '\e[?25l'
-    # Traps for graceful shutdown
-    # https://unix.stackexchange.com/a/681201
-    trap CleanExit EXIT
-    trap sig_cleanup INT QUIT TERM
-    # Save current terminal settings (needed for later restore after password prompt)
-    stty_orig=$(stty -g)
-
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-    # Authenticate with the FTL server
-    printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    GetPADDData
-    GetSummaryInformation
-    printf "%b" "{\"domains_being_blocked\":${domains_being_blocked_raw},\"dns_queries_today\":${dns_queries_today_raw},\"ads_blocked_today\":${ads_blocked_today_raw},\"ads_percentage_today\":${ads_percentage_today},\"clients\": ${clients}}"
-    exit 0
-}
-
 ShowVersion() {
     # Hiding the cursor.
     # https://vt100.net/docs/vt510-rm/DECTCEM.html
@@ -1552,10 +1529,10 @@ ShowVersion() {
     fi
     if [ ! "${DOCKER_VERSION}" = "null" ]; then
         # Check for latest Docker version
-        printf "%s${clear_line}\n" "PADD version is ${padd_version} as part of Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text} (Latest Docker: ${GITHUB_DOCKER_VERSION})"
+        printf "\n%s${clear_line}\n" "PADD version is ${padd_version} as part of Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text} (Latest Docker: ${GITHUB_DOCKER_VERSION})"
         version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
     else
-        printf "%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
+        printf "\n%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
     fi
     exit 0
 }
@@ -1828,7 +1805,6 @@ DisplayHelp() {
 :::  --server <DOMAIN|IP>    domain or IP of your Pi-hole (default: localhost)
 :::  --secret <password>     your Pi-hole's password, required to access the API
 :::  --2fa <2fa>             your Pi-hole's 2FA code, if 2FA is enabled
-:::  -j, --json              output stats as JSON formatted string and exit
 :::  -u, --update            update to the latest version
 :::  -v, --version           show PADD version info
 :::  -h, --help              display this help text
@@ -1923,7 +1899,6 @@ main(){
 # Process all options (if present)
 while [ "$#" -gt 0 ]; do
     case "$1" in
-        "-j" | "--json"     ) xOffset=0; showJSON=true;;
         "-u" | "--update"   ) xOffset=0; doUpdate=true;;
         "-h" | "--help"     ) DisplayHelp; exit 0;;
         "-v" | "--version"  ) xOffset=0; versionOnly=true ;;
@@ -1937,10 +1912,6 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
-if [ "${showJSON}" = true ]; then
-    OutputJSON
-fi
-
 if [ "${versionOnly}" ]; then
     ShowVersion
 fi

From 80a0cfb14b7550ab6a5c00b7d45fc846667bef3d Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Wed, 26 Feb 2025 13:48:01 +0100
Subject: [PATCH 10/45] Fix padd -u

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/padd.sh b/padd.sh
index e9ba6b5..79418c2 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1761,16 +1761,32 @@ NormalPADD() {
 }
 
 Update() {
-    # source version file to check if $DOCKER_VERSION is set
-    . /etc/pihole/versions
+    # Hiding the cursor.
+    # https://vt100.net/docs/vt510-rm/DECTCEM.html
+    printf '\e[?25l'
+    # Traps for graceful shutdown
+    # https://unix.stackexchange.com/a/681201
+    trap CleanExit EXIT
+    trap sig_cleanup INT QUIT TERM
 
-    if [ -n "${DOCKER_VERSION}" ]; then
+    # Save current terminal settings (needed for later restore after password prompt)
+    stty_orig=$(stty -g)
+
+    # Test if the authentication endpoint is available
+    TestAPIAvailability
+    # Authenticate with the FTL server
+    printf "%b" "Establishing connection with FTL...\n"
+    LoginAPI
+
+    GetPADDData
+    GetVersionInformation
+    GetPADDInformation
+
+    if [ ! "${DOCKER_VERSION}" = "null" ]; then
         echo "${check_box_info} Update is not supported for Docker"
         exit 1
     fi
 
-    GetPADDInformation
-
     if [ "${padd_out_of_date_flag}" = "true" ]; then
         echo "${check_box_info} Updating PADD from ${padd_version} to ${padd_version_latest}"
 

From ca7dcfdcbbe0fa42dd8403bc9586340cf495261d Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Thu, 6 Mar 2025 10:04:09 +0100
Subject: [PATCH 11/45] Allow to perform update without authentication and on
 docker

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/padd.sh b/padd.sh
index 79418c2..edf4a9d 100755
--- a/padd.sh
+++ b/padd.sh
@@ -871,10 +871,6 @@ GetVersionInformation() {
 }
 
 GetPADDInformation() {
-    # If PADD is running inside docker, immediately return without checking for an update
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-        return
-    fi
 
     # PADD version information...
     padd_version_latest="$(curl --connect-timeout 5 --silent https://api.github.com/repos/pi-hole/PADD/releases/latest | grep '"tag_name":' | awk -F \" '{print $4}')"
@@ -1761,32 +1757,9 @@ NormalPADD() {
 }
 
 Update() {
-    # Hiding the cursor.
-    # https://vt100.net/docs/vt510-rm/DECTCEM.html
-    printf '\e[?25l'
-    # Traps for graceful shutdown
-    # https://unix.stackexchange.com/a/681201
-    trap CleanExit EXIT
-    trap sig_cleanup INT QUIT TERM
 
-    # Save current terminal settings (needed for later restore after password prompt)
-    stty_orig=$(stty -g)
-
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-    # Authenticate with the FTL server
-    printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    GetPADDData
-    GetVersionInformation
     GetPADDInformation
 
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-        echo "${check_box_info} Update is not supported for Docker"
-        exit 1
-    fi
-
     if [ "${padd_out_of_date_flag}" = "true" ]; then
         echo "${check_box_info} Updating PADD from ${padd_version} to ${padd_version_latest}"
 

From 594062622ab13a1dedf87d74961f7d585ff3da65 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Sat, 29 Mar 2025 20:29:23 +0100
Subject: [PATCH 12/45] Fix two shellcheck warnings

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/padd.sh b/padd.sh
index edf4a9d..effbb2a 100755
--- a/padd.sh
+++ b/padd.sh
@@ -414,7 +414,7 @@ GetSystemInformation() {
 
     # CPU temperature and unit
     cpu_temp_raw=$(GetPADDValue sensors.cpu_temp)
-    if [ $cpu_temp_raw != null ]; then
+    if [ "${cpu_temp_raw}" != null ]; then
         cpu_temp=$(printf "%.1f" "${cpu_temp_raw}")
         temp_unit=$(echo "${padd_data}"  | GetPADDValue sensors.unit)
     fi
@@ -457,7 +457,7 @@ GetSystemInformation() {
     elif [ "${cpu_temp_celsius}" -gt -274 ]; then
         temp_heatmap=${cyan_text}
     else
-        temp_heatmap=${clear_text}
+        temp_heatmap=${reset_text}
     fi
 
     # CPU, load, heatmap
@@ -508,6 +508,7 @@ GetNetworkInformation() {
         dhcp_range_heatmap=${reset_text}
         dhcp_ipv6_status="N/A"
         dhcp_ipv6_heatmap=${reset_text}
+        dhcp_check_box=${check_box_question}
 
         pi_hostname="N/A"
         full_hostname="N/A"

From 95ffbd5bf9c7177b0d1fedcd83fca257528a02a5 Mon Sep 17 00:00:00 2001
From: Christian Boyle <mail@christianboyle.com>
Date: Sat, 15 Mar 2025 10:12:23 -0500
Subject: [PATCH 13/45] fix dhcp display in padd tiny

updates from review

more updates from review

fix dhcp string to checkbox

fix dhcp ip range display

fix dhcp ip range display again

enhance dhcp range display

Update padd.sh

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Signed-off-by: Christian Boyle <christianboyle@users.noreply.github.com>

add newline at end of file, per editorconfig-checker failure

Update padd.sh

Co-authored-by: yubiuser <github@yubiuser.dev>
Signed-off-by: Christian Boyle <christianboyle@users.noreply.github.com>
---
 padd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padd.sh b/padd.sh
index edf4a9d..11518b6 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1156,7 +1156,7 @@ PrintDashboard() {
         moveXOffset; printf " %-10s%-16s %-4s%-7s %-4s%-5s${clear_line}\n" "Interfce:" "${iface_name}" "TX:" "${tx_bytes}" "RX:" "${rx_bytes}"
         moveXOffset; printf " %-10s%-16s %-8s${dnssec_heatmap}%-16s${reset_text}${clear_line}\n" "DNS:" "${dns_information}" "DNSSEC:" "${dnssec_status}"
         moveXOffset; printf " %-10s%s${clear_line}\n" "IPv6:" "${pi_ip6_addr}"
-        moveXOffset; printf " %-10s%-15s%-4s${dhcp_range_heatmap}%-36s${reset_text}${clear_line}\n" "DHCP:" "${dhcp_check_box}" "Rng" "${dhcp_range}"
+        moveXOffset; printf " %-10s%-5s %-4s${dhcp_range_heatmap}%-33s${reset_text}${clear_line}\n" "DHCP:" "${dhcp_check_box}" "Rng" "${dhcp_range}"
         moveXOffset; printf "%s${clear_line}\n" "${bold_text}SYSTEM ==============================================${reset_text}"
         moveXOffset; printf " %-10s%-29s${clear_line}\n" "Uptime:" "${system_uptime}"
         moveXOffset; printf " %-10s${temp_heatmap}%-17s${reset_text} %-8s${cpu_load_1_heatmap}%-4s${reset_text}, ${cpu_load_5_heatmap}%-4s${reset_text}, ${cpu_load_15_heatmap}%-4s${reset_text}${clear_line}\n" "CPU Temp:" "${temperature}" "Load:" "${cpu_load_1}" "${cpu_load_5}" "${cpu_load_15}"

From bd645e5867529e0b3074d067194d26a4f740c9fa Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <the.qwx.channel@gmail.com>
Date: Tue, 18 Mar 2025 20:35:18 +0100
Subject: [PATCH 14/45] Replace the API domain with SERVER, only use cli_pw on
 localhost

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/padd.sh b/padd.sh
index 11518b6..c7d6da2 100755
--- a/padd.sh
+++ b/padd.sh
@@ -137,6 +137,21 @@ TestAPIAvailability() {
         API_URL="${API_URL%\"}"
         API_URL="${API_URL#\"}"
 
+        # If $SERVER is user-specified by IP, the returned API_URL might contain a domain which can't be resolved by the host
+        # Therefore, we substitute the domain with the IP
+        if [ -n "$SERVER" ]; then
+            # Check if SERVER is an IPv6
+            case "$SERVER" in
+                *:*)
+                    # Replace the domain with the IP
+                    # Add square brackets for IPv6 (as recommended by RFC2732)
+                    API_URL=$(echo "$API_URL" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1[${SERVER}]\2#");;
+                *)
+                    # Replace the domain with the IP
+                    API_URL=$(echo "$API_URL" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1$SERVER\2#");;
+            esac
+        fi
+
         # Test if the API is available at this URL
         authResponse=$(curl --connect-timeout 2 -skS -w "%{http_code}" "${API_URL}auth")
 
@@ -191,11 +206,14 @@ LoginAPI() {
         return
     fi
 
-    # Try to read the CLI password (if enabled and readable by the current user)
-    if [ -r /etc/pihole/cli_pw ]; then
-        password=$(cat /etc/pihole/cli_pw)
-        # If we can read the CLI password, we can skip 2FA even when it's required otherwise
-        needTOTP=false
+    # Check if we are running locally before checking for the CLI password
+    if [ -z "${SERVER}" ] || [ "${SERVER}" = "localhost" ] || [ "${SERVER}" = "127.0.0.1" ]; then
+        # Try to read the CLI password (if enabled and readable by the current user)
+        if [ -r /etc/pihole/cli_pw ]; then
+            password=$(cat /etc/pihole/cli_pw)
+            # If we can read the CLI password, we can skip 2FA even when it's required otherwise
+            needTOTP=false
+        fi
     fi
 
     if [ -z "${password}" ]; then

From eaf46ccec4fc213841c9aff19bf11af0802f5d0e Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Thu, 6 Mar 2025 10:35:48 +0100
Subject: [PATCH 15/45] Add option to display PADD only once an exit

Co-authored-by: k-rister <k-rister@users.noreply.github.com>
Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/padd.sh b/padd.sh
index c7d6da2..7a67e6c 100755
--- a/padd.sh
+++ b/padd.sh
@@ -25,6 +25,9 @@ LastCheckNetworkInformation=$(date +%s)
 # padd_data holds the data returned by FTL's /padd endpoint globally
 padd_data=""
 
+# should PADD run only once?
+runOnce=false
+
 # COLORS
 CSI="$(printf '\033')["  # Control Sequence Introducer
 red_text="${CSI}91m"     # Red
@@ -1709,6 +1712,11 @@ NormalPADD() {
     # Output everything to the screen
     PrintDashboard ${padd_size}
 
+    # Should we only run once?
+    if [ "${runOnce}" = "true" ]; then
+        break
+    fi
+
     # Sleep for 5 seconds
     # sending sleep in the background and wait for it
     # this way the TerminalResize trap can kill the sleep
@@ -1812,6 +1820,7 @@ DisplayHelp() {
 :::  --server <DOMAIN|IP>    domain or IP of your Pi-hole (default: localhost)
 :::  --secret <password>     your Pi-hole's password, required to access the API
 :::  --2fa <2fa>             your Pi-hole's 2FA code, if 2FA is enabled
+:::  --runonce               display output once and exit
 :::  -u, --update            update to the latest version
 :::  -v, --version           show PADD version info
 :::  -h, --help              display this help text
@@ -1909,6 +1918,7 @@ while [ "$#" -gt 0 ]; do
         "-u" | "--update"   ) xOffset=0; doUpdate=true;;
         "-h" | "--help"     ) DisplayHelp; exit 0;;
         "-v" | "--version"  ) xOffset=0; versionOnly=true ;;
+        "--runonce"         ) runOnce=true;;
         "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
         "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
         "--server"          ) SERVER="$2"; shift;;

From 2aeb96ca137335503ad56aa3f39c98aa20c64ed4 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Fri, 7 Mar 2025 09:34:32 +0100
Subject: [PATCH 16/45] Don't show the startup counter if requested to only run
 once

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/padd.sh b/padd.sh
index 7a67e6c..9df6d7f 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1683,12 +1683,15 @@ StartupRoutine(){
         fi
     fi
 
-    moveXOffset; printf "%s" "- Starting in "
-    for i in 3 2 1
-    do
-        printf "%s..." "$i"
-        sleep 1
-    done
+    if [ "${runOnce}" = "false" ]; then
+        moveXOffset; printf "%s" "- Starting in "
+        for i in 3 2 1
+        do
+            printf "%s..." "$i"
+            sleep 1
+        done
+    fi
+
 }
 
 NormalPADD() {

From 386477e2e9162c3a8ef901bce43fe46a9ccbb9a6 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 31 Mar 2025 22:03:06 +0200
Subject: [PATCH 17/45] Substitute 'null' values returned by FTL for privacy
 level >1

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/padd.sh b/padd.sh
index c7d6da2..170d66b 100755
--- a/padd.sh
+++ b/padd.sh
@@ -403,6 +403,19 @@ GetSummaryInformation() {
     top_domain_raw=$(GetPADDValue top_domain)
 
     top_client_raw=$(GetPADDValue top_client)
+
+    privacy_level=$(GetPADDValue config.privacy_level)
+
+    # Substitute 'null' values returned by FTL for privacy level >1
+    if [ "${privacy_level}" -ge "1" ]; then
+        top_domain_raw="hidden by privacy level"
+        top_blocked_raw="hidden by privacy level"
+        latest_blocked_raw="hidden by privacy level"
+    fi
+    if [ "${privacy_level}" -ge "2" ]; then
+        top_client_raw="hidden by privacy level"
+    fi
+
 }
 
 GetSystemInformation() {

From 21e6ac0d8ab04408dd46b26016cee7c9b1e786aa Mon Sep 17 00:00:00 2001
From: Michael Woolweaver <michael@woolweaver.bid>
Date: Wed, 2 Apr 2025 18:27:55 -0500
Subject: [PATCH 18/45] dependency check adjustment

Co-authored-by: yubiuser <github@yubiuser.dev>
Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
---
 README.md |  5 +++++
 padd.sh   | 22 +++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9c24de2..e4cf49c 100644
--- a/README.md
+++ b/README.md
@@ -27,6 +27,11 @@ PADD (formerly Chronometer2) is a more expansive version of the original chronom
   ```bash
   sudo chmod +x padd.sh
   ```
+### Dependencies
+  - curl
+  - jq
+  - dig
+  - tput
 
 ## Using PADD
 
diff --git a/padd.sh b/padd.sh
index 170d66b..bac7d4e 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1516,15 +1516,31 @@ secretRead() {
 }
 
 check_dependencies() {
+    local hasDeps=true
     # Check for required dependencies
     if ! command -v curl >/dev/null 2>&1; then
         printf "%b" "${check_box_bad} Error!\n    'curl' is missing but required.\n"
-        exit 1
+        hasDeps=false
     fi
 
     if ! command -v jq >/dev/null 2>&1; then
-          printf "%b" "${check_box_bad} Error!\n    'jq' is missing but required.\n"
-          exit 1
+        printf "%b" "${check_box_bad} Error!\n    'jq' is missing but required.\n"
+        hasDeps=false
+    fi
+
+    if ! command -v dig >/dev/null 2>&1; then
+        printf "%b" "${check_box_bad} Error!\n    'dig' is missing but required.\n"
+        hasDeps=false
+    fi
+
+    if ! command -v tput >/dev/null 2>&1; then
+        printf "%b" "${check_box_bad} Error!\n    'tput' is missing but required.\n"
+        hasDeps=false
+     fi
+
+    if ! [ "${hasDeps}" = true ]; then
+        printf "%b" "\n Please install the missing dependencies noted above.\n"
+        exit 1
     fi
 }
 

From b64e3d91725473cce7805e09408f9fa6afe24086 Mon Sep 17 00:00:00 2001
From: Michael Woolweaver <michael@woolweaver.bid>
Date: Fri, 4 Apr 2025 23:43:19 -0500
Subject: [PATCH 19/45] fix word

Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e4cf49c..fae1b03 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # PADD
 
-PADD (formerly Chronometer2) is a more expansive version of the original chronometer.sh that is included with [Pi-Hole](https://pi-hole.net). PADD provides in-depth information about your Pi-hole.
+PADD (formerly Chronometer2) is a more expansive version of the original chronometer.sh that was included with [Pi-Hole](https://pi-hole.net). PADD provides in-depth information about your Pi-hole.
 
 ![PADD Screenshot](https://pi-hole.github.io/graphics/Screenshots/padd.png)
 

From 33edd580b2d6ec8daa0303ba855a917a7e231ef4 Mon Sep 17 00:00:00 2001
From: Michael Woolweaver <michael@woolweaver.bid>
Date: Tue, 8 Apr 2025 23:13:24 -0500
Subject: [PATCH 20/45] show version without auth

Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
---
 padd.sh | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/padd.sh b/padd.sh
index f1b77e5..d93a653 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1551,36 +1551,15 @@ check_dependencies() {
 ########################################## MAIN FUNCTIONS ##########################################
 
 ShowVersion() {
-    # Hiding the cursor.
-    # https://vt100.net/docs/vt510-rm/DECTCEM.html
-    printf '\e[?25l'
-    # Traps for graceful shutdown
-    # https://unix.stackexchange.com/a/681201
-    trap CleanExit EXIT
-    trap sig_cleanup INT QUIT TERM
 
-    # Save current terminal settings (needed for later restore after password prompt)
-    stty_orig=$(stty -g)
-
-    # Test if the authentication endpoint is available
-    TestAPIAvailability
-    # Authenticate with the FTL server
-    printf "%b" "Establishing connection with FTL...\n"
-    LoginAPI
-
-    GetPADDData
-    GetVersionInformation
     GetPADDInformation
+
     if [ -z "${padd_version_latest}" ]; then
         padd_version_latest="N/A"
     fi
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-        # Check for latest Docker version
-        printf "\n%s${clear_line}\n" "PADD version is ${padd_version} as part of Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text} (Latest Docker: ${GITHUB_DOCKER_VERSION})"
-        version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
-    else
-        printf "\n%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
-    fi
+
+    printf "%s${clear_line}" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
+
     exit 0
 }
 

From 37a9ab89be51537a14ac6f696dbd8489726db024 Mon Sep 17 00:00:00 2001
From: Michael Woolweaver <michael@woolweaver.bid>
Date: Mon, 31 Mar 2025 18:17:55 -0500
Subject: [PATCH 21/45] switch to using the retro logo in place of the green
 logo
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - green logo was used in the following places:

   · as the logo for regular

   · during the start up of regular and slim

moves `moveXOffset` from `StartupRoutine` to `PrintLogo` for consistency.

removes version check at the begining of `PrintLogo()` as version info is not available yet.

for mini size replace `*_status` variable in `PrintLogo()` with description provided with big logo,
for smaller than mini size, removes `*_status` variable as they aren't available yet.

Signed-off-by: Michael Woolweaver <michael@woolweaver.bid>
---
 padd.sh | 54 +++++++++++++++++-------------------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/padd.sh b/padd.sh
index f1b77e5..2e6234e 100755
--- a/padd.sh
+++ b/padd.sh
@@ -95,12 +95,9 @@ tiny_status_dns_down="${check_box_bad} DNS is off!"
 padd_text="${green_text}${bold_text}PADD${reset_text}"
 
 # PADD logos - regular and retro
-padd_logo_1="${bold_text}${green_text} __      __  __   ${reset_text}"
-padd_logo_2="${bold_text}${green_text}|__) /\\ |  \\|  \\  ${reset_text}"
-padd_logo_3="${bold_text}${green_text}|   /--\\|__/|__/  ${reset_text}"
-padd_logo_retro_1="${bold_text} ${yellow_text}_${green_text}_      ${blue_text}_${magenta_text}_  ${yellow_text}_${green_text}_   ${reset_text}"
-padd_logo_retro_2="${bold_text}${yellow_text}|${green_text}_${blue_text}_${cyan_text}) ${red_text}/${yellow_text}\\ ${blue_text}|  ${red_text}\\${yellow_text}|  ${cyan_text}\\  ${reset_text}"
-padd_logo_retro_3="${bold_text}${green_text}|   ${red_text}/${yellow_text}-${green_text}-${blue_text}\\${cyan_text}|${magenta_text}_${red_text}_${yellow_text}/${green_text}|${blue_text}_${cyan_text}_${magenta_text}/  ${reset_text}"
+padd_logo_1="${bold_text} ${yellow_text}_${green_text}_      ${blue_text}_${magenta_text}_  ${yellow_text}_${green_text}_   ${reset_text}"
+padd_logo_2="${bold_text}${yellow_text}|${green_text}_${blue_text}_${cyan_text}) ${red_text}/${yellow_text}\\ ${blue_text}|  ${red_text}\\${yellow_text}|  ${cyan_text}\\  ${reset_text}"
+padd_logo_3="${bold_text}${green_text}|   ${red_text}/${yellow_text}-${green_text}-${blue_text}\\${cyan_text}|${magenta_text}_${red_text}_${yellow_text}/${green_text}|${blue_text}_${cyan_text}_${magenta_text}/  ${reset_text}"
 
 ############################################# FTL ##################################################
 
@@ -1065,35 +1062,20 @@ SetStatusMessage() {
 ############################################# PRINTERS #############################################
 
 PrintLogo() {
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
-        version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
-        else
-        version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
-    fi
-
     # Screen size checks
     if [ "$1" = "pico" ]; then
-        printf "%s${clear_line}\n" "p${padd_text} ${pico_status}"
+        moveXOffset; printf "%s${clear_line}\n" "p${padd_text}"
     elif [ "$1" = "nano" ]; then
-        printf "%s${clear_line}\n" "n${padd_text} ${mini_status}"
+        moveXOffset; printf "%s${clear_line}\n" "n${padd_text}"
     elif [ "$1" = "micro" ]; then
-        printf "%s${clear_line}\n${clear_line}\n" "µ${padd_text}     ${mini_status}"
+        moveXOffset; printf "%s${clear_line}\n" "µ${padd_text}"
     elif [ "$1" = "mini" ]; then
-        printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}mini${reset_text}  ${mini_status}"
-    elif [ "$1" = "tiny" ]; then
-        printf "%s${clear_line}\n" "${padd_text}${dim_text}tiny${reset_text}   ${version_info}${reset_text}"
-        printf "%s${clear_line}\n" "           PADD ${padd_version_heatmap}${padd_version}${reset_text} ${tiny_status}${reset_text}"
-    elif [ "$1" = "slim" ]; then
-        printf "%s${clear_line}\n${clear_line}\n" "${padd_text}${dim_text}slim${reset_text}   ${full_status}"
-    elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
-        printf "%s${clear_line}\n" "${padd_logo_1}"
-        printf "%s${clear_line}\n" "${padd_logo_2}${version_info}${reset_text}"
-        printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_3}PADD ${padd_version_heatmap}${padd_version}${reset_text}   ${full_status}${reset_text}"
-    # normal or not defined
+        moveXOffset; printf "%s${clear_line}\n" "${padd_text}${dim_text}mini${reset_text} Pi-hole® Ad Detection Display"
+        moveXOffset; printf "%s${clear_line}\n" "         A client for Pi-hole®"
     else
-        printf "%s${clear_line}\n" "${padd_logo_retro_1}"
-        printf "%s${clear_line}\n" "${padd_logo_retro_2}   ${version_info}, PADD ${padd_version_heatmap}${padd_version}${reset_text}"
-        printf "%s${clear_line}\n${clear_line}\n" "${padd_logo_retro_3}   ${dns_check_box} DNS   ${ftl_check_box} FTL   ${mega_status}${reset_text}"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_1}"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_2}Pi-hole® Ad Detection Display"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_3}A client for Pi-hole®"
     fi
 }
 
@@ -1229,9 +1211,9 @@ PrintDashboard() {
         moveXOffset; printf " %-10s[${memory_heatmap}%-10s${reset_text}] %-6s %-10s[${cpu_load_1_heatmap}%-10s${reset_text}] %-5s${clear_line}" "Memory:" "${memory_bar}" "${memory_percent}%" "CPU Load:" "${cpu_bar}" "${cpu_percent}%"
     else # ${padd_size} = mega
          # mega is a screen with at least 80 columns and 26 lines
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_retro_1}"
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_retro_2}   ${version_info}, PADD ${padd_version_heatmap}${padd_version}${reset_text}"
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_retro_3}   ${dns_check_box} DNS   ${ftl_check_box} FTL   ${mega_status}${reset_text}"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_1}"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_2}   ${version_info}, PADD ${padd_version_heatmap}${padd_version}${reset_text}"
+        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_3}   ${dns_check_box} DNS   ${ftl_check_box} FTL   ${mega_status}${reset_text}"
         moveXOffset; printf "%s${clear_line}\n" ""
         moveXOffset; printf "%s${clear_line}\n" "${bold_text}STATS ==========================================================================${reset_text}"
         moveXOffset; printf " %-10s%-19s %-10s[%-40s] %-5s${clear_line}\n" "Blocking:" "${domains_being_blocked} domains" "Piholed:" "${ads_blocked_bar}" "${ads_percentage_today}%"
@@ -1603,7 +1585,7 @@ StartupRoutine(){
     moveYOffset
 
     if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
-        moveXOffset; PrintLogo "$1"
+        PrintLogo "$1"
         moveXOffset; printf "%b" "START-UP ===========\n"
 
         # Test if the authentication endpoint is available
@@ -1640,7 +1622,7 @@ StartupRoutine(){
         moveXOffset; printf "%b" " [■■■■■■■■■■] 100%\n"
 
     elif [ "$1" = "mini" ]; then
-        moveXOffset; PrintLogo "$1"
+        PrintLogo "$1"
         moveXOffset; echo "START UP ====================="
         # Test if the authentication endpoint is available
         TestAPIAvailability
@@ -1671,9 +1653,7 @@ StartupRoutine(){
         fi
 
     else
-        moveXOffset; printf "%b" "${padd_logo_retro_1}\n"
-        moveXOffset; printf "%b" "${padd_logo_retro_2}Pi-hole® Ad Detection Display\n"
-        moveXOffset; printf "%b" "${padd_logo_retro_3}A client for Pi-hole\n\n"
+        PrintLogo "$1"
         if [ "$1" = "tiny" ]; then
         moveXOffset; echo "START UP ============================================"
         else

From 0cc17a2e5b8a45ee4fafa84ca15b3a1260445e20 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 21 Apr 2025 14:11:01 +0200
Subject: [PATCH 22/45] Give the logo more space during startup

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/padd.sh b/padd.sh
index 2e6234e..cdcfc0f 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1073,9 +1073,9 @@ PrintLogo() {
         moveXOffset; printf "%s${clear_line}\n" "${padd_text}${dim_text}mini${reset_text} Pi-hole® Ad Detection Display"
         moveXOffset; printf "%s${clear_line}\n" "         A client for Pi-hole®"
     else
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_1}"
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_2}Pi-hole® Ad Detection Display"
-        moveXOffset; printf "%s${clear_line}\n" "${padd_logo_3}A client for Pi-hole®"
+        moveXOffset; printf "%b" "${padd_logo_1}\n"
+        moveXOffset; printf "%b" "${padd_logo_2}Pi-hole® Ad Detection Display\n"
+        moveXOffset; printf "%b" "${padd_logo_3}A client for Pi-hole\n\n"
     fi
 }
 

From 51f80969ea056f1487ce1aaa1368b373d5db37aa Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 21 Apr 2025 14:28:19 +0200
Subject: [PATCH 23/45] Adjust length of startup line

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/padd.sh b/padd.sh
index cdcfc0f..7f0b729 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1068,7 +1068,7 @@ PrintLogo() {
     elif [ "$1" = "nano" ]; then
         moveXOffset; printf "%s${clear_line}\n" "n${padd_text}"
     elif [ "$1" = "micro" ]; then
-        moveXOffset; printf "%s${clear_line}\n" "µ${padd_text}"
+        moveXOffset; printf "%s${clear_line}\n\n" "µ${padd_text}"
     elif [ "$1" = "mini" ]; then
         moveXOffset; printf "%s${clear_line}\n" "${padd_text}${dim_text}mini${reset_text} Pi-hole® Ad Detection Display"
         moveXOffset; printf "%s${clear_line}\n" "         A client for Pi-hole®"
@@ -1586,7 +1586,13 @@ StartupRoutine(){
 
     if [ "$1" = "pico" ] || [ "$1" = "nano" ] || [ "$1" = "micro" ]; then
         PrintLogo "$1"
-        moveXOffset; printf "%b" "START-UP ===========\n"
+        if [ "$1" = "pico" ]; then
+            moveXOffset; printf "%b" "START-UP ===========\n"
+        elif [ "$1" = "nano" ]; then
+            moveXOffset; printf "%b" "START-UP ===============\n"
+        else
+            moveXOffset; printf "%b" "START-UP =====================\n"
+        fi
 
         # Test if the authentication endpoint is available
         TestAPIAvailability
@@ -1623,7 +1629,7 @@ StartupRoutine(){
 
     elif [ "$1" = "mini" ]; then
         PrintLogo "$1"
-        moveXOffset; echo "START UP ====================="
+        moveXOffset; echo "START UP ==============================="
         # Test if the authentication endpoint is available
         TestAPIAvailability
         # Authenticate with the FTL server

From cecbfb08a653b46f46133480376373b890a454de Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 21 Apr 2025 14:56:35 +0200
Subject: [PATCH 24/45] Give it more space

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padd.sh b/padd.sh
index d93a653..9730cf1 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1558,7 +1558,7 @@ ShowVersion() {
         padd_version_latest="N/A"
     fi
 
-    printf "%s${clear_line}" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
+    printf "\n%s${clear_line}\n" "PADD version is ${padd_version_heatmap}${padd_version}${reset_text} (Latest: ${padd_version_latest})"
 
     exit 0
 }

From d04220a4fd49edbdafd083f68c073b894700f703 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Fri, 25 Apr 2025 21:12:54 +0200
Subject: [PATCH 25/45] Fix API_Port logic

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/padd.sh b/padd.sh
index 0843ea8..2ace59f 100755
--- a/padd.sh
+++ b/padd.sh
@@ -103,7 +103,7 @@ padd_logo_3="${bold_text}${green_text}|   ${red_text}/${yellow_text}-${green_tex
 
 TestAPIAvailability() {
 
-    local chaos_api_list authResponse cmdResult digReturnCode authStatus authData
+    local chaos_api_list authResponse cmdResult digReturnCode authStatus authData apiAvailable
 
     # Query the API URLs from FTL using CHAOS TXT
     # The result is a space-separated enumeration of full URLs
@@ -164,7 +164,7 @@ TestAPIAvailability() {
         # Test if http status code was 200 (OK) or 401 (authentication required)
         if [ ! "${authStatus}" = 200 ] && [ ! "${authStatus}" = 401 ]; then
             # API is not available at this port/protocol combination
-            API_PORT=""
+            apiAvailable=false
         else
             # API is available at this URL combination
 
@@ -176,6 +176,7 @@ TestAPIAvailability() {
             # Check if 2FA is required
             needTOTP=$(echo "${authData}"| jq --raw-output .session.totp 2>/dev/null)
 
+            apiAvailable=true
             break
         fi
 
@@ -191,9 +192,9 @@ TestAPIAvailability() {
         fi
     done
 
-    # if API_PORT is empty, no working API port was found
-    if [ -n "${API_PORT}" ]; then
-        moveXOffset; echo "API not available at: ${API_URL}"
+    # if apiAvailable is false, no working API was found
+    if [ "${apiAvailable}" = false ]; then
+        moveXOffset; echo "API not available. Please check FTL.log"
         moveXOffset; echo "Exiting."
         exit 1
     fi

From 833e5c79d7089047953b4333929b87d6504ea154 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Sat, 3 May 2025 20:11:00 +0200
Subject: [PATCH 26/45] Use CODEOWNERS instead of deprecated
 dependbot/reviewers

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 .github/CODEOWNERS     | 5 +++++
 .github/dependabot.yml | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..73d2a26
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,5 @@
+# see https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-syntax
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+*       @pi-hole/padd-maintainers
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 42be690..be18a8f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,5 +8,3 @@ updates:
     time: "10:00"
   open-pull-requests-limit: 10
   target-branch: development
-  reviewers:
-    - "pi-hole/padd-maintainers"

From 8e58364d20d8e3483031aaae336df4a26eebbd10 Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:10:00 +0200
Subject: [PATCH 27/45] Allow SERVER to be the full API path

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/padd.sh b/padd.sh
index 2ace59f..1e64a88 100755
--- a/padd.sh
+++ b/padd.sh
@@ -115,6 +115,14 @@ TestAPIAvailability() {
         # --server was set, try to get response from there
         cmdResult="$(dig +short chaos txt domain.api.ftl @"${SERVER}" 2>&1; echo $?)"
     fi
+    # Check if SERVER is a full URL
+    # If it is, skip the DNS lookup
+    case "$SERVER" in
+    http://* | https://*)
+        # The list of avalible API URLs is just the provided URL
+        chaos_api_list="${SERVER}"
+        ;;
+    *)
 
     # Gets the return code of the dig command (last line)
     # We can't use${cmdResult##*$'\n'*} here as $'..' is not POSIX
@@ -128,6 +136,8 @@ TestAPIAvailability() {
       # Dig returned 0 (success), so get the actual response (first line)
       chaos_api_list="$(echo "${cmdResult}" | head -n 1)"
     fi
+        ;;
+    esac
 
     # Iterate over space-separated list of URLs
     while [ -n "${chaos_api_list}" ]; do

From 3994afdc8ecb8c4cf592b23323c190e0b62d5816 Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:12:29 +0200
Subject: [PATCH 28/45] Whitespace changes, for SERVER to be API path

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/padd.sh b/padd.sh
index 1e64a88..fc3865a 100755
--- a/padd.sh
+++ b/padd.sh
@@ -105,16 +105,6 @@ TestAPIAvailability() {
 
     local chaos_api_list authResponse cmdResult digReturnCode authStatus authData apiAvailable
 
-    # Query the API URLs from FTL using CHAOS TXT
-    # The result is a space-separated enumeration of full URLs
-    # e.g., "http://localhost:80/api" or "https://domain.com:443/api"
-    if [ -z "${SERVER}" ] || [ "${SERVER}" = "localhost" ] || [ "${SERVER}" = "127.0.0.1" ]; then
-        # --server was not set or set to local, assuming we're running locally
-        cmdResult="$(dig +short chaos txt local.api.ftl @localhost 2>&1; echo $?)"
-    else
-        # --server was set, try to get response from there
-        cmdResult="$(dig +short chaos txt domain.api.ftl @"${SERVER}" 2>&1; echo $?)"
-    fi
     # Check if SERVER is a full URL
     # If it is, skip the DNS lookup
     case "$SERVER" in
@@ -123,19 +113,29 @@ TestAPIAvailability() {
         chaos_api_list="${SERVER}"
         ;;
     *)
+        # Query the API URLs from FTL using CHAOS TXT
+        # The result is a space-separated enumeration of full URLs
+        # e.g., "http://localhost:80/api" or "https://domain.com:443/api"
+        if [ -z "${SERVER}" ] || [ "${SERVER}" = "localhost" ] || [ "${SERVER}" = "127.0.0.1" ]; then
+            # --server was not set or set to local, assuming we're running locally
+            cmdResult="$(dig +short chaos txt local.api.ftl @localhost 2>&1; echo $?)"
+        else
+            # --server was set, try to get response from there
+            cmdResult="$(dig +short chaos txt domain.api.ftl @"${SERVER}" 2>&1; echo $?)"
+        fi
 
-    # Gets the return code of the dig command (last line)
-    # We can't use${cmdResult##*$'\n'*} here as $'..' is not POSIX
-    digReturnCode="$(echo "${cmdResult}" | tail -n 1)"
+        # Gets the return code of the dig command (last line)
+        # We can't use${cmdResult##*$'\n'*} here as $'..' is not POSIX
+        digReturnCode="$(echo "${cmdResult}" | tail -n 1)"
 
-    if [ ! "${digReturnCode}" = "0" ]; then
-        # If the query was not successful
-        moveXOffset;  echo "API not available. Please check server address and connectivity"
-        exit 1
-    else
-      # Dig returned 0 (success), so get the actual response (first line)
-      chaos_api_list="$(echo "${cmdResult}" | head -n 1)"
-    fi
+        if [ ! "${digReturnCode}" = "0" ]; then
+            # If the query was not successful
+            moveXOffset; echo "API not available. Please check server address and connectivity"
+            exit 1
+        else
+            # Dig returned 0 (success), so get the actual response (first line)
+            chaos_api_list="$(echo "${cmdResult}" | head -n 1)"
+        fi
         ;;
     esac
 

From 3ce518701b327b23c8f8825353505ef0c7ea7403 Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Date: Wed, 23 Apr 2025 16:31:23 +0200
Subject: [PATCH 29/45] Fix a typo

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padd.sh b/padd.sh
index fc3865a..52ebcbe 100755
--- a/padd.sh
+++ b/padd.sh
@@ -109,7 +109,7 @@ TestAPIAvailability() {
     # If it is, skip the DNS lookup
     case "$SERVER" in
     http://* | https://*)
-        # The list of avalible API URLs is just the provided URL
+        # The list of available API URLs is just the provided URL
         chaos_api_list="${SERVER}"
         ;;
     *)

From 13d5dea35feff803085c4346e5f796fea1d9734a Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Date: Sun, 27 Apr 2025 21:56:35 +0200
Subject: [PATCH 30/45] move full API URL variable to --api

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/padd.sh b/padd.sh
index 52ebcbe..4676f84 100755
--- a/padd.sh
+++ b/padd.sh
@@ -105,14 +105,17 @@ TestAPIAvailability() {
 
     local chaos_api_list authResponse cmdResult digReturnCode authStatus authData apiAvailable
 
-    # Check if SERVER is a full URL
-    # If it is, skip the DNS lookup
-    case "$SERVER" in
-    http://* | https://*)
+    if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
+        moveXOffset; echo "Do not set --server and --api simultaneously."
+        moveXOffset; echo "Exiting."
+        exit 1
+    fi
+
+    # Check if an API location was specified with --api
+    if [ -n "${API_LOCATION}" ]; then
         # The list of available API URLs is just the provided URL
-        chaos_api_list="${SERVER}"
-        ;;
-    *)
+        chaos_api_list="${API_LOCATION}"
+    else
         # Query the API URLs from FTL using CHAOS TXT
         # The result is a space-separated enumeration of full URLs
         # e.g., "http://localhost:80/api" or "https://domain.com:443/api"
@@ -136,8 +139,7 @@ TestAPIAvailability() {
             # Dig returned 0 (success), so get the actual response (first line)
             chaos_api_list="$(echo "${cmdResult}" | head -n 1)"
         fi
-        ;;
-    esac
+    fi
 
     # Iterate over space-separated list of URLs
     while [ -n "${chaos_api_list}" ]; do
@@ -301,7 +303,7 @@ Authenticate() {
 
     if [ -z "${sessionResponse}" ]; then
         moveXOffset; echo "No response from FTL server. Please check connectivity and use the options to set the API URL"
-        moveXOffset; echo "Usage: $0 [--server <domain|IP>]"
+        moveXOffset; echo "Usage: $0 [--server <domain|IP>] or [--api <API URL>]"
         exit 1
     fi
     # obtain validity, session ID and sessionMessage from session response
@@ -1827,6 +1829,7 @@ DisplayHelp() {
 :::  --yoff [num]    set the y-offset, reference is the upper left corner, disables auto-centering
 :::
 :::  --server <DOMAIN|IP>    domain or IP of your Pi-hole (default: localhost)
+:::  --api <API URL>         API URL location of your Pi-hole (example: https://pi.hole/api/)
 :::  --secret <password>     your Pi-hole's password, required to access the API
 :::  --2fa <2fa>             your Pi-hole's 2FA code, if 2FA is enabled
 :::  --runonce               display output once and exit
@@ -1931,6 +1934,7 @@ while [ "$#" -gt 0 ]; do
         "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
         "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
         "--server"          ) SERVER="$2"; shift;;
+        "--api"             ) API_LOCATION="$2"; shift;;
         "--secret"          ) password="$2"; shift;;
         "--2fa"             ) totp="$2"; shift;;
         *                   ) DisplayHelp; exit 1;;

From 24387ea13a515440d966f64e45f9f2db65a22efa Mon Sep 17 00:00:00 2001
From: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
Date: Sun, 11 May 2025 15:30:54 +0200
Subject: [PATCH 31/45] Move check for both flags set down

Signed-off-by: darkexplosiveqwx <101737077+darkexplosiveqwx@users.noreply.github.com>
---
 padd.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/padd.sh b/padd.sh
index 4676f84..6b70775 100755
--- a/padd.sh
+++ b/padd.sh
@@ -105,12 +105,6 @@ TestAPIAvailability() {
 
     local chaos_api_list authResponse cmdResult digReturnCode authStatus authData apiAvailable
 
-    if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
-        moveXOffset; echo "Do not set --server and --api simultaneously."
-        moveXOffset; echo "Exiting."
-        exit 1
-    fi
-
     # Check if an API location was specified with --api
     if [ -n "${API_LOCATION}" ]; then
         # The list of available API URLs is just the provided URL
@@ -1942,6 +1936,12 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
+if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
+    moveXOffset; echo "Do not set --server and --api simultaneously."
+    moveXOffset; echo "Exiting."
+    exit 1
+fi
+
 if [ "${versionOnly}" ]; then
     ShowVersion
 fi

From eeecdf4f8c4035e5e5cc07437705a5b3a440297e Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Sun, 11 May 2025 21:28:18 +0200
Subject: [PATCH 32/45] Revert response code logic

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/padd.sh b/padd.sh
index 2ace59f..f5602c4 100755
--- a/padd.sh
+++ b/padd.sh
@@ -162,33 +162,33 @@ TestAPIAvailability() {
         authData=$(printf %s "${authResponse%???}")
 
         # Test if http status code was 200 (OK) or 401 (authentication required)
-        if [ ! "${authStatus}" = 200 ] && [ ! "${authStatus}" = 401 ]; then
-            # API is not available at this port/protocol combination
-            apiAvailable=false
-        else
-            # API is available at this URL combination
-
-            if [ "${authStatus}" = 200 ]; then
-                # API is available without authentication
-                needAuth=false
-            fi
+        if [ "${authStatus}" = 200 ]; then
+            # API is available without authentication
+            apiAvailable=true
+            needAuth=false
+            break
 
+        elif [ "${authStatus}" = 401 ]; then
+            # API is available with authentication
+            apiAvailable=true
+            needAuth=true
             # Check if 2FA is required
             needTOTP=$(echo "${authData}"| jq --raw-output .session.totp 2>/dev/null)
-
-            apiAvailable=true
             break
-        fi
+        else
+            # API is not available at this port/protocol combination
+            apiAvailable=false
 
-        # Remove the first URL from the list
-        local last_api_list
-        last_api_list="${chaos_api_list}"
-        chaos_api_list="${chaos_api_list#* }"
+            # Remove the first URL from the list
+            local last_api_list
+            last_api_list="${chaos_api_list}"
+            chaos_api_list="${chaos_api_list#* }"
 
-        # If the list did not change, we are at the last element
-        if [ "${last_api_list}" = "${chaos_api_list}" ]; then
-            # Remove the last element
-            chaos_api_list=""
+            # If the list did not change, we are at the last element
+            if [ "${last_api_list}" = "${chaos_api_list}" ]; then
+                # Remove the last element
+                chaos_api_list=""
+            fi
         fi
     done
 

From 49bee66d148286071b8d40ad5d16f60d1b4a553e Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Wed, 14 May 2025 08:43:28 +0200
Subject: [PATCH 33/45] Use shell parameter expansion to split http_code and
 payload

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/padd.sh b/padd.sh
index f5602c4..77df7a0 100755
--- a/padd.sh
+++ b/padd.sh
@@ -152,14 +152,15 @@ TestAPIAvailability() {
             esac
         fi
 
-        # Test if the API is available at this URL
-        authResponse=$(curl --connect-timeout 2 -skS -w "%{http_code}" "${API_URL}auth")
+        # Test if the API is available at this URL, include delimiter for ease in splitting payload
+        authResponse=$(curl --connect-timeout 2 -skS -w ">>%{http_code}" "${API_URL}auth")
 
-        # authStatus are the last 3 characters
-        # not using ${authResponse#"${authResponse%???}"}" here because it's extremely slow on big responses
-        authStatus=$(printf "%s" "${authResponse}" | tail -c 3)
-        # data is everything from response without the last 3 characters
-        authData=$(printf %s "${authResponse%???}")
+        # authStatus is the response http_code, eg. 200, 401.
+        # Shell parameter expansion, remove everything up to and including the >> delim
+        authStatus=${authResponse#*>>}
+        # data is everything from response
+        # Shell parameter expansion, remove the >> delim and everything after
+        authData=${authResponse%>>*}
 
         # Test if http status code was 200 (OK) or 401 (authentication required)
         if [ "${authStatus}" = 200 ]; then

From 1a5d01cc0c3ff422aaa4d394e303630824a62139 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Wed, 14 May 2025 08:46:54 +0200
Subject: [PATCH 34/45] Same for GetFTLData()

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/padd.sh b/padd.sh
index 77df7a0..9f79024 100755
--- a/padd.sh
+++ b/padd.sh
@@ -309,14 +309,15 @@ GetFTLData() {
     local data
     local status
 
-    # get the data from querying the API as well as the http status code
-    response=$(curl --connect-timeout 2 -sk -w "%{http_code}" -X GET "${API_URL}$1$2" -H "Accept: application/json" -H "sid: ${SID}" )
+    # get the data from querying the API as well as the http status code, include delimiter for ease in splitting payload
+    response=$(curl --connect-timeout 2 -sk -w ">>%{http_code}" -X GET "${API_URL}$1$2" -H "Accept: application/json" -H "sid: ${SID}" )
 
-    # status are the last 3 characters
-    # not using ${response#"${response%???}"}" here because it's extremely slow on big responses
-    status=$(printf "%s" "${response}" | tail -c 3)
-    # data is everything from response without the last 3 characters
-    data=$(printf %s "${response%???}")
+    # status is the response http_code, eg. 200, 401.
+    # Shell parameter expansion, remove everything up to and including the >> delim
+    status=${response#*>>}
+    # data is everything from response
+    # Shell parameter expansion, remove the >> delim and everything after
+    data=${response%>>*}
 
     if [ "${status}" = 200 ]; then
         echo "${data}"

From 4e0d63f3289aad2448c61e6054b4749495d24931 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 16 Aug 2025 10:38:28 +0000
Subject: [PATCH 35/45] Bump actions/checkout from 4.2.2 to 5.0.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.2.2...v5.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codespell.yml            | 2 +-
 .github/workflows/editorconfig-checker.yml | 2 +-
 .github/workflows/stale.yml                | 2 +-
 .github/workflows/sync-back-to-dev.yml     | 2 +-
 .github/workflows/version_bump.yml         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index f81d0e5..6e46716 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@v5.0.0
     -
       name: Spell-Checking
       uses: codespell-project/actions-codespell@master
diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml
index 8f104c2..790f6bf 100644
--- a/.github/workflows/editorconfig-checker.yml
+++ b/.github/workflows/editorconfig-checker.yml
@@ -9,6 +9,6 @@ jobs:
       name: editorconfig-checker
       runs-on: ubuntu-latest
       steps:
-        - uses: actions/checkout@v4.2.2
+        - uses: actions/checkout@v5.0.0
         - uses: editorconfig-checker/action-editorconfig-checker@main # current tag v1.0.0 is really out-of-date
         - run: editorconfig-checker
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 558223f..d621458 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
       - name: Remove 'stale' label
         run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
         env:
diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
index d9c7ed1..8bcc04f 100644
--- a/.github/workflows/sync-back-to-dev.yml
+++ b/.github/workflows/sync-back-to-dev.yml
@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
       - name: Opening pull request
         run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'Internal'
         env:
diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml
index a4031e9..bb807e6 100644
--- a/.github/workflows/version_bump.yml
+++ b/.github/workflows/version_bump.yml
@@ -22,7 +22,7 @@ jobs:
         shell: bash
 
       - name: Checkout code
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
         with:
           ref: 'development'
 

From 08e88bda24f786e792b7e170dcdec80d22a4bec9 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 4 Aug 2025 21:13:09 +0200
Subject: [PATCH 36/45] Add ShellCheck

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 .github/workflows/shellcheck.yml | 21 +++++++++++++++++++++
 .shellcheckrc                    |  6 ++++++
 padd.sh                          |  5 -----
 3 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/shellcheck.yml
 create mode 100644 .shellcheckrc

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
new file mode 100644
index 0000000..2da775a
--- /dev/null
+++ b/.github/workflows/shellcheck.yml
@@ -0,0 +1,21 @@
+name: ShellCheck
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+
+jobs:
+  shellcheck:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    -
+      name: Checkout repository
+      uses: actions/checkout@v4.2.2
+      with:
+        fetch-depth: 0 # Differential ShellCheck requires full git history
+
+    - name: Differential ShellCheck
+      uses: redhat-plumbers-in-action/differential-shellcheck@v5
+      with:
+        severity: warning
+        display-engine: sarif-fmt
diff --git a/.shellcheckrc b/.shellcheckrc
new file mode 100644
index 0000000..c4711a8
--- /dev/null
+++ b/.shellcheckrc
@@ -0,0 +1,6 @@
+external-sources=true # allow shellcheck to read external sources
+disable=SC3043 #disable SC3043: In POSIX sh, local is undefined.
+enable=useless-use-of-cat # disabled by default as of shellcheck 0.11.0
+enable=avoid-negated-conditions # avoid-negated-conditions is optional as of shellcheck 0.11.0
+enable=require-variable-braces
+enable=deprecate-which
diff --git a/padd.sh b/padd.sh
index e9dd14a..982bf95 100755
--- a/padd.sh
+++ b/padd.sh
@@ -1,9 +1,4 @@
 #!/usr/bin/env sh
-# shellcheck disable=SC1091
-
-# Ignore warning about `local` being undefinded in POSIX
-# shellcheck disable=SC3043
-# https://github.com/koalaman/shellcheck/wiki/SC3043#exceptions
 
 # PADD
 # A more advanced version of the chronometer provided with Pihole

From d0a34b1e45c839551b58ec9a7914e6b0b75a5aa5 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 4 Aug 2025 21:19:18 +0200
Subject: [PATCH 37/45] Unify Github CI workflows

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 .github/workflows/{shellcheck.yml => CI.yml} | 13 ++++++++++++-
 .github/workflows/codespell.yml              | 18 ------------------
 .github/workflows/editorconfig-checker.yml   | 14 --------------
 3 files changed, 12 insertions(+), 33 deletions(-)
 rename .github/workflows/{shellcheck.yml => CI.yml} (59%)
 delete mode 100644 .github/workflows/codespell.yml
 delete mode 100644 .github/workflows/editorconfig-checker.yml

diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/CI.yml
similarity index 59%
rename from .github/workflows/shellcheck.yml
rename to .github/workflows/CI.yml
index 2da775a..5c98087 100644
--- a/.github/workflows/shellcheck.yml
+++ b/.github/workflows/CI.yml
@@ -1,4 +1,4 @@
-name: ShellCheck
+name: CI Tests
 on:
   pull_request:
     types: [opened, synchronize, reopened, ready_for_review]
@@ -19,3 +19,14 @@ jobs:
       with:
         severity: warning
         display-engine: sarif-fmt
+
+    - name: Spell-Checking
+      uses: codespell-project/actions-codespell@master
+      with:
+        ignore_words_file: .codespellignore
+
+    - name: Get editorconfig-checker
+      uses: editorconfig-checker/action-editorconfig-checker@main # tag v1.0.0 is really out of date
+
+    - name: Run editorconfig-checker
+      run: editorconfig-checker
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
deleted file mode 100644
index 6e46716..0000000
--- a/.github/workflows/codespell.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Codespell
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review]
-
-jobs:
-  spell-check:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    -
-      name: Checkout repository
-      uses: actions/checkout@v5.0.0
-    -
-      name: Spell-Checking
-      uses: codespell-project/actions-codespell@master
-      with:
-        ignore_words_file: .codespellignore
diff --git a/.github/workflows/editorconfig-checker.yml b/.github/workflows/editorconfig-checker.yml
deleted file mode 100644
index 790f6bf..0000000
--- a/.github/workflows/editorconfig-checker.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: editorconfig-checker
-
-on:
-    pull_request:
-    push:
-
-jobs:
-    build:
-      name: editorconfig-checker
-      runs-on: ubuntu-latest
-      steps:
-        - uses: actions/checkout@v5.0.0
-        - uses: editorconfig-checker/action-editorconfig-checker@main # current tag v1.0.0 is really out-of-date
-        - run: editorconfig-checker

From 2f245b9fc922f523402ba43c8c03c85ebacd1fc5 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 4 Aug 2025 21:55:12 +0200
Subject: [PATCH 38/45] Fix shellcheck compains

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 166 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/padd.sh b/padd.sh
index 982bf95..15f66b2 100755
--- a/padd.sh
+++ b/padd.sh
@@ -120,7 +120,7 @@ TestAPIAvailability() {
         # We can't use${cmdResult##*$'\n'*} here as $'..' is not POSIX
         digReturnCode="$(echo "${cmdResult}" | tail -n 1)"
 
-        if [ ! "${digReturnCode}" = "0" ]; then
+        if [ "${digReturnCode}" != "0" ]; then
             # If the query was not successful
             moveXOffset; echo "API not available. Please check server address and connectivity"
             exit 1
@@ -140,16 +140,16 @@ TestAPIAvailability() {
 
         # If $SERVER is user-specified by IP, the returned API_URL might contain a domain which can't be resolved by the host
         # Therefore, we substitute the domain with the IP
-        if [ -n "$SERVER" ]; then
+        if [ -n "${SERVER}" ]; then
             # Check if SERVER is an IPv6
-            case "$SERVER" in
+            case "${SERVER}" in
                 *:*)
                     # Replace the domain with the IP
                     # Add square brackets for IPv6 (as recommended by RFC2732)
-                    API_URL=$(echo "$API_URL" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1[${SERVER}]\2#");;
+                    API_URL=$(echo "${API_URL}" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1[${SERVER}]\2#");;
                 *)
                     # Replace the domain with the IP
-                    API_URL=$(echo "$API_URL" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1$SERVER\2#");;
+                    API_URL=$(echo "${API_URL}" | sed -E "s#(https?://)[^/:]+(:[0-9]+)#\1${SERVER}\2#");;
             esac
         fi
 
@@ -237,15 +237,15 @@ LoginAPI() {
     Authenticate
 
     # Try to login again until the session is valid
-    while [ ! "${validSession}" = true ]  ; do
+    while [ "${validSession}" != true ]  ; do
         moveXOffset; echo "Authentication failed."
 
         # Print the error message if there is one
-        if  [ ! "${sessionError}" = "null"  ]; then
+        if  [ "${sessionError}" != "null"  ]; then
             moveXOffset; echo "Error: ${sessionError}"
         fi
         # Print the session message if there is one
-        if  [ ! "${sessionMessage}" = "null"  ]; then
+        if  [ "${sessionMessage}" != "null"  ]; then
             moveXOffset; echo "Error: ${sessionMessage}"
         fi
 
@@ -272,7 +272,7 @@ LoginAPI() {
 DeleteSession() {
     # if a valid Session exists (no password required or successful authenthication) and
     # SID is not null (successful authenthication only), delete the session
-    if [ "${validSession}" = true ] && [ ! "${SID}" = null ]; then
+    if [ "${validSession}" = true ] && [ "${SID}" != null ]; then
         # Try to delete the session. Omit the output, but get the http status code
         deleteResponse=$(curl --connect-timeout 2 -skS -o /dev/null -w "%{http_code}" -X DELETE "${API_URL}auth"  -H "Accept: application/json" -H "sid: ${SID}")
 
@@ -353,12 +353,12 @@ GetPADDData() {
         # Using "paths(scalars | true)" will return null and false values.
         # We also check if the value is exactly `null` and, in this case, return the
         # string "null", as jq would return an empty string for nulls.
-        padd_data=$(echo "$response" | jq -r 'paths(scalars | true) as $p | [$p | join(".")] + [if getpath($p)!=null then getpath($p) else "null" end] | join("=")' 2>/dev/null)
+        padd_data=$(echo "${response}" | jq -r 'paths(scalars | true) as $p | [$p | join(".")] + [if getpath($p)!=null then getpath($p) else "null" end] | join("=")' 2>/dev/null)
     fi
 }
 
 GetPADDValue() {
-    echo "$padd_data" | sed -n "s/^$1=//p" 2>/dev/null
+    echo "${padd_data}" | sed -n "s/^$1=//p" 2>/dev/null
 }
 
 GetSummaryInformation() {
@@ -514,7 +514,7 @@ GetSystemInformation() {
     sys_model="$(GetPADDValue host_model)"
 
     # DOCKER_VERSION is set during GetVersionInformation, so this needs to run first during startup
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
+    if [ "${DOCKER_VERSION}" != "null" ]; then
         # Docker image
         sys_model="Container"
     fi
@@ -523,7 +523,7 @@ GetSystemInformation() {
     sys_model=$(filterModel "${sys_model}")
 
     # FTL returns null if device information is not available
-    if [  -z "$sys_model" ] || [  "$sys_model" = "null" ]; then
+    if [  -z "${sys_model}" ] || [  "${sys_model}" = "null" ]; then
         sys_model="N/A"
     fi
 }
@@ -693,7 +693,7 @@ GetNetworkInformation() {
     # name to highlight that there are two different interfaces and the
     # displayed statistics are only for the IPv4 interface, while the IPv6
     # address correctly corresponds to the default IPv6 interface
-    if [ ! "${gateway_v4_iface}" = "${gateway_v6_iface}" ]; then
+    if [ "${gateway_v4_iface}" != "${gateway_v6_iface}" ]; then
         iface_name="${iface_name}*"
     fi
 }
@@ -763,7 +763,7 @@ GetVersionInformation() {
     DOCKER_VERSION="$(GetPADDValue version.docker.local)"
 
     # If PADD is running inside docker, immediately return without checking for updated component versions
-    if [ ! "${DOCKER_VERSION}" = "null" ] ; then
+    if [ "${DOCKER_VERSION}" != "null" ] ; then
         GITHUB_DOCKER_VERSION="$(GetPADDValue version.docker.remote)"
         docker_version_converted="$(VersionConverter "${DOCKER_VERSION}")"
         docker_version_latest_converted="$(VersionConverter "${GITHUB_DOCKER_VERSION}")"
@@ -814,14 +814,14 @@ GetVersionInformation() {
             fi
             # shorten common branch names (fix/, tweak/, new/)
             # use the first 7 characters of the branch name as version
-            CORE_VERSION="$(printf '%s' "$CORE_BRANCH" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
+            CORE_VERSION="$(printf '%s' "${CORE_BRANCH}" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
         fi
     fi
 
   # Gather web version information...
     WEB_VERSION="$(GetPADDValue version.web.local.version)"
 
-    if [ ! "$WEB_VERSION" = "null" ]; then
+    if [ "${WEB_VERSION}" != "null" ]; then
         WEB_BRANCH="$(GetPADDValue version.web.local.branch)"
         WEB_VERSION="$(GetPADDValue version.web.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
         GITHUB_WEB_VERSION="$(GetPADDValue version.web.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
@@ -856,7 +856,7 @@ GetVersionInformation() {
                 fi
                 # shorten common branch names (fix/, tweak/, new/)
                 # use the first 7 characters of the branch name as version
-                WEB_VERSION="$(printf '%s' "$WEB_BRANCH" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
+                WEB_VERSION="$(printf '%s' "${WEB_BRANCH}" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
             fi
         fi
     else
@@ -900,7 +900,7 @@ GetVersionInformation() {
             fi
             # shorten common branch names (fix/, tweak/, new/)
             # use the first 7 characters of the branch name as version
-            FTL_VERSION="$(printf '%s' "$FTL_BRANCH" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
+            FTL_VERSION="$(printf '%s' "${FTL_BRANCH}" | sed 's/fix\//f\//;s/new\//n\//;s/tweak\//t\//' | cut -c 1-7)"
         fi
     fi
 
@@ -931,48 +931,48 @@ GetPADDInformation() {
 GenerateSizeDependendOutput() {
 
     if [ "$1" = "pico" ] || [ "$1" = "nano" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 9 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 9 "color")
 
     elif  [ "$1" = "micro" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 10 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 10 "color")
 
     elif [ "$1" = "mini" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 20 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 20 "color")
 
-        latest_blocked=$(truncateString "$latest_blocked_raw" 29)
-        top_blocked=$(truncateString "$top_blocked_raw" 29)
+        latest_blocked=$(truncateString "${latest_blocked_raw}" 29)
+        top_blocked=$(truncateString "${top_blocked_raw}" 29)
 
     elif [ "$1" = "tiny" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 30 "color")
 
-        latest_blocked=$(truncateString "$latest_blocked_raw" 41)
-        top_blocked=$(truncateString "$top_blocked_raw" 41)
-        top_domain=$(truncateString "$top_domain_raw" 41)
-        top_client=$(truncateString "$top_client_raw" 41)
+        latest_blocked=$(truncateString "${latest_blocked_raw}" 41)
+        top_blocked=$(truncateString "${top_blocked_raw}" 41)
+        top_domain=$(truncateString "${top_domain_raw}" 41)
+        top_client=$(truncateString "${top_client_raw}" 41)
 
     elif [ "$1" = "regular" ] || [ "$1" = "slim" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 40 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 40 "color")
 
-        latest_blocked=$(truncateString "$latest_blocked_raw" 48)
-        top_blocked=$(truncateString "$top_blocked_raw" 48)
-        top_domain=$(truncateString "$top_domain_raw" 48)
-        top_client=$(truncateString "$top_client_raw" 48)
+        latest_blocked=$(truncateString "${latest_blocked_raw}" 48)
+        top_blocked=$(truncateString "${top_blocked_raw}" 48)
+        top_domain=$(truncateString "${top_domain_raw}" 48)
+        top_client=$(truncateString "${top_client_raw}" 48)
 
-        if [ "$temp_unicode" = true ]; then
+        if [ "${temp_unicode}" = true ]; then
             temp_padding=21
         else
             temp_padding=20
         fi
 
     elif [ "$1" = "mega" ]; then
-        ads_blocked_bar=$(BarGenerator "$ads_percentage_today" 30 "color")
+        ads_blocked_bar=$(BarGenerator "${ads_percentage_today}" 30 "color")
 
-        latest_blocked=$(truncateString "$latest_blocked_raw" 68)
-        top_blocked=$(truncateString "$top_blocked_raw" 68)
-        top_domain=$(truncateString "$top_domain_raw" 68)
-        top_client=$(truncateString "$top_client_raw" 68)
+        latest_blocked=$(truncateString "${latest_blocked_raw}" 68)
+        top_blocked=$(truncateString "${top_blocked_raw}" 68)
+        top_domain=$(truncateString "${top_domain_raw}" 68)
+        top_client=$(truncateString "${top_client_raw}" 68)
 
-        if [ "$temp_unicode" = true ]; then
+        if [ "${temp_unicode}" = true ]; then
             temp_padding=10
         else
             temp_padding=9
@@ -1084,7 +1084,7 @@ PrintLogo() {
 }
 
 PrintDashboard() {
-    if [ ! "${DOCKER_VERSION}" = "null" ]; then
+    if [ "${DOCKER_VERSION}" != "null" ]; then
         version_info="Docker ${docker_version_heatmap}${DOCKER_VERSION}${reset_text}"
     else
         version_info="Pi-hole® ${core_version_heatmap}${CORE_VERSION}${reset_text}, Web ${web_version_heatmap}${WEB_VERSION}${reset_text}, FTL ${ftl_version_heatmap}${FTL_VERSION}${reset_text}"
@@ -1272,7 +1272,7 @@ HeatmapGenerator () {
         out=${red_text}
     fi
 
-    echo "$out"
+    echo "${out}"
 }
 
 # Provides a "bar graph"
@@ -1283,22 +1283,22 @@ HeatmapGenerator () {
 BarGenerator() {
     # number of filled in cells in the bar
     barNumber=$(printf %.f "$(echo "$1 $2" | awk '{print ($1 / 100) * $2}')")
-    frontFill=$(for i in $(seq "$barNumber"); do printf "%b" "■"; done)
+    frontFill=$(for i in $(seq "${barNumber}"); do printf "%b" "■"; done)
 
     # remaining "unfilled" cells in the bar
     backfillNumber=$(($2-barNumber))
 
     # if the filled in cells is less than the max length of the bar, fill it
-    if [ "$barNumber" -lt "$2" ]; then
+    if [ "${barNumber}" -lt "$2" ]; then
         # if the bar should be colored
         if [ "$3" = "color" ]; then
         # fill the rest in color
-        backFill=$(for i in $(seq $backfillNumber); do printf "%b" "■"; done)
+        backFill=$(for i in $(seq ${backfillNumber}); do printf "%b" "■"; done)
         out="${red_text}${frontFill}${green_text}${backFill}${reset_text}"
         # else, it shouldn't be colored in
         else
         # fill the rest with "space"
-        backFill=$(for i in $(seq $backfillNumber); do printf "%b" "·"; done)
+        backFill=$(for i in $(seq ${backfillNumber}); do printf "%b" "·"; done)
         out="${frontFill}${reset_text}${backFill}"
         fi
     # else, fill it all the way
@@ -1306,7 +1306,7 @@ BarGenerator() {
         out=$(for i in $(seq "$2"); do printf "%b" "■"; done)
     fi
 
-    echo "$out"
+    echo "${out}"
 }
 
 # Checks the size of the screen and sets the value of ${padd_data}_size
@@ -1320,42 +1320,42 @@ SizeChecker(){
     console_height=$(tput lines)
 
     # Mega
-    if [ "$console_width" -ge "80" ] && [ "$console_height" -ge "26" ]; then
+    if [ "${console_width}" -ge "80" ] && [ "${console_height}" -ge "26" ]; then
         padd_size="mega"
         width=80
         height=26
     # Below Mega. Gives you Regular.
-    elif [ "$console_width" -ge "60" ] && [ "$console_height" -ge "22" ]; then
+    elif [ "${console_width}" -ge "60" ] && [ "${console_height}" -ge "22" ]; then
         padd_size="regular"
         width=60
         height=22
     # Below Regular. Gives you Slim.
-    elif [ "$console_width" -ge "60" ] && [ "$console_height" -ge "21" ]; then
+    elif [ "${console_width}" -ge "60" ] && [ "${console_height}" -ge "21" ]; then
         padd_size="slim"
         width=60
         height=21
     # Below Slim. Gives you Tiny.
-    elif [ "$console_width" -ge "53" ] && [ "$console_height" -ge "20" ]; then
+    elif [ "${console_width}" -ge "53" ] && [ "${console_height}" -ge "20" ]; then
         padd_size="tiny"
         width=53
         height=20
     # Below Tiny. Gives you Mini.
-    elif [ "$console_width" -ge "40" ] && [ "$console_height" -ge "18" ]; then
+    elif [ "${console_width}" -ge "40" ] && [ "${console_height}" -ge "18" ]; then
         padd_size="mini"
         width=40
         height=18
     # Below Mini. Gives you Micro.
-    elif [ "$console_width" -ge "30" ] && [ "$console_height" -ge "16" ]; then
+    elif [ "${console_width}" -ge "30" ] && [ "${console_height}" -ge "16" ]; then
         padd_size="micro"
         width=30
         height=16
     # Below Micro, Gives you Nano.
-    elif [ "$console_width" -ge "24" ] && [ "$console_height" -ge "12" ]; then
+    elif [ "${console_width}" -ge "24" ] && [ "${console_height}" -ge "12" ]; then
         padd_size="nano"
         width=24
         height=12
     # Below Nano. Gives you Pico.
-    elif [ "$console_width" -ge "20" ] && [ "$console_height" -ge "10" ]; then
+    elif [ "${console_width}" -ge "20" ] && [ "${console_height}" -ge "10" ]; then
         padd_size="pico"
         width=20
         height=10
@@ -1369,22 +1369,22 @@ SizeChecker(){
     yOffset="$(( (console_height - height) / 2 ))"
 
     # If the user sets an offset option, use it.
-    if [ -n "$xOffOrig" ]; then
-        xOffset=$xOffOrig
+    if [ -n "${xOffOrig}" ]; then
+        xOffset=${xOffOrig}
 
         # Limit the offset to avoid breaks
         xMaxOffset=$((console_width - width))
-        if [ "$xOffset" -gt "$xMaxOffset" ]; then
-            xOffset="$xMaxOffset"
+        if [ "${xOffset}" -gt "${xMaxOffset}" ]; then
+            xOffset="${xMaxOffset}"
         fi
     fi
-    if [ -n "$yOffOrig" ]; then
-        yOffset=$yOffOrig
+    if [ -n "${yOffOrig}" ]; then
+        yOffset=${yOffOrig}
 
         # Limit the offset to avoid breaks
         yMaxOffset=$((console_height - height))
-        if [ "$yOffset" -gt "$yMaxOffset" ]; then
-            yOffset="$yMaxOffset"
+        if [ "${yOffset}" -gt "${yMaxOffset}" ]; then
+            yOffset="${yMaxOffset}"
         fi
     fi
 }
@@ -1425,7 +1425,7 @@ filterModel() {
     #    `-v`      : set $FILTERLIST into a variable called `list`
     #    `gsub()`  : replace all list items (ignoring case) with an empty string, deleting them
     #    `{$1=$1}1`: remove all extra spaces. The last "1" evaluates as true, printing the result
-    echo "$1" | awk -v list="$FILTERLIST" '{IGNORECASE=1; gsub(list,"")}; {$1=$1}1'
+    echo "$1" | awk -v list="${FILTERLIST}" '{IGNORECASE=1; gsub(list,"")}; {$1=$1}1'
 }
 
 # Truncates a given string and appends three '...'
@@ -1440,7 +1440,7 @@ truncateString() {
     if [ "${length}" -gt "$2" ]; then
         # if length of the string is larger then the specified max length
         # cut every char from the string exceeding length $shorted and add three dots
-        truncatedString=$(echo "$1" | cut -c1-$shorted)"..."
+        truncatedString=$(echo "$1" | cut -c1-${shorted})"..."
         echo "${truncatedString}"
     else
         echo "$1"
@@ -1455,7 +1455,7 @@ convertUptime() {
     local H=$(($1/60/60%24))
     local M=$(($1/60%60))
 
-    printf "%d days, %02d hours, %02d minutes" $D $H $M
+    printf "%d days, %02d hours, %02d minutes" ${D} ${H} ${M}
 }
 
 secretRead() {
@@ -1488,7 +1488,7 @@ secretRead() {
         fi
         if [ "${key}" = "$(printf '\177')" ] ; then
             # Backspace
-            if [ $charcount -gt 0 ] ; then
+            if [ ${charcount} -gt 0 ] ; then
                 charcount=$((charcount-1))
                 printf '\b \b'
                 password="${password%?}"
@@ -1497,7 +1497,7 @@ secretRead() {
             # any other character
             charcount=$((charcount+1))
             printf '*'
-            password="$password$key"
+            password="${password}${key}"
         fi
     done
 
@@ -1528,7 +1528,7 @@ check_dependencies() {
         hasDeps=false
      fi
 
-    if ! [ "${hasDeps}" = true ]; then
+    if [ "${hasDeps}" != true ]; then
         printf "%b" "\n Please install the missing dependencies noted above.\n"
         exit 1
     fi
@@ -1634,11 +1634,11 @@ StartupRoutine(){
         moveXOffset; echo "- Gathering network info."
         GetNetworkInformation
         GetPADDInformation
-        if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        if [ "${DOCKER_VERSION}" != "null" ]; then
         moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
         else
-        moveXOffset; echo "  - Core $CORE_VERSION, Web $WEB_VERSION"
-        moveXOffset; echo "  - FTL $FTL_VERSION, PADD ${padd_version}"
+        moveXOffset; echo "  - Core ${CORE_VERSION}, Web ${WEB_VERSION}"
+        moveXOffset; echo "  - FTL ${FTL_VERSION}, PADD ${padd_version}"
         fi
 
     else
@@ -1672,12 +1672,12 @@ StartupRoutine(){
         GetNetworkInformation
 
         GetPADDInformation
-        if [ ! "${DOCKER_VERSION}" = "null" ]; then
+        if [ "${DOCKER_VERSION}" != "null" ]; then
         moveXOffset; echo "  - Docker Tag ${DOCKER_VERSION}"
         else
-        moveXOffset; echo "  - Pi-hole Core $CORE_VERSION"
-        moveXOffset; echo "  - Web Admin $WEB_VERSION"
-        moveXOffset; echo "  - FTL $FTL_VERSION"
+        moveXOffset; echo "  - Pi-hole Core ${CORE_VERSION}"
+        moveXOffset; echo "  - Web Admin ${WEB_VERSION}"
+        moveXOffset; echo "  - FTL ${FTL_VERSION}"
         moveXOffset; echo "  - PADD ${padd_version}"
         fi
     fi
@@ -1686,7 +1686,7 @@ StartupRoutine(){
         moveXOffset; printf "%s" "- Starting in "
         for i in 3 2 1
         do
-            printf "%s..." "$i"
+            printf "%s..." "${i}"
             sleep 1
         done
     fi
@@ -1840,7 +1840,7 @@ sig_cleanup() {
     # causing EXIT trap to be executed, so we trap EXIT after INT
     trap '' EXIT
 
-    (exit $err) # execute in a subshell just to pass $? to CleanExit()
+    (exit ${err}) # execute in a subshell just to pass $? to CleanExit()
     CleanExit
 }
 
@@ -1863,11 +1863,11 @@ CleanExit() {
 
     # if background sleep is running, kill it
     # http://mywiki.wooledge.org/SignalTrap#When_is_the_signal_handled.3F
-    kill "{$sleepPID}" > /dev/null 2>&1
+    kill "${sleepPID}" > /dev/null 2>&1
 
     #  Delete session from FTL server
     DeleteSession
-    exit $err # exit the script with saved $?
+    exit ${err} # exit the script with saved $?
 }
 
 TerminalResize(){
@@ -1884,7 +1884,7 @@ TerminalResize(){
 
     printf '\e[H\e[2J\e[3J'
 
-    kill "{$sleepPID}" > /dev/null 2>&1
+    kill "${sleepPID}" > /dev/null 2>&1
 }
 
 main(){
@@ -1933,7 +1933,7 @@ while [ "$#" -gt 0 ]; do
     shift
 done
 
-if [ -n "$API_LOCATION" ] && [ -n "$SERVER" ]; then
+if [ -n "${API_LOCATION}" ] && [ -n "${SERVER}" ]; then
     moveXOffset; echo "Do not set --server and --api simultaneously."
     moveXOffset; echo "Exiting."
     exit 1

From a0c39435ff132e581ba9d2936474ac7dc7bab900 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Tue, 5 Aug 2025 09:31:55 +0200
Subject: [PATCH 39/45] Fix Copilot complaints

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 padd.sh | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/padd.sh b/padd.sh
index 15f66b2..4c184f4 100755
--- a/padd.sh
+++ b/padd.sh
@@ -451,7 +451,7 @@ GetSystemInformation() {
     cpu_temp_raw=$(GetPADDValue sensors.cpu_temp)
     if [ "${cpu_temp_raw}" != null ]; then
         cpu_temp=$(printf "%.1f" "${cpu_temp_raw}")
-        temp_unit=$(echo "${padd_data}"  | GetPADDValue sensors.unit)
+        temp_unit=$(echo "${padd_data}" | GetPADDValue sensors.unit)
     fi
 
     # Temp + Unit
@@ -783,7 +783,7 @@ GetVersionInformation() {
     # Gather core version information...
     CORE_BRANCH="$(GetPADDValue version.core.local.branch)"
     CORE_VERSION="$(GetPADDValue version.core.local.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
-    GITHUB_CORE_VERSION="$(GetPADDValue version.core.remote.version  | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
+    GITHUB_CORE_VERSION="$(GetPADDValue version.core.remote.version | tr -d '[:alpha:]' | awk -F '-' '{printf $1}')"
     CORE_HASH="$(GetPADDValue version.core.local.hash)"
     GITHUB_CORE_HASH="$(GetPADDValue version.core.remote.hash)"
 
@@ -1254,8 +1254,8 @@ PrintDashboard() {
 # takes in one or two parameters
 HeatmapGenerator () {
     # if one number is provided, just use that percentage to figure out the colors
-    if [ -z "$2" ]; then
-        load=$(printf "%.0f" "$1")
+    if [ -z "${2}" ]; then
+        load=$(printf "%.0f" "${1}")
     # if two numbers are provided, do some math to make a percentage to figure out the colors
     else
         load=$(printf "%.0f" "$(echo "$1 $2" | awk '{print ($1 / $2) * 100}')")
@@ -1289,7 +1289,7 @@ BarGenerator() {
     backfillNumber=$(($2-barNumber))
 
     # if the filled in cells is less than the max length of the bar, fill it
-    if [ "${barNumber}" -lt "$2" ]; then
+    if [ "${barNumber}" -lt "${2}" ]; then
         # if the bar should be colored
         if [ "$3" = "color" ]; then
         # fill the rest in color
@@ -1303,7 +1303,7 @@ BarGenerator() {
         fi
     # else, fill it all the way
     else
-        out=$(for i in $(seq "$2"); do printf "%b" "■"; done)
+        out=$(for i in $(seq "${2}"); do printf "%b" "■"; done)
     fi
 
     echo "${out}"
@@ -1437,7 +1437,7 @@ truncateString() {
 
     length=${#1}
     shorted=$(($2-3)) # shorten max allowed length by 3 to make room for the dots
-    if [ "${length}" -gt "$2" ]; then
+    if [ "${length}" -gt "${2}" ]; then
         # if length of the string is larger then the specified max length
         # cut every char from the string exceeding length $shorted and add three dots
         truncatedString=$(echo "$1" | cut -c1-${shorted})"..."
@@ -1455,7 +1455,7 @@ convertUptime() {
     local H=$(($1/60/60%24))
     local M=$(($1/60%60))
 
-    printf "%d days, %02d hours, %02d minutes" ${D} ${H} ${M}
+    printf "%d days, %02d hours, %02d minutes" "${D}" "${H}" "${M}"
 }
 
 secretRead() {
@@ -1922,12 +1922,12 @@ while [ "$#" -gt 0 ]; do
         "-h" | "--help"     ) DisplayHelp; exit 0;;
         "-v" | "--version"  ) xOffset=0; versionOnly=true ;;
         "--runonce"         ) runOnce=true;;
-        "--xoff"            ) xOffset="$2"; xOffOrig="$2"; shift;;
-        "--yoff"            ) yOffset="$2"; yOffOrig="$2"; shift;;
-        "--server"          ) SERVER="$2"; shift;;
-        "--api"             ) API_LOCATION="$2"; shift;;
-        "--secret"          ) password="$2"; shift;;
-        "--2fa"             ) totp="$2"; shift;;
+        "--xoff"            ) xOffset="${2}"; xOffOrig="${2}"; shift;;
+        "--yoff"            ) yOffset="${2}"; yOffOrig="${2}"; shift;;
+        "--server"          ) SERVER="${2}"; shift;;
+        "--api"             ) API_LOCATION="${2}"; shift;;
+        "--secret"          ) password="${2}"; shift;;
+        "--2fa"             ) totp="${2}"; shift;;
         *                   ) DisplayHelp; exit 1;;
     esac
     shift

From f3b34fabd8d4a12a8f726b1afb824bcf19145500 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Sun, 5 Oct 2025 09:49:49 +0200
Subject: [PATCH 40/45] Pin github actions by sha

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 .github/workflows/CI.yml               | 8 ++++----
 .github/workflows/merge-conflict.yml   | 2 +-
 .github/workflows/stale.yml            | 4 ++--
 .github/workflows/stale_pr.yml         | 2 +-
 .github/workflows/sync-back-to-dev.yml | 2 +-
 .github/workflows/version_bump.yml     | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5c98087..70bf405 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -10,23 +10,23 @@ jobs:
     steps:
     -
       name: Checkout repository
-      uses: actions/checkout@v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
       with:
         fetch-depth: 0 # Differential ShellCheck requires full git history
 
     - name: Differential ShellCheck
-      uses: redhat-plumbers-in-action/differential-shellcheck@v5
+      uses: redhat-plumbers-in-action/differential-shellcheck@0d9e5b29625f871e6a4215380486d6f1a7cb6cdd #v5.5.5
       with:
         severity: warning
         display-engine: sarif-fmt
 
     - name: Spell-Checking
-      uses: codespell-project/actions-codespell@master
+      uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 #v2.1
       with:
         ignore_words_file: .codespellignore
 
     - name: Get editorconfig-checker
-      uses: editorconfig-checker/action-editorconfig-checker@main # tag v1.0.0 is really out of date
+      uses: editorconfig-checker/action-editorconfig-checker@f40bac9e7d9e7d298fbe36b83e1eff8f0de13fb8 # tag v2 is really out of date
 
     - name: Run editorconfig-checker
       run: editorconfig-checker
diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml
index ea30b65..c7ceb93 100644
--- a/.github/workflows/merge-conflict.yml
+++ b/.github/workflows/merge-conflict.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check if PRs are have merge conflicts
-        uses: eps1lon/actions-label-merge-conflict@v3.0.3
+        uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 #v3.0.3
         with:
           dirtyLabel: "Merge Conflict"
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index d621458..124b10c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 #v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
       - name: Remove 'stale' label
         run: gh issue edit ${{ github.event.issue.number }} --remove-label ${{ env.stale_label }}
         env:
diff --git a/.github/workflows/stale_pr.yml b/.github/workflows/stale_pr.yml
index 2441271..a2939fe 100644
--- a/.github/workflows/stale_pr.yml
+++ b/.github/workflows/stale_pr.yml
@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 #v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # Do not automatically mark PR/issue as stale
diff --git a/.github/workflows/sync-back-to-dev.yml b/.github/workflows/sync-back-to-dev.yml
index 8bcc04f..602035f 100644
--- a/.github/workflows/sync-back-to-dev.yml
+++ b/.github/workflows/sync-back-to-dev.yml
@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
       - name: Opening pull request
         run: gh pr create -B development -H master --title 'Sync master back into development' --body 'Created by Github action' --label 'Internal'
         env:
diff --git a/.github/workflows/version_bump.yml b/.github/workflows/version_bump.yml
index bb807e6..81893d9 100644
--- a/.github/workflows/version_bump.yml
+++ b/.github/workflows/version_bump.yml
@@ -22,7 +22,7 @@ jobs:
         shell: bash
 
       - name: Checkout code
-        uses: actions/checkout@v5.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0
         with:
           ref: 'development'
 

From 37519603584469b310b4413467a8ececf5b205c6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 10:04:49 +0000
Subject: [PATCH 41/45] Bump actions/stale from 9.1.0 to 10.1.0

Bumps [actions/stale](https://github.com/actions/stale) from 9.1.0 to 10.1.0.
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/v9.1.0...v10.1.0)

---
updated-dependencies:
- dependency-name: actions/stale
  dependency-version: 10.1.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/stale.yml    | 2 +-
 .github/workflows/stale_pr.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 124b10c..1ee84f1 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
       issues: write
 
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 #v9.1.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 30
diff --git a/.github/workflows/stale_pr.yml b/.github/workflows/stale_pr.yml
index a2939fe..123488c 100644
--- a/.github/workflows/stale_pr.yml
+++ b/.github/workflows/stale_pr.yml
@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 #v9.1.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 #v10.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # Do not automatically mark PR/issue as stale

From 08900899fba4ab09d7a53b7e230ddf7e86fa0ab5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 11 Oct 2025 10:01:15 +0000
Subject: [PATCH 42/45] Bump editorconfig-checker/action-editorconfig-checker

Bumps [editorconfig-checker/action-editorconfig-checker](https://github.com/editorconfig-checker/action-editorconfig-checker) from f40bac9e7d9e7d298fbe36b83e1eff8f0de13fb8 to 1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4.
- [Release notes](https://github.com/editorconfig-checker/action-editorconfig-checker/releases)
- [Commits](https://github.com/editorconfig-checker/action-editorconfig-checker/compare/f40bac9e7d9e7d298fbe36b83e1eff8f0de13fb8...1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4)

---
updated-dependencies:
- dependency-name: editorconfig-checker/action-editorconfig-checker
  dependency-version: 1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 70bf405..a33b9ec 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -26,7 +26,7 @@ jobs:
         ignore_words_file: .codespellignore
 
     - name: Get editorconfig-checker
-      uses: editorconfig-checker/action-editorconfig-checker@f40bac9e7d9e7d298fbe36b83e1eff8f0de13fb8 # tag v2 is really out of date
+      uses: editorconfig-checker/action-editorconfig-checker@1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4 # tag v2 is really out of date
 
     - name: Run editorconfig-checker
       run: editorconfig-checker

From e7649da2823f209300eceb8df433bd90c33ec0de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 18 Oct 2025 10:01:10 +0000
Subject: [PATCH 43/45] Bump editorconfig-checker/action-editorconfig-checker

Bumps [editorconfig-checker/action-editorconfig-checker](https://github.com/editorconfig-checker/action-editorconfig-checker) from 1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4 to 5ecdd656fe347c26f76b1b435b90e1d74fb5e787.
- [Release notes](https://github.com/editorconfig-checker/action-editorconfig-checker/releases)
- [Commits](https://github.com/editorconfig-checker/action-editorconfig-checker/compare/1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4...5ecdd656fe347c26f76b1b435b90e1d74fb5e787)

---
updated-dependencies:
- dependency-name: editorconfig-checker/action-editorconfig-checker
  dependency-version: 5ecdd656fe347c26f76b1b435b90e1d74fb5e787
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index a33b9ec..5ce025c 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -26,7 +26,7 @@ jobs:
         ignore_words_file: .codespellignore
 
     - name: Get editorconfig-checker
-      uses: editorconfig-checker/action-editorconfig-checker@1a41284d59c6fe7f1b21ddc4a2b36400a33dc1b4 # tag v2 is really out of date
+      uses: editorconfig-checker/action-editorconfig-checker@5ecdd656fe347c26f76b1b435b90e1d74fb5e787 # tag v2 is really out of date
 
     - name: Run editorconfig-checker
       run: editorconfig-checker

From 95de944e16681e79d20cd13e5d1372f7a7a117d2 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Sun, 26 Oct 2025 20:32:30 +0100
Subject: [PATCH 44/45] Start using commented tags for editorconfig-checker

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 .github/workflows/CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5ce025c..e170254 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -26,7 +26,7 @@ jobs:
         ignore_words_file: .codespellignore
 
     - name: Get editorconfig-checker
-      uses: editorconfig-checker/action-editorconfig-checker@5ecdd656fe347c26f76b1b435b90e1d74fb5e787 # tag v2 is really out of date
+      uses: editorconfig-checker/action-editorconfig-checker@4b6cd6190d435e7e084fb35e36a096e98506f7b9 #v2.1.0
 
     - name: Run editorconfig-checker
       run: editorconfig-checker

From 4684ba7be752d44a413f3eb58ca07c7c9255d146 Mon Sep 17 00:00:00 2001
From: pralor-bot <pralor-bot@users.noreply.github.com>
Date: Sun, 26 Oct 2025 20:30:57 +0000
Subject: [PATCH 45/45] Bump version to v4.1.0

---
 padd.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/padd.sh b/padd.sh
index 4c184f4..21e3c4c 100755
--- a/padd.sh
+++ b/padd.sh
@@ -10,7 +10,7 @@ export LC_NUMERIC=C
 ############################################ VARIABLES #############################################
 
 # VERSION
-padd_version="v4.0.0"
+padd_version="v4.1.0"
 
 # LastChecks
 LastCheckPADDInformation=$(date +%s)