FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

57_SSCal: contrib 1.9.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21186 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-02-12 21:12:47 +00:00
parent 4520de424a
commit 6a6a4c42fa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/contrib/DS_Starter/57_SSCal.pm
View File

@ -329,7 +329,6 @@ sub SSCal_Attr($$$$) {
# aName and aVal are Attribute name and value
if ($cmd eq "set") {
my $attrVal = $aVal;
if ($aName =~ /filterCompleteTask|filterDueTask/ && $model ne "Tasks") {
return " The attribute \"$aName\" is only valid for devices of MODEL \"Tasks\"! Please set this attribute in a device of this model.";
@ -339,6 +338,12 @@ sub SSCal_Attr($$$$) {
return " The attribute \"$aName\" is only valid for devices of MODEL \"Diary\"! Please set this attribute in a device of this model.";
}
if ($aName =~ /tableSpecs/) {
return " The attribute \"$aName\" has wrong syntax. The value must be set into \"{ }\". " if($aVal !~ m/^\s*\{.*\}\s*$/s);
}
my $attrVal = $aVal;
if ($attrVal =~ m/^\{.*\}$/s && $attrVal =~ m/=>/) {
$attrVal =~ s/\@/\\\@/g;
$attrVal =~ s/\$/\\\$/g;
@ -3307,6 +3312,7 @@ sub SSCal_calAsHtml($;$) {
$out .= "<td class='cal calbold calcenter'> ".(($de)?'Karte' :'Map')." </td>" if($seen{Map});
$out .= "<td class='cal calbold calcenter'> ".(($de)?'Kalender' :'Calendar')." </td>" if($seen{Calendar});
$out .= "<td class='cal calbold calcenter'> ".(($de)?'ID' :'ID')." </td>" if($seen{EventId});
$out .= "</tr>";
my $maxbnr;
foreach my $key (keys %{$defs{$name}{READINGS}}) {