From dab1fd060bab73c93b8c9d3ae12c5b59c2365316 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 19 Oct 2015 17:22:14 +0000 Subject: [PATCH] message: renamed from msg git-svn-id: https://svn.fhem.de/fhem/trunk@9540 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- .../{97_msgConfig.pm => 97_messageConfig.pm} | 34 ++++++++-------- fhem/contrib/{98_msg.pm => 98_message.pm} | 40 +++++++++---------- .../{msgSchema.pm => messageSchema.pm} | 4 +- 3 files changed, 39 insertions(+), 39 deletions(-) rename fhem/contrib/{97_msgConfig.pm => 97_messageConfig.pm} (86%) rename fhem/contrib/{98_msg.pm => 98_message.pm} (99%) rename fhem/contrib/{msgSchema.pm => messageSchema.pm} (99%) diff --git a/fhem/contrib/97_msgConfig.pm b/fhem/contrib/97_messageConfig.pm similarity index 86% rename from fhem/contrib/97_msgConfig.pm rename to fhem/contrib/97_messageConfig.pm index 9e74a7d74..f03c165a5 100755 --- a/fhem/contrib/97_msgConfig.pm +++ b/fhem/contrib/97_messageConfig.pm @@ -1,7 +1,7 @@ # $Id$ ############################################################################## # -# 97_msgConfig.pm +# 97_messageConfig.pm # Global configuration settings for FHEM msg command. # # Copyright by Julian Pawlowski @@ -36,16 +36,16 @@ package main; use strict; use warnings; -sub msgConfig_Set($@); -sub msgConfig_Define($$); -sub msgConfig_Undefine($$); +sub messageConfig_Set($@); +sub messageConfig_Define($$); +sub messageConfig_Undefine($$); ################################### -sub msgConfig_Initialize($) { +sub messageConfig_Initialize($) { my ($hash) = @_; - $hash->{DefFn} = "msgConfig_Define"; - $hash->{UndefFn} = "msgConfig_Undefine"; + $hash->{DefFn} = "messageConfig_Define"; + $hash->{UndefFn} = "messageConfig_Undefine"; # add attributes for configuration no warnings 'qw'; @@ -127,13 +127,13 @@ sub msgConfig_Initialize($) { } ################################### -sub msgConfig_Define($$) { +sub messageConfig_Define($$) { my ( $hash, $def ) = @_; my @a = split( "[ \t]+", $def, 5 ); - return "Usage: define msgConfig" + return "Usage: define messageConfig" if ( int(@a) < 2 ); my $name = $a[0]; @@ -158,7 +158,7 @@ sub msgConfig_Define($$) { } ################################### -sub msgConfig_Undefine($$) { +sub messageConfig_Undefine($$) { my ( $hash, $name ) = @_; @@ -172,19 +172,19 @@ sub msgConfig_Undefine($$) { =begin html

- +

