FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

75_MSG.pm: add line break support (forum #39983.375)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15222 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-10-10 06:47:28 +00:00
parent 256ad87e34
commit 0e4273f1ef
1 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
fhem/FHEM/75_MSG.pm
View File

@ -1,28 +1,5 @@
###############################################################################
# $Id$
##############################################################################
#
# 75_MSG.pm
# Dynamic message and notification routing for FHEM
#
# Copyright by Julian Pawlowski
# e-mail: julian.pawlowski at gmail.com
#
# This file is part of fhem.
#
# Fhem is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# Fhem is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with fhem. If not, see <http://www.gnu.org/licenses/>.
#
##############################################################################
#
#TODO
# - be able to use type "default" to let read from attr
@ -40,17 +17,17 @@
# - delivery options as attributes (like ! or ? to gateways, devices or types)
# - all messages should be queued and then delivered so a timer may come back
# and check the gateway device for successful delivery
# - fix readings: store texts with \x{0000} notation
# - end user documentation / commandref !!
#
package main;
use strict;
use warnings;
use Time::HiRes qw(time);
use Data::Dumper;
use Time::HiRes qw(time);
use utf8;
sub CommandMsg($$;$$);
########################################
# initialize ##################################################################
sub MSG_Initialize($$) {
my %hash = (
Fn => "CommandMsg",
@ -62,7 +39,8 @@ sub MSG_Initialize($$) {
require "$attr{global}{modpath}/FHEM/msgSchema.pm";
}
########################################
# regular Fn ##################################################################
sub CommandMsg($$;$$);
sub CommandMsg($$;$$) {
my ( $cl, $msg, $testMode ) = @_;
my $return = "";
@ -133,7 +111,7 @@ sub CommandMsg($$;$$) {
### extract message details
###
my ( $msgA, $params ) = parseParams($msg);
my ( $msgA, $params ) = parseParams($msg, "[^\\S\\n]", " ");
# only use output from parseParams when
# parameters where found