Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-01 20:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

55_InfoPanel.pm: revert last changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23677 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2021-02-04 20:02:42 +00:00
parent 341fa37a7b
commit 2ec6280e7f
1 changed files with 55 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
fhem/FHEM/55_InfoPanel.pm
View File

@ -61,67 +61,34 @@
# 2016-09-04 - 12114 - added: movecalculated # 2016-09-04 - 12114 - added: movecalculated
# #
# 2018-05-06 - 16695 - changed: check plotName exists # 2018-05-06 - 16695 - changed: check plotName exists
# 2018-05-28 - 21562 - changed: remove misleading link in commandref # 2018-05-28 - $Rev$ - changed: remove misleading link in commandref
#
# 2021-02-04 - - changed: use own package
# #
############################################## ##############################################
=cut =cut
package FHEM::InfoPanel; ## no critic package main;
use strict; use strict;
use warnings; use warnings;
#use Data::Dumper; #use Data::Dumper;
#use HttpUtils;
##############################################
use GPUtils qw(GP_Import GP_Export);
BEGIN {
# Import from main context
GP_Import(
qw( AnalyzePerlCommand
AttrVal
Debug
Log3
data
defs
FileRead
getKeyValue
readingFnAttributes
readingsSingleUpdate
setKeyValue
FW_userAgent
FW_wname
FW_RET
FW_webArgs
FW_pos
FW_plotsize
FW_ME
FW_httpheader
FW_CSRF )
);
#-- Export to main context with different name
GP_Export(
qw( Initialize )
);
}
##############################################
no if $] >= 5.017011, warnings => 'experimental';
use feature qw/switch/; use feature qw/switch/;
use vars qw(%data); use vars qw(%data);
use HttpUtils;
my @valid_valign = qw(auto baseline middle center hanging); my @valid_valign = qw(auto baseline middle center hanging);
my @valid_halign = qw(start middle end); my @valid_halign = qw(start middle end);
my $useImgTools = 1; my $useImgTools = 1;
############################################## no if $] >= 5.017011, warnings => 'experimental';
sub btIP_Define;
sub btIP_Undef;
sub btIP_Set;
sub btIP_Get;
sub btIP_Notify;
sub btIP_readLayout;
sub btIP_itemArea; sub btIP_itemArea;
sub btIP_itemButton; sub btIP_itemButton;
@ -163,9 +130,10 @@ sub btIP_HTMLTail;
sub btIP_Overview; sub btIP_Overview;
sub btIP_getURL; sub btIP_getURL;
###################################### ######################################
sub Initialize { sub InfoPanel_Initialize {
my ($hash) = @_; my ($hash) = @_;
## no critic ## no critic
@ -177,12 +145,11 @@ sub Initialize {
Log3(undef,4,"InfoPanel: Image::Info missing.") unless $useImgTools; Log3(undef,4,"InfoPanel: Image::Info missing.") unless $useImgTools;
## use critic ## use critic
$hash->{DefFn} = \&Define; $hash->{DefFn} = "btIP_Define";
$hash->{UndefFn} = \&Undef; $hash->{UndefFn} = "btIP_Undef";
$hash->{SetFn} = \&Set; $hash->{SetFn} = "btIP_Set";
$hash->{GetFn} = \&Get; $hash->{GetFn} = "btIP_Get";
$hash->{NotifyFn} = \&Notify; $hash->{NotifyFn} = "btIP_Notify";
$hash->{AttrList} = "autoreread:1,0 useViewPort:1,0 bgcolor refresh size "; $hash->{AttrList} = "autoreread:1,0 useViewPort:1,0 bgcolor refresh size ";
$hash->{AttrList} .= "mobileApp:none,apple,other "; $hash->{AttrList} .= "mobileApp:none,apple,other ";
$hash->{AttrList} .= "title noscript showTime:1,0 "; $hash->{AttrList} .= "title noscript showTime:1,0 ";
@ -191,7 +158,7 @@ sub Initialize {
return; return;
} }
sub Define { sub btIP_Define {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my @a = split("[ \t]+", $def); my @a = split("[ \t]+", $def);
return "Usage: define <name> InfoPanel filename" if(int(@a) != 3); return "Usage: define <name> InfoPanel filename" if(int(@a) != 3);
@ -202,14 +169,14 @@ sub Define {
$hash->{fhem}{div} = ''; $hash->{fhem}{div} = '';
$hash->{LAYOUTFILE} = $filename; $hash->{LAYOUTFILE} = $filename;
btIP_addExtension("FHEM::InfoPanel::btIP_CGI","btip","InfoPanel"); btIP_addExtension("btIP_CGI","btip","InfoPanel");
readLayout($hash); btIP_readLayout($hash);
readingsSingleUpdate($hash,'state','defined',1); readingsSingleUpdate($hash,'state','defined',1);
return; return;
} }
sub Undef { sub btIP_Undef {
my ($hash, $arg) = @_; my ($hash, $arg) = @_;
# check if last device # check if last device
my $url = '/btip'; my $url = '/btip';
@ -217,7 +184,7 @@ sub Undef {
return; return;
} }
sub Set { sub btIP_Set {
my ($hash, @a) = @_; my ($hash, @a) = @_;
my $name = $a[0]; my $name = $a[0];
@ -241,7 +208,7 @@ sub Set {
$defs{$name}{fhem}{override}{$a[2]} = 1; $defs{$name}{fhem}{override}{$a[2]} = 1;
} }
when ("reread") { when ("reread") {
readLayout($hash); btIP_readLayout($hash);
} }
default { default {
$ret = $usage; $ret = $usage;
@ -250,7 +217,7 @@ sub Set {
return $ret; return $ret;
} }
sub Get { sub btIP_Get {
my ($hash, @a) = @_; my ($hash, @a) = @_;
my $name = $a[0]; my $name = $a[0];
@ -278,7 +245,7 @@ sub Get {
return $ret; return $ret;
} }
sub Notify { sub btIP_Notify {
my ($hash,$dev) = @_; my ($hash,$dev) = @_;
return unless AttrVal($hash->{NAME},'autoreload',1); return unless AttrVal($hash->{NAME},'autoreload',1);
@ -286,11 +253,11 @@ sub Notify {
return if(!grep(m/^FILEWRITE $hash->{LAYOUTFILE}$/, @{$dev->{CHANGED}})); return if(!grep(m/^FILEWRITE $hash->{LAYOUTFILE}$/, @{$dev->{CHANGED}}));
Log3(undef, 4, "InfoPanel: $hash->{NAME} reread layout after edit."); Log3(undef, 4, "InfoPanel: $hash->{NAME} reread layout after edit.");
undef = readLayout($hash); undef = btIP_readLayout($hash);
return; return;
} }
sub readLayout { sub btIP_readLayout {
my ($hash)= @_; my ($hash)= @_;
my $filename= $hash->{LAYOUTFILE}; my $filename= $hash->{LAYOUTFILE};
my $name= $hash->{NAME}; my $name= $hash->{NAME};
@ -300,7 +267,7 @@ sub readLayout {
if($err) { if($err) {
# Log 1, "InfoPanel $name: $err"; # Log 1, "InfoPanel $name: $err";
# $hash->{fhem}{layout} = "text ERROR 50 50 \"Error on reading layout!\""; # $hash->{fhem}{layout} = "text ERROR 50 50 \"Error on reading layout!\"";
Log3(undef, 1, "InfoPanel $name: $err"); Log 1, "InfoPanel $name: $err";
$hash->{fhem}{layout} = "text ERROR 50 50 \"Error on reading layout!\""; $hash->{fhem}{layout} = "text ERROR 50 50 \"Error on reading layout!\"";
my ($e,@layout) = FileRead('./FHEM/template.layout'); my ($e,@layout) = FileRead('./FHEM/template.layout');
unless ($e){ unless ($e){
@ -1383,6 +1350,31 @@ sub btIP_addExtension {
$data{FWEXT}{jqueryvticker}{SCRIPT} = "/pgm2/jquery.vticker.min.js" unless $data{FWEXT}{jqueryvticker}{SCRIPT}; $data{FWEXT}{jqueryvticker}{SCRIPT} = "/pgm2/jquery.vticker.min.js" unless $data{FWEXT}{jqueryvticker}{SCRIPT};
} }
sub btIP_CGI{
my ($request) = @_;
my ($name,$ext)= btIP_splitRequest($request);
if(defined($name)) {
if($ext eq "") {
return("text/plain; charset=utf-8", "Illegal extension.");
}
if(!defined($defs{$name})) {
return("text/plain; charset=utf-8", "Unknown InfoPanel device: $name");
}
if($ext eq "png") {
return btIP_returnPNG($name);
}
if($ext eq "info" || $ext eq "html") {
return btIP_returnHTML($name);
}
} else {
return btIP_Overview();
}
}
sub btIP_splitRequest { sub btIP_splitRequest {
my ($request) = @_; my ($request) = @_;
@ -1495,37 +1487,6 @@ sub btIP_getURL {
return $proto."://$FW_httpheader{Host}$FW_ME"; return $proto."://$FW_httpheader{Host}$FW_ME";
} }
####################
#
#package main;
sub btIP_CGI{
my ($request) = @_;
my ($name,$ext)= btIP_splitRequest($request);
if(defined($name)) {
if($ext eq "") {
return("text/plain; charset=utf-8", "Illegal extension.");
}
if(!defined($defs{$name})) {
return("text/plain; charset=utf-8", "Unknown InfoPanel device: $name");
}
if($ext eq "png") {
return btIP_returnPNG($name);
}
if($ext eq "info" || $ext eq "html") {
return btIP_returnHTML($name);
}
} else {
return btIP_Overview();
}
}
1; 1;
# #