- msgConfig + messageConfig

  • Provides global settings to configure FHEM command 'msg'.

  • - Define + Define
    - define <name> msgConfig
    + define <name> messageConfig

    Defines the global msg control device instance. Pleae note there can only be one unique definition of this device type.
    @@ -196,16 +196,16 @@ sub msgConfig_Undefine($$) { =begin html_DE

    - +

    - msgConfig + messageConfig

    Eine deutsche Version der Dokumentation ist derzeit nicht vorhanden. Die englische Version ist hier zu finden:
    =end html_DE diff --git a/fhem/contrib/98_msg.pm b/fhem/contrib/98_message.pm similarity index 99% rename from fhem/contrib/98_msg.pm rename to fhem/contrib/98_message.pm index c98c17081..59463400c 100755 --- a/fhem/contrib/98_msg.pm +++ b/fhem/contrib/98_message.pm @@ -37,39 +37,39 @@ use strict; use warnings; use Time::HiRes qw(time); use Data::Dumper; -use msgSchema; +use messageSchema; no if $] >= 5.017011, warnings => 'experimental::smartmatch'; -sub CommandMsg($$;$$); +sub CommandMessage($$;$$); ######################################## -sub msg_Initialize($$) { +sub message_Initialize($$) { my %hash = ( - Fn => "CommandMsg", + Fn => "CommandMessage", Hlp => "[] [<\@device>|] [] [||] <message>", ); - $cmds{msg} = \%hash; + $cmds{message} = \%hash; } ######################################## -sub CommandMsg($$;$$) { +sub CommandMessage($$;$$) { my ( $cl, $msg, $testMode ) = @_; my $return = ""; - # find existing msgConfig device or create a new instance + # find existing messageConfig device or create a new instance my $globalDevName = ""; - if (defined ($defs{"msgConfig"})) { - if ($defs{"msgConfig"}{TYPE} eq "msgConfig") { - $globalDevName = "msgConfig"; + if (defined ($defs{"messageConfig"})) { + if ($defs{"messageConfig"}{TYPE} eq "messageConfig") { + $globalDevName = "messageConfig"; } else { - return "Device msgConfig has incorrect type - aborting..."; + return "Device messageConfig has incorrect type - aborting..."; } } else { - fhem "define msgConfig msgConfig"; - $globalDevName = "msgConfig"; - $return .= "Global configuration device msgConfig was created.\n\n"; + fhem "define messageConfig messageConfig"; + $globalDevName = "messageConfig"; + $return .= "Global configuration device messageConfig was created.\n\n"; } if ( $msg eq "" || $msg =~ /^\?[\s\t]*$/ || $msg eq "help" ) { @@ -79,7 +79,7 @@ $return . } # default settings - my $cmdSchema = msgSchema::get(); + my $cmdSchema = messageSchema::get(); my $settings = { 'audio' => { 'typeEscalation' => { @@ -745,7 +745,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// $routes{screen} = 1 if ( $deviceType eq "device" - && CommandMsg( "screen", + && CommandMessage( "screen", "screen \@$device $priority Routing Test", 1 ) eq "ROUTE_AVAILABLE" ); @@ -753,7 +753,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// $routes{light} = 1 if ( $deviceType eq "device" - && CommandMsg( "light", + && CommandMessage( "light", "light \@$device $priority Routing Test", 1 ) eq "ROUTE_AVAILABLE" ); @@ -761,14 +761,14 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// $routes{audio} = 1 if ( $deviceType eq "device" - && CommandMsg( "audio", + && CommandMessage( "audio", "audio \@$device $priority Routing Test", 1 ) eq "ROUTE_AVAILABLE" ); if ( $deviceType eq "device" - && CommandMsg( "push", + && CommandMessage( "push", "push \@$device $priority Routing Test", 1 ) eq "ROUTE_AVAILABLE" ) @@ -778,7 +778,7 @@ s/^[\s\t]*\|([\w\süöäß^°!"§$%&\/\\()<>=?´`"+\[\]#*@€]+)\|[\s\t]+// } if ( - CommandMsg( "mail", + CommandMessage( "mail", "mail \@$device $priority Routing Test", 1 ) eq "ROUTE_AVAILABLE" ) diff --git a/fhem/contrib/msgSchema.pm b/fhem/contrib/messageSchema.pm similarity index 99% rename from fhem/contrib/msgSchema.pm rename to fhem/contrib/messageSchema.pm index 6a19030e4..ad16c716e 100755 --- a/fhem/contrib/msgSchema.pm +++ b/fhem/contrib/messageSchema.pm @@ -1,7 +1,7 @@ # $Id$ ############################################################################## # -# msgSchema.pm +# messageSchema.pm # Schema database for FHEM modules and their messaging options. # These commands are being used as default setting for FHEM command 'msg' # unless there is an explicit msgCmd* attribute. @@ -28,7 +28,7 @@ # ############################################################################## -package msgSchema; +package messageSchema; use strict; use warnings;