From 1103fb9820e14b71ae526d2f9943c087478e5b6b Mon Sep 17 00:00:00 2001
From: loredo <loredo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 1 Dec 2015 13:54:55 +0000
Subject: [PATCH] 70_Pushover.pm: more convenient new line usage

git-svn-id: https://svn.fhem.de/fhem/trunk@10062 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/70_Pushover.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/70_Pushover.pm b/fhem/FHEM/70_Pushover.pm
index 49aef2b8c..dfe37e93f 100644
--- a/fhem/FHEM/70_Pushover.pm
+++ b/fhem/FHEM/70_Pushover.pm
@@ -771,21 +771,23 @@ sub Pushover_SetMessage {
         my $body = "title=" . urlEncode( $values{title} );
 
         if ( $values{message} =~
-            /\<(\/|)[biu]\>|\<(\/|)font(.+)\>|\<(\/|)a(.*)\>/
+            /\<(\/|)[biu]\>|\<(\/|)font(.+)\>|\<(\/|)a(.*)\>|\<br\s?\/?\>/
             && $values{message} !~ /^nohtml:.*/ )
         {
             Log3 $name, 4, "Pushover $name: handling message with HTML content";
             $body = $body . "&html=1";
+            $values{message} =~ s/(?<!\\)(\\n)/<br \/>/g; # replace \n by <br /> but ignore \\n
         }
 
-        if ( $values{message} =~ /^nohtml:.*/ ) {
+        elsif ( $values{message} =~ /^nohtml:.*/ ) {
             Log3 $name, 4,
               "Pushover $name: explicitly ignoring HTML tags in message";
             $values{message} =~ s/^(nohtml:).*//;
         }
-        $values{message} = urlEncode( $values{message} );
+
+        $values{message} = urlEncode( $values{message} ); # HttpUtil's urlEncode() does not handle \n but would escape % so we encode first
         $values{message} =~ s/(?<!%5c)(%5cn)/%0a/g; # replace any URL-encoded \n with their hex equivalent but ignore \\n
-        $values{message} =~ s/%5c%5cn/%5cn/g; # replace any URL-encoded \\n with \n
+        $values{message} =~ s/%5c%5cn/%5cn/g; # replace any URL-encoded \\n by \n
         $body = $body . "&message=" . $values{message};
 
         if ( $values{device} ne "" ) {