From ca1bf29bf3d5abde76c4f38adeb9201f01d683c2 Mon Sep 17 00:00:00 2001 From: betateilchen <> Date: Sun, 22 Feb 2015 12:23:15 +0000 Subject: [PATCH] 98_help.pm: make it Rudi-compatible git-svn-id: https://svn.fhem.de/fhem/trunk@8065 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_help.pm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/fhem/FHEM/98_help.pm b/fhem/FHEM/98_help.pm index 50167f16c..06fc17b98 100644 --- a/fhem/FHEM/98_help.pm +++ b/fhem/FHEM/98_help.pm @@ -1,4 +1,4 @@ -# $Id: 98_help.pm 8051 2015-02-21 12:02:26Z betateilchen $ +# $Id: 98_help.pm 8063 2015-02-22 10:20:03Z betateilchen $ # package main; use strict; @@ -77,7 +77,6 @@ sub CommandHelp { } - if( $cl && $cl->{TYPE} eq 'telnet' ) { $output =~ s/
/\n/g; $output =~ s//\n/g; @@ -89,12 +88,14 @@ sub CommandHelp { $output =~ s/<\/li>/\n/g; $output =~ s///g; $output =~ s/<\/code>//g; + $output =~ s/
//ig;
+    $output =~ s/<\/pre>//ig;
     $output =~ s/<//g;
-    $output =~ s/<[bui]>/\ /g;
-    $output =~ s/<\/[bui]>/\ /g;
+    $output =~ s/<[bui]>//g;
+    $output =~ s/<\/[bui]>//g;
     $output =~ tr/ / /s;
-#    $output =~ s/\n\n/\n/s;
+    $output =~ s/\n\n\ /\n/g;
     $output =~ s/ä/ä/g;
     $output =~ s/Ä/Ä/g;
     $output =~ s/ö/ö/g;
@@ -102,29 +103,33 @@ sub CommandHelp {
     $output =~ s/ü/ü/g;
     $output =~ s/Ü/Ü/g;
     $output =~ s/ß/ß/g;
-
-    $ret = $output;
+    
+    return $output;
     }
     
-#    return "$output";
-    return $output;
+    return "$output";
 
   } else {   # mod
 
-    my $str = "
" .
-		"Possible commands:

" .
-		"Command   Parameter                 Description
" .
-	    "-----------------------------------------------
";
+    my $str = "
Possible commands:

" .
+		"Command        Parameter
" .
+		"               Description
" .
+	    "----------------------------------------------------------------------
";
 
     for my $cmd (sort keys %cmds) {
       next if(!$cmds{$cmd}{Hlp});
       next if($cl && $cmds{$cmd}{ClientFilter} &&
            $cl->{TYPE} !~ m/$cmds{$cmd}{ClientFilter}/);
       my @a = split(",", $cmds{$cmd}{Hlp}, 2);
-      $str .= sprintf("%-9s %-25s %s
", $cmd, $a[0], $a[1]);
+      $a[0] =~ s//>/g;
+      $a[1]  = "               $a[1]";
+      $a[1] =~ s//>/g;
+      $str .= sprintf("%-15s%-50s
%s
", $cmd, $a[0], $a[1]);
     }
 
-    return $str;
+    return "$str
";
 
   }
 }
@@ -141,7 +146,7 @@ sub cref_search {
      } elsif($l =~ m/^=end html$lang$/) {
         $skip = 1;
      } elsif(!$skip) {
-        $output .= $l;
+        $output .= "$l\n";
      }
    }
    return $output;