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

message: renamed from msg

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9540 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2015-10-19 17:22:14 +00:00
parent 10cbbe025f
commit dab1fd060b
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/contrib/97_msgConfig.pm → fhem/contrib/97_messageConfig.pm
View File

@ -1,7 +1,7 @@
# $Id$ # $Id$
############################################################################## ##############################################################################
# #
# 97_msgConfig.pm # 97_messageConfig.pm
# Global configuration settings for FHEM msg command. # Global configuration settings for FHEM msg command.
# #
# Copyright by Julian Pawlowski # Copyright by Julian Pawlowski
@ -36,16 +36,16 @@ package main;
use strict; use strict;
use warnings; use warnings;
sub msgConfig_Set($@); sub messageConfig_Set($@);
sub msgConfig_Define($$); sub messageConfig_Define($$);
sub msgConfig_Undefine($$); sub messageConfig_Undefine($$);
################################### ###################################
sub msgConfig_Initialize($) { sub messageConfig_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
$hash->{DefFn} = "msgConfig_Define"; $hash->{DefFn} = "messageConfig_Define";
$hash->{UndefFn} = "msgConfig_Undefine"; $hash->{UndefFn} = "messageConfig_Undefine";
# add attributes for configuration # add attributes for configuration
no warnings 'qw'; no warnings 'qw';
@ -127,13 +127,13 @@ sub msgConfig_Initialize($) {
} }
################################### ###################################
sub msgConfig_Define($$) { sub messageConfig_Define($$) {
my ( $hash, $def ) = @_; my ( $hash, $def ) = @_;
my @a = split( "[ \t]+", $def, 5 ); my @a = split( "[ \t]+", $def, 5 );
return "Usage: define <name> msgConfig" return "Usage: define <name> messageConfig"
if ( int(@a) < 2 ); if ( int(@a) < 2 );
my $name = $a[0]; my $name = $a[0];
@ -158,7 +158,7 @@ sub msgConfig_Define($$) {
} }
################################### ###################################
sub msgConfig_Undefine($$) { sub messageConfig_Undefine($$) {
my ( $hash, $name ) = @_; my ( $hash, $name ) = @_;
@ -172,19 +172,19 @@ sub msgConfig_Undefine($$) {
=begin html =begin html
<p> <p>
<a name="msgConfig" id="msgConfig"></a> <a name="messageConfig" id="messageConfig"></a>
</p> </p>
<h3> <h3>
msgConfig messageConfig
</h3> </h3>
<ul> <ul>
<li>Provides global settings to configure FHEM command 'msg'.<br> <li>Provides global settings to configure FHEM command 'msg'.<br>
<br> <br>
</li> </li>
<li> <li>
<a name="msgConfigdefine" id="msgConfigdefine"></a> <b>Define</b> <a name="messageConfigdefine" id="messageConfigdefine"></a> <b>Define</b>
<div style="margin-left: 2em"> <div style="margin-left: 2em">
<code>define &lt;name&gt; msgConfig</code><br> <code>define &lt;name&gt; messageConfig</code><br>
<br> <br>
Defines the global msg control device instance. Pleae note there can only be one unique definition of this device type. Defines the global msg control device instance. Pleae note there can only be one unique definition of this device type.
</div> </div>
@ -196,16 +196,16 @@ sub msgConfig_Undefine($$) {
=begin html_DE =begin html_DE
<p> <p>
<a name="msgConfig" id="msgConfig"></a> <a name="messageConfig" id="messageConfig"></a>
</p> </p>
<h3> <h3>
msgConfig messageConfig
</h3> </h3>
<div style="margin-left: 2em"> <div style="margin-left: 2em">
Eine deutsche Version der Dokumentation ist derzeit nicht vorhanden. Die englische Version ist hier zu finden: Eine deutsche Version der Dokumentation ist derzeit nicht vorhanden. Die englische Version ist hier zu finden:
</div> </div>
<div style="margin-left: 2em"> <div style="margin-left: 2em">
<a href='http://fhem.de/commandref.html#msgConfig'>msgConfig</a> <a href='http://fhem.de/commandref.html#messageConfig'>messageConfig</a>
</div> </div>
=end html_DE =end html_DE

40
fhem/contrib/98_msg.pm → fhem/contrib/98_message.pm
View File

@ -37,39 +37,39 @@ use strict;
use warnings; use warnings;
use Time::HiRes qw(time); use Time::HiRes qw(time);
use Data::Dumper; use Data::Dumper;
use msgSchema; use messageSchema;
no if $] >= 5.017011, warnings => 'experimental::smartmatch'; no if $] >= 5.017011, warnings => 'experimental::smartmatch';
sub CommandMsg($$;$$); sub CommandMessage($$;$$);
######################################## ########################################
sub msg_Initialize($$) { sub message_Initialize($$) {
my %hash = ( my %hash = (
Fn => "CommandMsg", Fn => "CommandMessage",
Hlp => Hlp =>
"[<type>] [<\@device>|<e-mail address>] [<priority>] [|<title>|] <message>", "[<type>] [<\@device>|<e-mail address>] [<priority>] [|<title>|] <message>",
); );
$cmds{msg} = \%hash; $cmds{message} = \%hash;
} }
######################################## ########################################
sub CommandMsg($$;$$) { sub CommandMessage($$;$$) {
my ( $cl, $msg, $testMode ) = @_; my ( $cl, $msg, $testMode ) = @_;
my $return = ""; my $return = "";
# find existing msgConfig device or create a new instance # find existing messageConfig device or create a new instance
my $globalDevName = ""; my $globalDevName = "";
if (defined ($defs{"msgConfig"})) { if (defined ($defs{"messageConfig"})) {
if ($defs{"msgConfig"}{TYPE} eq "msgConfig") { if ($defs{"messageConfig"}{TYPE} eq "messageConfig") {
$globalDevName = "msgConfig"; $globalDevName = "messageConfig";
} else { } else {
return "Device msgConfig has incorrect type - aborting..."; return "Device messageConfig has incorrect type - aborting...";
} }
} else { } else {
fhem "define msgConfig msgConfig"; fhem "define messageConfig messageConfig";
$globalDevName = "msgConfig"; $globalDevName = "messageConfig";
$return .= "Global configuration device msgConfig was created.\n\n"; $return .= "Global configuration device messageConfig was created.\n\n";
} }
if ( $msg eq "" || $msg =~ /^\?[\s\t]*$/ || $msg eq "help" ) { if ( $msg eq "" || $msg =~ /^\?[\s\t]*$/ || $msg eq "help" ) {
@ -79,7 +79,7 @@ $return .
} }
# default settings # default settings
my $cmdSchema = msgSchema::get(); my $cmdSchema = messageSchema::get();
my $settings = { my $settings = {
'audio' => { 'audio' => {
'typeEscalation' => { 'typeEscalation' => {
@ -745,7 +745,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
$routes{screen} = 1 $routes{screen} = 1
if ( if (
$deviceType eq "device" $deviceType eq "device"
&& CommandMsg( "screen", && CommandMessage( "screen",
"screen \@$device $priority Routing Test", 1 ) "screen \@$device $priority Routing Test", 1 )
eq "ROUTE_AVAILABLE" eq "ROUTE_AVAILABLE"
); );
@ -753,7 +753,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
$routes{light} = 1 $routes{light} = 1
if ( if (
$deviceType eq "device" $deviceType eq "device"
&& CommandMsg( "light", && CommandMessage( "light",
"light \@$device $priority Routing Test", 1 ) "light \@$device $priority Routing Test", 1 )
eq "ROUTE_AVAILABLE" eq "ROUTE_AVAILABLE"
); );
@ -761,14 +761,14 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
$routes{audio} = 1 $routes{audio} = 1
if ( if (
$deviceType eq "device" $deviceType eq "device"
&& CommandMsg( "audio", && CommandMessage( "audio",
"audio \@$device $priority Routing Test", 1 ) "audio \@$device $priority Routing Test", 1 )
eq "ROUTE_AVAILABLE" eq "ROUTE_AVAILABLE"
); );
if ( if (
$deviceType eq "device" $deviceType eq "device"
&& CommandMsg( "push", && CommandMessage( "push",
"push \@$device $priority Routing Test", 1 ) eq "push \@$device $priority Routing Test", 1 ) eq
"ROUTE_AVAILABLE" "ROUTE_AVAILABLE"
) )
@ -778,7 +778,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+//
} }
if ( if (
CommandMsg( "mail", CommandMessage( "mail",
"mail \@$device $priority Routing Test", 1 ) eq "mail \@$device $priority Routing Test", 1 ) eq
"ROUTE_AVAILABLE" "ROUTE_AVAILABLE"
) )

4
fhem/contrib/msgSchema.pm → fhem/contrib/messageSchema.pm
View File

@ -1,7 +1,7 @@
# $Id$ # $Id$
############################################################################## ##############################################################################
# #
# msgSchema.pm # messageSchema.pm
# Schema database for FHEM modules and their messaging options. # Schema database for FHEM modules and their messaging options.
# These commands are being used as default setting for FHEM command 'msg' # These commands are being used as default setting for FHEM command 'msg'
# unless there is an explicit msgCmd* attribute. # unless there is an explicit msgCmd* attribute.
@ -28,7 +28,7 @@
# #
############################################################################## ##############################################################################
package msgSchema; package messageSchema;
use strict; use strict;
use warnings; use warnings;