From f1bc8b9af5d26662e6df3135edd36a9ed9d84405 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 15 Nov 2013 07:13:26 +0000
Subject: [PATCH] FHEMWEB on/off logic should support the :noArg specifier in
 the help

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4222 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index 99d497391..b1fd650a0 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -138,9 +138,9 @@ FHEMWEB_Initialize($)
     refresh
     reverseLogs:0,1
     roomIcons
-    smallscreen:deprecated
+    smallscreen:unused
     stylesheetPrefix
-    touchpad:deprecated
+    touchpad:unused
     webname
   );
   use warnings 'qw';
@@ -2030,8 +2030,8 @@ FW_devState($$@)
   my $state = $defs{$d}{STATE};
   $state = "" if(!defined($state));
 
-  $hasOnOff = ($allSets =~ m/(^| )on( |$)/ &&
-               $allSets =~ m/(^| )off( |$)/);
+  $hasOnOff = ($allSets =~ m/(^| )on(:[^ ]*)?( |$)/ &&
+               $allSets =~ m/(^| )off(:[^ ]*)?( |$)/);
   my $txt = $state;
   if(defined(AttrVal($d, "showtime", undef))) {
     my $v = $defs{$d}{READINGS}{state}{TIME};