10 files changed, 16 insertions, 13 deletions
diff --git a/mod/bridge-port-to.rsc b/mod/bridge-port-to.rsc
index 9e7b911..ec6f612 100644
--- a/mod/bridge-port-to.rsc
+++ b/mod/bridge-port-to.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/bridge-port-to
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/bridge-port-vlan.rsc b/mod/bridge-port-vlan.rsc
index 18fa2db..6221646 100644
--- a/mod/bridge-port-vlan.rsc
+++ b/mod/bridge-port-vlan.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/bridge-port-vlan
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/inspectvar.rsc b/mod/inspectvar.rsc
index 0209214..01724bb 100644
--- a/mod/inspectvar.rsc
+++ b/mod/inspectvar.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/inspectvar
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/ipcalc.rsc b/mod/ipcalc.rsc
index 021cd30..69dec8b 100644
--- a/mod/ipcalc.rsc
+++ b/mod/ipcalc.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/ipcalc
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index a3291d9..6d700f5 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/notification-email
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/notification-matrix.rsc b/mod/notification-matrix.rsc
index 14f369d..aad8b42 100644
--- a/mod/notification-matrix.rsc
+++ b/mod/notification-matrix.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/notification-matrix
-# Copyright (c) 2013-2024 Michael Gisbers <michael@gisbers.de>
+# Copyright (c) 2013-2025 Michael Gisbers <michael@gisbers.de>
 #                         Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
diff --git a/mod/notification-ntfy.rsc b/mod/notification-ntfy.rsc
index 7e4eaf0..53ba9b4 100644
--- a/mod/notification-ntfy.rsc
+++ b/mod/notification-ntfy.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/notification-ntfy
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
@@ -39,7 +39,7 @@
       :do {
         /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
           http-header-field=($Message->"headers") http-data=($Message->"text") \
-          ($Message->"url") user=($Message->"user") password=($Message->"pass") as-value;
+          ($Message->"url") as-value;
         :set ($NtfyQueue->$Id);
       } on-error={
         $LogPrint debug $0 ("Sending queued Ntfy message failed.");
@@ -96,6 +96,9 @@
   :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ]; \
     ("Priority: " . [ $IfThenElse ($Notification->"silent") "low" "default" ]); \
     ("Title: " . "[" . $IdentityExtra . $Identity . "] " . ($Notification->"subject")) });
+  :if ([ :len $User ] > 0 || [ :len $Pass ] > 0) do={
+    :set Headers ($Headers, ("Authorization: Basic " . [ :convert to=base64 ($User . ":" . $Pass) ]));
+  }
   :if ([ :len $Token ] > 0) do={
     :set Headers ($Headers, ("Authorization: Bearer " . $Token));
   }
@@ -112,7 +115,7 @@
       }
     }
     /tool/fetch check-certificate=yes-without-crl output=none http-method=post \
-      http-header-field=$Headers http-data=$Text $Url user=$User password=$Pass as-value;
+      http-header-field=$Headers http-data=$Text $Url as-value;
   } on-error={
     $LogPrint info $0 ("Failed sending ntfy notification! Queuing...");
 
@@ -123,7 +126,7 @@
       "This message was queued since " . [ /system/clock/get date ] . " " . \
       [ /system/clock/get time ] . " and may be obsolete.");
     :set ($NtfyQueue->[ :len $NtfyQueue ]) \
-      { url=$Url; user=$User; pass=$Pass; headers=$Headers; text=$Text };
+      { url=$Url; headers=$Headers; text=$Text };
     :if ([ :len [ /system/scheduler/find where name="_FlushNtfyQueue" ] ] = 0) do={
       /system/scheduler/add name="_FlushNtfyQueue" interval=1m start-time=startup \
         on-event=(":global FlushNtfyQueue; \$FlushNtfyQueue;");
diff --git a/mod/notification-telegram.rsc b/mod/notification-telegram.rsc
index 7d75b8b..f9700cf 100644
--- a/mod/notification-telegram.rsc
+++ b/mod/notification-telegram.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/notification-telegram
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index c8dcf26..7e01e72 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/scriptrunonece
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.14
diff --git a/mod/ssh-keys-import.rsc b/mod/ssh-keys-import.rsc
index 583e827..ad3a81e 100644
--- a/mod/ssh-keys-import.rsc
+++ b/mod/ssh-keys-import.rsc
@@ -1,6 +1,6 @@
 #!rsc by RouterOS
 # RouterOS script: mod/ssh-keys-import
-# Copyright (c) 2020-2024 Christian Hesse <mail@eworm.de>
+# Copyright (c) 2020-2025 Christian Hesse <mail@eworm.de>
 # https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
 #
 # requires RouterOS, version=7.16