FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-06 06:08:44 +00:00
Code Issues Releases Wiki Activity

98_Installer: add support for proposed fhem.pl patch

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19017 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-03-24 14:42:27 +00:00
parent 4174c6d6e2
commit 37825e24b2
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fhem/FHEM/98_Installer.pm
View File

@ -18,6 +18,7 @@ sub Installer_Initialize($) {
"disable:1,0 "
. "disabledForIntervals "
. "updateListReading:1,0 "
. "implicitGlobalSearch:0,1 "
. $readingFnAttributes;
return FHEM::Meta::InitMod( __FILE__, $modHash );
@ -47,6 +48,7 @@ BEGIN {
ReadingsTimestamp
defs
modules
cmds
packages
Log
Log3
@ -965,6 +967,8 @@ sub CreateSearchList ($$$) {
$colOpen . $txtOpen . 'Device Name' . $txtClose . $colClose;
push @ret,
$colOpen . $txtOpen . 'Device Type' . $txtClose . $colClose;
push @ret,
$colOpen . $txtOpen . 'Device State' . $txtClose . $colClose;
push @ret, $rowClose;
}
$found++;
@ -994,6 +998,11 @@ sub CreateSearchList ($$$) {
$l .= $colOpen . $linkDev . $colClose;
$l .= $colOpen . $linkMod . $colClose;
$l .=
$colOpen
. (
defined( $defs{$device}{STATE} ) ? $defs{$device}{STATE} : '' )
. $colClose;
$l .= $rowClose;
@ -1350,6 +1359,34 @@ sub CreateSearchList ($$$) {
}
push @ret, $tableClose if ($foundPerl);
#TODO works only if fhem.pl patch was accepted:
# https://forum.fhem.de/index.php/topic,98937.0.html
if ( defined( $hash->{CL} )
&& defined( $hash->{CL}{'.iDefCmdMethod'} )
&& $hash->{CL}{'.iDefCmdMethod'} eq 'always' )
{
my $cmdO = $hash->{CL}{'.iDefCmdOrigin'};
if ( defined( $cmds{$cmdO} )
&& defined( $hash->{CL}{'.iDefCmdOverwrite'} )
&& $hash->{CL}{'.iDefCmdOverwrite'} )
{
my $cmd = $search;
$cmd =~ s/^$cmdO//;
$cmd = $cmdO . '!' . ( $cmd && $cmd ne '' ? ' ' . $cmd : '' );
unshift @ret,
$lb
. $lb
. 'Did you mean to <a href="?cmd='
. $cmd
. $FW_CSRF
. '">run command '
. $cmdO
. '</a> instead?';
}
}
if ($found) {
unshift @ret,
$lb
@ -1411,6 +1448,7 @@ sub CreateSearchList ($$$) {
else {
unshift @ret, 'Nothing found';
}
unshift @ret,
'<a name="searchResultTOP"></a><h2>Search result: ' . $search . '</h2>';
@ -1786,14 +1824,6 @@ sub CreateMetadataList ($$$) {
$modMeta->{resources}{x_wiki}{web};
$url .= '/' unless ( $url =~ m/\/$/ );
if ( defined( $modMeta->{resources}{x_wiki}{modpath} ) ) {
$url .= '/' unless ( $url =~ m/\/$/ );
$url .=
$modMeta->{resources}{x_wiki}{modpath};
$url .= '/' unless ( $url =~ m/\/$/ );
$url .= $modName eq 'Global' ? 'global' : $modName;
}
$l .=
'<a href="' . $url . '" target="_blank">' . $title . '</a>';
}

4
fhem/FHEM/Meta.pm
View File

@ -1933,8 +1933,8 @@ m/(^#\s+(?:\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4})\s+)?[^v\d]*(v?(?:\d{1,3}\.\d{1,3}(?
&& defined( $modMeta->{resources}{x_wiki} ) )
{
if ( defined( $modMeta->{x_vcs} ) ) {
$modMeta->{resources}{x_wiki}{web} = 'https://wiki.fhem.de/';
$modMeta->{resources}{x_wiki}{modpath} = 'wiki/';
$modMeta->{resources}{x_wiki}{web} =
'https://wiki.fhem.de/wiki/' . $modName;
}
}