mirror/eworm-de-routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2024-05-11 05:55:19 +00:00
Code Releases Activity

mod/notification-matrix: fix double escaping

Browse Source 
That was introduced with 2a232ad2f5 when
switching to :serialize...
This commit is contained in:
Christian Hesse
2024-04-18 08:43:41 +02:00
parent 8c1543a402
commit 3a36db6de8
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mod/notification-matrix.rsc
View File

@ -86,21 +86,15 @@
} }
:local Return ""; :local Return "";
:local Chars { :local Chars { "\""; "\n"; "&"; "<"; ">" };
"plain"={ "\\"; "\""; "\n" }; :local Subs { "&quot;"; "<br/>"; "&amp;"; "&lt;"; "&gt;" };
"format"={ "\\"; "\""; "\n"; "&"; "<"; ">" };
}
:local Subs {
"plain"={ "\\\\"; "\\\""; "\\n" };
"format"={ "\\\\"; "&quot;"; "<br/>"; "&amp;"; "&lt;"; "&gt;" };
}
:for I from=0 to=([ :len $Input ] - 1) do={ :for I from=0 to=([ :len $Input ] - 1) do={
:local Char [ :pick $Input $I ]; :local Char [ :pick $Input $I ];
:local Replace [ :find ($Chars->$2) $Char ]; :local Replace [ :find $Chars $Char ];
:if ([ :typeof $Replace ] = "num") do={ :if ([ :typeof $Replace ] = "num") do={
:set Char ($Subs->$2->$Replace); :set Char ($Subs->$Replace);
} }
:set Return ($Return . $Char); :set Return ($Return . $Char);
} }
@ -117,17 +111,17 @@
} }
:local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ] }); :local Headers ({ [ $FetchUserAgentStr ($Notification->"origin") ] });
:local Plain [ $PrepareText ("## [" . $IdentityExtra . $Identity . "] " . \ :local Plain ("## [" . $IdentityExtra . $Identity . "] " . \
($Notification->"subject") . "\n```\n" . ($Notification->"message") . "\n```") "plain" ]; ($Notification->"subject") . "\n```\n" . ($Notification->"message") . "\n```");
:local Formatted ("<h2>" . [ $PrepareText ("[" . $IdentityExtra . $Identity . "] " . \ :local Formatted ("<h2>" . [ $PrepareText ("[" . $IdentityExtra . $Identity . "] " . \
($Notification->"subject")) "format" ] . "</h2>" . "<pre><code>" . \ ($Notification->"subject")) ] . "</h2>" . "<pre><code>" . \
[ $PrepareText ($Notification->"message") "format" ] . "</code></pre>"); [ $PrepareText ($Notification->"message") ] . "</code></pre>");
:if ([ :len ($Notification->"link") ] > 0) do={ :if ([ :len ($Notification->"link") ] > 0) do={
:set Plain ($Plain . "\\n" . [ $SymbolForNotification "link" ] . \ :set Plain ($Plain . "\\n" . [ $SymbolForNotification "link" ] . \
[ $PrepareText ("[" . $Notification->"link" . "](" . $Notification->"link" . ")") "plain" ]); "[" . $Notification->"link" . "](" . $Notification->"link" . ")");
:set Formatted ($Formatted . "<br/>" . [ $SymbolForNotification "link" ] . \ :set Formatted ($Formatted . "<br/>" . [ $SymbolForNotification "link" ] . \
"<a href=\\\"" . [ $PrepareText ($Notification->"link") "format" ] . "\\\">" . \ "<a href=\"" . [ $PrepareText ($Notification->"link") ] . "\">" . \
[ $PrepareText ($Notification->"link") "format" ] . "</a>"); [ $PrepareText ($Notification->"link") ] . "</a>");
} }
:do { :do {