From 5a3a3a9ed9def12fc12367ca3f376b4396242fb1 Mon Sep 17 00:00:00 2001
From: loredo <loredo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 5 Jun 2016 12:56:14 +0000
Subject: [PATCH] 75_MSG,75_msgConfig: fix warnings

git-svn-id: https://svn.fhem.de/fhem/trunk@11617 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/75_MSG.pm       |  5 +++--
 fhem/FHEM/75_msgConfig.pm | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fhem/FHEM/75_MSG.pm b/fhem/FHEM/75_MSG.pm
index 2c4cfa2e8..81ace15cc 100755
--- a/fhem/FHEM/75_MSG.pm
+++ b/fhem/FHEM/75_MSG.pm
@@ -37,7 +37,6 @@ use strict;
 use warnings;
 use Time::HiRes qw(time);
 use Data::Dumper;
-use msgSchema;
 
 no if $] >= 5.017011, warnings => 'experimental::smartmatch';
 no if $] >= 5.017011, warnings => 'experimental::lexical_topic';
@@ -52,6 +51,8 @@ sub MSG_Initialize($$) {
 "[<type>] [<\@device>|<e-mail address>] [<priority>] [|<title>|] <message-text>",
     );
     $cmds{msg} = \%hash;
+
+    require "$attr{global}{modpath}/FHEM/msgSchema.pm";
 }
 
 ########################################
@@ -167,7 +168,7 @@ s/^[\s\t]*([!]?(([A-Za-z0-9%+._-])*@([%+a-z0-9A-Z.-]+))[\w,@.!|:]*)[\s\t]+//
         };
         if ( !$@ ) {
             eval '$advanced = decode_json( Encode::encode_utf8($1) ); 1';
-            if (!$@) {
+            if ( !$@ ) {
                 Log3 $globalDevName, 5,
                   "msg: Decoded advanced options\n" . Dumper($advanced);
             }
diff --git a/fhem/FHEM/75_msgConfig.pm b/fhem/FHEM/75_msgConfig.pm
index 1d054af0b..5fdd6ce99 100755
--- a/fhem/FHEM/75_msgConfig.pm
+++ b/fhem/FHEM/75_msgConfig.pm
@@ -36,7 +36,9 @@ package main;
 use strict;
 use warnings;
 use Data::Dumper;
-use msgSchema;
+
+no if $] >= 5.017011, warnings => 'experimental::smartmatch';
+no if $] >= 5.017011, warnings => 'experimental::lexical_topic';
 
 sub msgConfig_Set($@);
 sub msgConfig_Get($@);
@@ -47,6 +49,8 @@ sub msgConfig_Undefine($$);
 sub msgConfig_Initialize($) {
     my ($hash) = @_;
 
+    require "$attr{global}{modpath}/FHEM/msgSchema.pm";
+
     $hash->{DefFn}   = "msgConfig_Define";
     $hash->{SetFn}   = "msgConfig_Set";
     $hash->{GetFn}   = "msgConfig_Get";
@@ -115,7 +119,6 @@ sub msgConfig_Initialize($) {
       msgTitleTextHigh
       msgTitleTextLow
       msgType
-
     );
     use warnings 'qw';
     $hash->{AttrList} = join( " ", @attrList ) . " " . $readingFnAttributes;
@@ -520,7 +523,7 @@ sub msgConfig_Get($@) {
             if ( defined( $cmdSchema->{$msgType} ) ) {
 
                 my $deviceTypes = $devicesReq;
-                $deviceTypes = join( ',', keys $cmdSchema->{$msgType} )
+                $deviceTypes = join( ',', keys %{ $cmdSchema->{$msgType} } )
                   if ( $deviceTypes eq "" || $devicesReq eq $name );
                 $deviceTypes = $UserDeviceTypes
                   if ( $UserDeviceTypes ne "" );
@@ -558,8 +561,11 @@ sub msgConfig_Get($@) {
                                 $return .= "      Default Values:\n";
 
                                 foreach my $key (
-                                    keys $cmdSchema->{$msgType}{$deviceType}
-                                    {defaultValues}{$prio} )
+                                    keys %{
+                                        $cmdSchema->{$msgType}{$deviceType}
+                                          {defaultValues}{$prio}
+                                    }
+                                  )
                                 {
                                     if ( $cmdSchema->{$msgType}{$deviceType}
                                         {defaultValues}{$prio}{$key} ne "" )