From 71e43a64d4b166cc278ef192d38338e6b190e79c Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Thu, 5 Jul 2012 07:11:04 +0000
Subject: [PATCH] eventMap values added to getAllSets, up to the ones with
 space

git-svn-id: https://svn.fhem.de/fhem/trunk@1685 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED              | 2 +-
 fhem/examples/sample_fhem | 4 +++-
 fhem/examples/sample_pgm2 | 4 +++-
 fhem/fhem.pl              | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index d3f8d7101..8d9666c66 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -52,7 +52,7 @@
   - feature: motd with SecurityCheck added
   - feature: telnet module added, attr global port moved. allowfrom changed.
   - feature: FhemUtils/release.pm for the new update process added. (M. Fischer)
-  - feature: new global attributes <updateserver>, <updatepath>, <updatectrlfile>
+  - feature: new global attributes updateserver, updatepath, updatectrlfile
              for the new update process added (M. Fischer)
 
 - 2011-12-31 (5.2)
diff --git a/fhem/examples/sample_fhem b/fhem/examples/sample_fhem
index 1db3333ab..485248e46 100644
--- a/fhem/examples/sample_fhem
+++ b/fhem/examples/sample_fhem
@@ -4,5 +4,7 @@
 attr global logfile /tmp/fhem-%Y-%m.log
 attr global statefile /tmp/fhem.save   # where to save the state of the devices
 attr global verbose 3                  # "normal" verbosity (min 1, max 5)
-attr global port 7072                  # our TCP/IP port (localhost only)
 attr global modpath .                  # where our FHEM directory is
+
+define telnetPort telnet 7072          # our TCP/IP port (localhost only)
+attr telnetPort password secret
diff --git a/fhem/examples/sample_pgm2 b/fhem/examples/sample_pgm2
index 2eee04d85..c8fe8535f 100644
--- a/fhem/examples/sample_pgm2
+++ b/fhem/examples/sample_pgm2
@@ -3,10 +3,11 @@
 #
 attr global logfile /tmp/fhem-%Y-%m.log
 attr global modpath .                  # where our FHEM directory is
-attr global port 7072 global           # our TCP/IP port
 attr global statefile /tmp/fhem.save   # where to save the state of the devices
 attr global verbose 3                  # "normal" verbosity (min 1, max 5)
 
+define telnetPort telnet 7072 global   # our TCP/IP port
+
 define WEB FHEMWEB 8083 global
 
 define WEBphone FHEMWEB 8084 global
@@ -24,6 +25,7 @@ attr autocreate device_room %TYPE
 attr autocreate filelog /tmp/%NAME-%Y.log
 attr autocreate weblink
 attr autocreate weblink_room Plots
+
 # Disable this to avoid looking for new USB devices on startup
 define initialUsbCheck notify global:INITIALIZED usb create 
 
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index af7888e76..e6ed3bb2e 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -1579,7 +1579,9 @@ getAllSets($)
 
   my $em = AttrVal($d, "eventMap", undef);
   if($em) {
-    $em = join(" ", map { $_ =~ s/.*://s; $_ } EventMapAsList($em));
+    $em = join(" ", map { $_ =~ s/.*://s; $_ } 
+                    grep { !/ / }
+                    EventMapAsList($em));
     $a2 = "$em $a2";
   }
   return $a2;