Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

:for debug

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@18373 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2019-01-22 12:47:56 +00:00
parent e2373a9fac
commit 6fb068fbdc
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/betateilchen/01_FHEMWEB.pm
View File

@ -1,5 +1,5 @@
############################################## ##############################################
# $Id: 01_FHEMWEB.pm 18326 2019-01-18 22:09:42Z rudolfkoenig $ # $Id: 01_FHEMWEB.pm 18366 2019-01-21 21:23:08Z rudolfkoenig $
package main; package main;
use strict; use strict;
@ -88,7 +88,6 @@ use vars qw(%FW_visibleDeviceHash);
use vars qw(@FW_httpheader); # HTTP header, line by line use vars qw(@FW_httpheader); # HTTP header, line by line
use vars qw(%FW_httpheader); # HTTP header, as hash use vars qw(%FW_httpheader); # HTTP header, as hash
use vars qw($FW_userAgent); # user agent string use vars qw($FW_userAgent); # user agent string
use vars qw(%FW_customConfFiles);
$FW_formmethod = "post"; $FW_formmethod = "post";
@ -221,8 +220,6 @@ FHEMWEB_Initialize($)
"widgetOverride" "widgetOverride"
); );
InternalTimer(time()+60, "FW_closeInactiveClients", 0, 0);
$FW_confdir = "$attr{global}{modpath}/conf"; $FW_confdir = "$attr{global}{modpath}/conf";
$FW_dir = "$attr{global}{modpath}/www"; $FW_dir = "$attr{global}{modpath}/www";
$FW_icondir = "$FW_dir/images"; $FW_icondir = "$FW_dir/images";
@ -272,6 +269,10 @@ FW_Define($$)
FW_Undef($hash, undef) if($hash->{OLDDEF}); # modify FW_Undef($hash, undef) if($hash->{OLDDEF}); # modify
RemoveInternalTimer(0, "FW_closeInactiveClients");
InternalTimer(time()+60, "FW_closeInactiveClients", 0, 0);
foreach my $pe ("fhemSVG", "openautomation", "default") { foreach my $pe ("fhemSVG", "openautomation", "default") {
FW_readIcons($pe); FW_readIcons($pe);
} }
@ -2217,6 +2218,7 @@ sub
FW_displayFileList($@) FW_displayFileList($@)
{ {
my ($heading,@files)= @_; my ($heading,@files)= @_;
return if(!@files);
my $hid = lc($heading); my $hid = lc($heading);
$hid =~ s/[^A-Za-z]/_/g; $hid =~ s/[^A-Za-z]/_/g;
FW_pO "<div class=\"fileList $hid\">$heading</div>"; FW_pO "<div class=\"fileList $hid\">$heading</div>";
@ -2241,7 +2243,7 @@ FW_fileNameToPath($)
{ {
my $name = shift; my $name = shift;
my @f = sort keys %FW_customConfFiles; my @f = FW_confFiles(2);
return "$FW_confdir/$name" if ( map { $name =~ $_ } @f ); return "$FW_confdir/$name" if ( map { $name =~ $_ } @f );
$attr{global}{configfile} =~ m,([^/]*)$,; $attr{global}{configfile} =~ m,([^/]*)$,;
@ -2263,9 +2265,12 @@ FW_fileNameToPath($)
} }
} }
sub FW_confFiles() { sub FW_confFiles($) {
my ($param) = @_;
# create and return regexp for editFileList # create and return regexp for editFileList
return "(".join ( "|" , sort keys %FW_customConfFiles ).")"; return "(".join ( "|" , sort keys %FW_customConfFiles ).")" if $param == 1;
# create and return array with filenames
return sort keys $data{confFiles} if $param == 2;
} }
################## ##################
@ -2293,7 +2298,7 @@ FW_style($$)
my $efl = AttrVal($FW_wname, 'editFileList', my $efl = AttrVal($FW_wname, 'editFileList',
"Own modules and helper files:\$MW_dir:^(.*sh|[0-9][0-9].*Util.*pm|". "Own modules and helper files:\$MW_dir:^(.*sh|[0-9][0-9].*Util.*pm|".
".*cfg|.*\.holiday|myUtilsTemplate.pm|.*layout)\$\n". ".*cfg|.*\.holiday|myUtilsTemplate.pm|.*layout)\$\n".
"Config files:\$FW_confdir:^".FW_confFiles."\$\n". "Config files for external Programs:\$FW_confdir:^".FW_confFiles(1)."\$\n".
"Gplot files:\$FW_gplotdir:^.*gplot\$\n". "Gplot files:\$FW_gplotdir:^.*gplot\$\n".
"Style files:\$FW_cssdir:^.*(css|svg)\$"); "Style files:\$FW_cssdir:^.*(css|svg)\$");
foreach my $l (split(/[\r\n]/, $efl)) { foreach my $l (split(/[\r\n]/, $efl)) {