FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

50_TelegramBot: parsemode corrected for multiple lines - msg1041326

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21652 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
viegener 2020-04-12 19:42:14 +00:00
parent 09b64d5e8d
commit dbd119bbb6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 50_TelegramBot: parsemode corrected for multiple lines - msg1041326
- change: 37_echodevice.pm more loginformations set "NPM_login new" - change: 37_echodevice.pm more loginformations set "NPM_login new"
- change: 93_Log2Syslog: new reading 'Parse_Err_LastData', minor changes - change: 93_Log2Syslog: new reading 'Parse_Err_LastData', minor changes
- change: 93_Log2Syslog: some code changes and reviews - change: 93_Log2Syslog: some code changes and reviews

7
fhem/FHEM/50_TelegramBot.pm
View File

@ -169,6 +169,9 @@
# Corrected Eol # Corrected Eol
# 2.9 2019-05-23 allow \s, addtl silenCmds, fixes # 2.9 2019-05-23 allow \s, addtl silenCmds, fixes
# FIX: correct parsemodesend for inMsg with multiple lines - msg1041326
#
#
# #
############################################################################## ##############################################################################
# TASKS # TASKS
@ -1778,10 +1781,10 @@ sub TelegramBot_SendIt($$$$$;$$$)
$parseMode = "HTML"; $parseMode = "HTML";
} elsif ( $parseMode == 3 ) { } elsif ( $parseMode == 3 ) {
$parseMode = 0; $parseMode = 0;
if ( $msg =~ /^markdown(.*)$/i ) { if ( $msg =~ /^markdown(.*)$/is ) {
$msg = $1; $msg = $1;
$parseMode = "Markdown"; $parseMode = "Markdown";
} elsif ( $msg =~ /^HTML(.*)$/i ) { } elsif ( $msg =~ /^HTML(.*)$/is ) {
$msg = $1; $msg = $1;
$parseMode = "HTML"; $parseMode = "HTML";
} }