Merge branch 'no-escape-question-mark' into next

6 files changed, 8 insertions, 8 deletions

diff --git a/global-config.rsc b/global-config.rsc
index e82170c..7988ce3 100644
--- a/global-config.rsc
+++ b/global-config.rsc
@@ -207,7 +207,7 @@
 #:global ScriptUpdatesBaseUrl "https://gitlab.com/eworm-de/routeros-scripts/raw/next/";
 :global ScriptUpdatesUrlSuffix "";
 # use next branch with default url (git.eworm.de)
-#:global ScriptUpdatesUrlSuffix "\?h=next";
+#:global ScriptUpdatesUrlSuffix "?h=next";
 
 # Use this for defaults with $ScriptRunOnce
 # Install module with:
diff --git a/global-functions b/global-functions
index 366ef94..ce55b15 100644
--- a/global-functions
+++ b/global-functions
@@ -166,7 +166,7 @@
       /system/script/run global-config;
     } on-error={
       $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
-        " Syntax error or missing overlay\?") false;
+        " Syntax error or missing overlay?") false;
     }
   }
 
diff --git a/global-functions.rsc b/global-functions.rsc
index b8da30b..1f1cfa1 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -321,7 +321,7 @@
   }
 
   :local Return "";
-  :local Chars ("^.[]\$()|*+\?{}\\");
+  :local Chars ("^.[]\$()|*+?{}\\");
 
   :for I from=0 to=([ :len $Input ] - 1) do={
     :local Char [ :pick $Input $I ];
@@ -942,7 +942,7 @@
       /system/script/run global-config;
     } on-error={
       $LogPrintExit2 error $0 ("Reloading global configuration failed!" . \
-        " Syntax error or missing overlay\?") false;
+        " Syntax error or missing overlay?") false;
     }
   }
 
@@ -1251,7 +1251,7 @@
   }
 
   :local Return "";
-  :local Chars ("\n\r !\"#\$%&'()*+,:;<=>\?@[\\]^`{|}~");
+  :local Chars ("\n\r !\"#\$%&'()*+,:;<=>?@[\\]^`{|}~");
   :local Subs { "%0A"; "%0D"; "%20"; "%21"; "%22"; "%23"; "%24"; "%25"; "%26"; "%27";
          "%28"; "%29"; "%2A"; "%2B"; "%2C"; "%3A"; "%3B"; "%3C"; "%3D"; "%3E"; "%3F";
          "%40"; "%5B"; "%5C"; "%5D"; "%5E"; "%60"; "%7B"; "%7C"; "%7D"; "%7E" };
diff --git a/mod/notification-email.rsc b/mod/notification-email.rsc
index b1f3f7c..7be3abe 100644
--- a/mod/notification-email.rsc
+++ b/mod/notification-email.rsc
@@ -189,7 +189,7 @@
     :return $Input;
   }
 
-  :return ("=\?utf-8\?Q\?" . $Return . "\?=");
+  :return ("=?utf-8?Q?" . $Return . "?=");
 }
 
 # send notification via e-mail - expects at least two string arguments
diff --git a/mod/scriptrunonce.rsc b/mod/scriptrunonce.rsc
index 376e778..199d852 100644
--- a/mod/scriptrunonce.rsc
+++ b/mod/scriptrunonce.rsc
@@ -19,7 +19,7 @@
   :global ValidateSyntax;
 
   :foreach Script in=$Scripts do={
-    :if (!($Script ~ "^(ftp|https\?|sftp)://")) do={
+    :if (!($Script ~ "^(ftp|https?|sftp)://")) do={
       :if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={
         $LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true;
       }
diff --git a/update-tunnelbroker.rsc b/update-tunnelbroker.rsc
index d0a2d16..60cb003 100644
--- a/update-tunnelbroker.rsc
+++ b/update-tunnelbroker.rsc
@@ -33,7 +33,7 @@ $ScriptLock $0;
     :if ($Data = false) do={
       :do {
         :set Data ([ /tool/fetch check-certificate=yes-without-crl \
-          ("https://ipv4.tunnelbroker.net/nic/update\?hostname=" . $Comment->"id") \
+          ("https://ipv4.tunnelbroker.net/nic/update?hostname=" . $Comment->"id") \
           user=($Comment->"user") password=($Comment->"pass") output=user as-value ]->"data");
       } on-error={
         $LogPrintExit2 debug $0 ("Failed downloading, " . $I . " retries pending.") false;