From de44af64b4d91e5a0e44ef05b086d761f16156ae Mon Sep 17 00:00:00 2001
From: peignerpausz <patrick.eigner-pausz@easyname.at>
Date: Wed, 15 Apr 2026 13:31:27 +0200
Subject: [PATCH] Improved spamcheck and thereby donaspam and adspam

---
 wh20/adspam/README.md       | 26 +++++++++---------
 wh20/donaspam/README.md     | 53 +++++++++++++++++--------------------
 wh20/spamcheck/README.md    | 20 +++++---------
 wh20/spamcheck/spamcheck.sh | 11 ++++++--
 4 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/wh20/adspam/README.md b/wh20/adspam/README.md
index 7bb9188..929764c 100644
--- a/wh20/adspam/README.md
+++ b/wh20/adspam/README.md
@@ -24,18 +24,6 @@ chmod +x adspam
 
 ```bash
 USER@connect-lej ~ $ adspam
-=== Todays Spamcheck on Mo 13. Apr 13:59:27 CEST 2026===
-
-=== srv244.adino.at Spamcheck ===
-=== srv244.adino.at Spamcheck done ===
-=== srv251.adino.at Spamcheck ===
-=== srv251.adino.at Spamcheck done ===
-=== srv252.adino.at Spamcheck ===
-=== srv252.adino.at Spamcheck done ===
-=== srv268.adino.at Spamcheck ===
-=== srv268.adino.at Spamcheck done ===
-=== srv272.adino.at Spamcheck ===
-=== srv272.adino.at Spamcheck done ===
 ```
 
 ## Syntax
@@ -48,7 +36,19 @@ adspam
 
 ```bash
 # Von der Connect aus abgesetzt.
-adspam
+USER@connect-lej ~ $ adspam
+=== Todays Spamcheck on Wed Apr 15 13:13:22 CEST 2026 === 
+ 
+=== srv244.adino.at Spamcheck === 
+✅ All systems green.
+=== srv251.adino.at Spamcheck === 
+✅ All systems green.
+=== srv252.adino.at Spamcheck === 
+✅ All systems green.
+=== srv268.adino.at Spamcheck === 
+✅ All systems green.
+=== srv272.adino.at Spamcheck === 
+✅ All systems green.
 ```
 
 ## Troubleshooting
diff --git a/wh20/donaspam/README.md b/wh20/donaspam/README.md
index 35f1dd9..b2dae3a 100644
--- a/wh20/donaspam/README.md
+++ b/wh20/donaspam/README.md
@@ -24,33 +24,6 @@ chmod +x donaspam
 
 ```bash
 USER1@connect-lej ~ $ donaspam
-=== Todays Spamcheck on Mo 13. Apr 14:02:58 CEST 2026 ===
-
-=== ws20.inname.net Spamcheck ===
-|=> Anzahl Spamhaus: 1
-=== ws20.inname.net Spamcheck done===
-=== ws21.inname.net Spamcheck ===
-=== ws21.inname.net Spamcheck done ===
-=== ws22.inname.net Spamcheck ===
-=== ws22.inname.net Spamcheck done ===
-=== ws23.inname.net Spamcheck ===
-=== ws23.inname.net Spamcheck done ===
-=== ws24.inname.net Spamcheck ===
-|=> Anzahl S775: 4
-=== ws24.inname.net Spamcheck done ===
-=== ws25.inname.net Spamcheck ===
-=== ws25.inname.net Spamcheck done ===
-=== ws26.inname.net Spamcheck ===
-=== ws26.inname.net Spamcheck done ===
-=== ws27.inname.net Spamcheck ===
-=== ws27.inname.net Spamcheck done ===
-=== ws28.inname.net Spamcheck ===
-|=> Anzahl S775: 5
-=== ws28.inname.net Spamcheck done ===
-=== ws29.inname.net Spamcheck ===
-=== ws29.inname.net Spamcheck done ===
-=== ws30.inname.net Spamcheck ===
-=== ws30.inname.net Spamcheck done ===
 ```
 
 ## Syntax
@@ -63,7 +36,31 @@ donaspam
 
 ```bash
 # Von der Connect aus abgesetzt.
-donaspam
+USER@connect-lej ~ $ donaspam
+=== Todays Spamcheck on Wed Apr 15 13:23:04 CEST 2026 === 
+ 
+=== ws20.inname.net Spamcheck === 
+✅ All systems green.
+=== ws21.inname.net Spamcheck === 
+✅ All systems green.
+=== ws22.inname.net Spamcheck === 
+✅ All systems green.
+=== ws23.inname.net Spamcheck === 
+✅ All systems green.
+=== ws24.inname.net Spamcheck === 
+✅ All systems green.
+=== ws25.inname.net Spamcheck === 
+✅ All systems green.
+=== ws26.inname.net Spamcheck === 
+❌ Anzahl S3150: 24
+=== ws27.inname.net Spamcheck === 
+✅ All systems green.
+=== ws28.inname.net Spamcheck === 
+❌ Anzahl S775: 5
+=== ws29.inname.net Spamcheck === 
+✅ All systems green.
+=== ws30.inname.net Spamcheck === 
+✅ All systems green.
 ```
 
 ## Troubleshooting
diff --git a/wh20/spamcheck/README.md b/wh20/spamcheck/README.md
index ef59fb5..9c38edf 100644
--- a/wh20/spamcheck/README.md
+++ b/wh20/spamcheck/README.md
@@ -18,18 +18,6 @@ tba.
 
 ```bash
 spamcheck
-Anzahl S3150: 0
-Anzahl S775: 0
-Anzahl S7771: 0
-Anzahl S7772: 0
-Anzahl S7773: 0
-Anzahl S7774: 0
-Anzahl S7775: 0
-Anzahl S7776: 0
-Anzahl S7777: 0
-Anzahl S7778: 0
-Anzahl S7779: 0
-Anzahl Spamhaus: 0
 ```
 
 ## Syntax
@@ -42,7 +30,13 @@ spamcheck
 
 ```bash
 # random Plesk-Server
-spamcheck
+eign01_easyname.at@ws25 ~ $ spamcheck
+=== ws25.inname.net Spamcheck === 
+✅ All systems green.
+
+eign01_easyname.at@ws26 ~ $ spamcheck
+=== ws26.inname.net Spamcheck === 
+❌ Anzahl S3150: 24
 ```
 
 ## Troubleshooting
diff --git a/wh20/spamcheck/spamcheck.sh b/wh20/spamcheck/spamcheck.sh
index 5948e6d..83e99c4 100644
--- a/wh20/spamcheck/spamcheck.sh
+++ b/wh20/spamcheck/spamcheck.sh
@@ -3,11 +3,18 @@
 # Maintainer: peignerpausz
 
 printf '=== %s Spamcheck === \n' "$(hostname)"
+found_errors=0
 for a in S3150 S775 S7771 S7772 S7773 S7774 S7775 S7776 S7777 S7778 S7779 Spamhaus
 do
     count=$(sudo grep -c "\($a\)" /var/log/maillog 2>/dev/null)
+    count=${count//$'\r'/}
+    count=${count//[^0-9]/}
+    count=${count:-0}
     if [ "$count" -gt 0 ]; then
-        printf "|=> Anzahl %s: %s\n" "$a" "$count"
+        printf "❌ Anzahl %s: %s\n" "$a" "$count"
+        found_errors=1
     fi
 done
-printf '=== %s Spamcheck done === \n' "$(hostname)"
\ No newline at end of file
+if [ "$found_errors" -eq 0 ]; then
+    printf "✅ All systems green.\n"
+fi
\ No newline at end of file