FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

98_help:pm improve regexp for telnet

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8063 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
betateilchen 2015-02-22 10:20:03 +00:00
parent f5e5d1142b
commit 0658f70387
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/98_help.pm
View File

@ -1,4 +1,4 @@
# $Id: 98_help.pm 8032 2015-02-18 18:36:37Z betateilchen $ # $Id: 98_help.pm 8051 2015-02-21 12:02:26Z betateilchen $
# #
package main; package main;
use strict; use strict;
@ -81,8 +81,8 @@ sub CommandHelp {
if( $cl && $cl->{TYPE} eq 'telnet' ) { if( $cl && $cl->{TYPE} eq 'telnet' ) {
$output =~ s/<br>/\n/g; $output =~ s/<br>/\n/g;
$output =~ s/<br\/>/\n/g; $output =~ s/<br\/>/\n/g;
$output =~ s/<\/a>//g; $output =~ s/<a href.*\/a>//g;
$output =~ s/<a.*>//g; $output =~ s/<a name.*\/a>//g;
$output =~ s/<ul>/\n/g; $output =~ s/<ul>/\n/g;
$output =~ s/<\/ul>/\n/g; $output =~ s/<\/ul>/\n/g;
$output =~ s/<li>/-/g; $output =~ s/<li>/-/g;
@ -94,7 +94,7 @@ sub CommandHelp {
$output =~ s/<[bui]>/\ /g; $output =~ s/<[bui]>/\ /g;
$output =~ s/<\/[bui]>/\ /g; $output =~ s/<\/[bui]>/\ /g;
$output =~ tr/ / /s; $output =~ tr/ / /s;
$output =~ s/\n\n/\n/s; # $output =~ s/\n\n/\n/s;
$output =~ s/&auml;/ä/g; $output =~ s/&auml;/ä/g;
$output =~ s/&Auml;/Ä/g; $output =~ s/&Auml;/Ä/g;
$output =~ s/&ouml;/ö/g; $output =~ s/&ouml;/ö/g;
@ -106,21 +106,22 @@ sub CommandHelp {
$ret = $output; $ret = $output;
} }
return "<html>$output</html>"; # return "<html>$output</html>";
return $output;
} else { # mod } else { # mod
my $str = "\n" . my $str = "<br/>" .
"Possible commands:\n\n" . "Possible commands:<br/><br/>" .
"Command Parameter Description\n" . "Command Parameter Description<br/>" .
"-----------------------------------------------\n"; "-----------------------------------------------<br/>";
for my $cmd (sort keys %cmds) { for my $cmd (sort keys %cmds) {
next if(!$cmds{$cmd}{Hlp}); next if(!$cmds{$cmd}{Hlp});
next if($cl && $cmds{$cmd}{ClientFilter} && next if($cl && $cmds{$cmd}{ClientFilter} &&
$cl->{TYPE} !~ m/$cmds{$cmd}{ClientFilter}/); $cl->{TYPE} !~ m/$cmds{$cmd}{ClientFilter}/);
my @a = split(",", $cmds{$cmd}{Hlp}, 2); my @a = split(",", $cmds{$cmd}{Hlp}, 2);
$str .= sprintf("%-9s %-25s %s\n", $cmd, $a[0], $a[1]); $str .= sprintf("%-9s %-25s %s<br/>", $cmd, $a[0], $a[1]);
} }
return $str; return $str;