From dcc1be799d0e9c3bcff65fdc77b5a7e654f447d8 Mon Sep 17 00:00:00 2001
From: phenning <>
Date: Sat, 2 Dec 2017 18:52:31 +0000
Subject: [PATCH] 95_YAAHM.pm: Neue Version 1.3 mit neuen Features

git-svn-id: https://svn.fhem.de/fhem/trunk@15543 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/95_YAAHM.pm  | 11 ++++++-----
 fhem/www/pgm2/yaahm.js |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fhem/FHEM/95_YAAHM.pm b/fhem/FHEM/95_YAAHM.pm
index e52204a1e..353650494 100644
--- a/fhem/FHEM/95_YAAHM.pm
+++ b/fhem/FHEM/95_YAAHM.pm
@@ -50,7 +50,7 @@ my $yaahmname;
 my $yaahmlinkname   = "Profile";     # link text
 my $yaahmhiddenroom = "ProfileRoom"; # hidden room
 my $yaahmpublicroom = "Unsorted";    # public room
-my $yaahmversion    = "1.21";
+my $yaahmversion    = "1.30";
 my $firstcall       = 1;
     
 my %yaahm_transtable_EN = ( 
@@ -1838,8 +1838,7 @@ sub YAAHM_sayWeeklyTime($$$) {
     if( ($ton =~ /(\d?\d):(\d\d)(:(\d\d))?/) && ($tom ne $ton) ){
       $hw = $1*1;
       $mw = $2*1;
-      $pt = sprintf("%d:%02d",$hw,$mw)." ".lc($yaahm_tt->{"today"});
-      
+      $pt = sprintf("%d:%02d",$hw,$mw)." ".lc($yaahm_tt->{"tomorrow"});    
       $msg .= " ".lc($yaahm_tt->{"tomorrow"})." ".$yaahm_tt->{"exceptly"}." $hw ".$yaahm_tt->{"clock"};
       $msg .=" $mw"
        if( $mw != 0 );
@@ -1854,7 +1853,7 @@ sub YAAHM_sayWeeklyTime($$$) {
       $pt   = "off ".lc($yaahm_tt->{"today"})." ".$yaahm_tt->{"and"}." ".lc($yaahm_tt->{"tomorrow"});
       $msg .= " ".lc($yaahm_tt->{"today"})." ".$yaahm_tt->{"and"}." ".lc($yaahm_tt->{"tomorrow"})." ".$yaahm_tt->{"swoff"};
     }else{
-      $pt  = $yaahm_tt->{"undecid"};
+      $pt  = $yaahm_tt->{"undecid"}; 
       $msg .= " ".$yaahm_tt->{"undecid"};
     }
   #-- today nontrivial => compare this time with current time
@@ -2873,7 +2872,9 @@ sub YAAHM_timewidget($){
   my $name = $FW_webArgs{name};
   $name    =~ s/'//g;
   
-  my @size=split('x',($FW_webArgs{size} ? $FW_webArgs{size} : '400x400'));
+  my $sz = ($FW_webArgs{size} ? $FW_webArgs{size} : '400x400');
+  $sz    =~ s/'//g;
+  my @size=split('x',$sz);
   
   $FW_RETTYPE = "image/svg+xml";
   $FW_RET="";
diff --git a/fhem/www/pgm2/yaahm.js b/fhem/www/pgm2/yaahm.js
index c55658178..58682e45a 100644
--- a/fhem/www/pgm2/yaahm.js
+++ b/fhem/www/pgm2/yaahm.js
@@ -1,6 +1,6 @@
 //########################################################################################
 // yaahm.js
-// Version 1.14
+// Version 1.30
 // See 95_YAAHM for licensing
 //########################################################################################
 //# Prof. Dr. Peter A. Henning