mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-07 16:59:18 +00:00
HMInfo:correct templistconfig setting
git-svn-id: https://svn.fhem.de/fhem/trunk@16225 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
5737a38dc6
commit
9a1d33d6ea
@ -898,13 +898,15 @@ sub HMinfo_tempListDefFn(@) { #################################################
|
|||||||
my ($fn) = shift;
|
my ($fn) = shift;
|
||||||
$fn = "" if (!defined $fn);
|
$fn = "" if (!defined $fn);
|
||||||
my $ret = "";
|
my $ret = "";
|
||||||
my ($n) = devspec2array("TYPE=HMinfo");
|
|
||||||
$ret .= "$attr{global}{modpath}/" if ( !$fn || $fn !~ m/^\//); #no path? add modpath
|
if($fn !~ m/\//){ # filename already with path - dont change
|
||||||
$ret .= AttrVal($n,"configDir",".")."/" if ( !$ret || $ret !~ m/..*\//
|
my ($n) = devspec2array("TYPE=HMinfo");
|
||||||
&& (!$fn || $fn !~ m/^\//));#no dir? add defDir
|
$ret .= AttrVal($n,"configDir",".")."/" if ( !$fn || $fn !~ m/^\//);#no dir? add defDir
|
||||||
if (!$fn){ #set filename
|
$ret = AttrVal("global","modpath",".")."/$ret" if ( !$ret || $ret !~ m/^\//);#no path? add modpath
|
||||||
my ($f) = split(",",AttrVal($n,"configTempFile","tempList.cfg"));
|
if (!$fn){ #set filename
|
||||||
$ret .= $f;
|
my ($f) = split(",",AttrVal($n,"configTempFile","tempList.cfg"));
|
||||||
|
$ret .= $f;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $ret.$fn;
|
return $ret.$fn;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user