diff --git a/FHEM/01_FHEMWEB.pm b/FHEM/01_FHEMWEB.pm index 179d8ec35..edfa67fef 100755 --- a/FHEM/01_FHEMWEB.pm +++ b/FHEM/01_FHEMWEB.pm @@ -335,6 +335,7 @@ FW_serveSpecial($$$$) my ($file,$ext,$dir,$cacheable)= @_; $file =~ s,\.\./,,g; # little bit of security +Log 1, "Serve: $dir, $file, $ext"; $file = "$FW_sp$file" if($ext eq "css" && -f "$dir/$FW_sp$file.$ext"); $FW_RETTYPE = ext2MIMEType($ext); #Log 1, "Serving $dir/$file.$ext as $FW_RETTYPE, cacheable:$cacheable"; @@ -348,6 +349,7 @@ FW_answerCall($) my ($arg) = @_; my $me=$defs{$FW_cname}; # cache, else rereadcfg will delete us +Log 1, "ANSWER $arg"; $FW_RET = ""; $FW_RETTYPE = "text/html; charset=$FW_encoding"; $FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem"); @@ -376,11 +378,13 @@ FW_answerCall($) } elsif($arg =~ m,^$FW_ME/(.*)/([^/]*)$,) { # the "normal" case my ($dir, $ofile, $ext) = ($1, $2, ""); $dir =~ s/\.\.//g; + $dir =~ s,www/,,g; # Want commandref.html to work from file://... my $file = $ofile; if($file =~ m/^(.*)\.([^.]*)$/) { $file = $1; $ext = $2; } +Log 1, "GOT $dir"; my $ldir = "$FW_dir/$dir"; $ldir = "$FW_dir/pgm2" if($dir eq "css" || $dir eq "js"); $ldir = "$attr{global}{modpath}/docs" if($dir eq "docs"); @@ -402,6 +406,7 @@ FW_answerCall($) return -1; } +Log 1, "Searching for $arg"; $FW_plotmode = AttrVal($FW_wname, "plotmode", "SVG"); diff --git a/contrib/commandref_join.pl b/contrib/commandref_join.pl index ea728c27f..4559bd899 100755 --- a/contrib/commandref_join.pl +++ b/contrib/commandref_join.pl @@ -81,6 +81,10 @@ foreach my $lang (@lang) { } elsif(!$skip) { # here we copy line by line from the module +# if($l =~ m/<.?pre>/) { +# print "$lang $mod REMOVING 
 Formatting\n";
+#          $l =~ s/<.?pre>//g;
+#        }
         print OUT $l;
         $docCount++;
         $hasLink = ($l =~ m//) if(!$hasLink);
diff --git a/contrib/survey.pl b/contrib/survey.pl
index 3dac4eb4f..99a161920 100755
--- a/contrib/survey.pl
+++ b/contrib/survey.pl
@@ -8,115 +8,153 @@ sub collectSubmitted($$@);
 sub printChapter($$@);
 
 my @hw = qw(
-  ALL3076 
-  ALL4000T 
-  ALL4027 
-  BS 
-  CM11 
-  CUL 
-  CUL_EM 
-  CUL_FHTTK 
-  CUL_HM 
+  ALL3076
+  ALL4000T
+  ALL4027
+  BS
+  CM11
+  CUL
+  CUL_EM
+  CUL_FHTTK
+  CUL_HM
   CUL_HOERMANN
-  CUL_IR 
-  CUL_RFR 
-  CUL_TX 
-  CUL_WS 
+  CUL_IR
+  CUL_MAX
+  CUL_RFR
+  CUL_TX
+  CUL_WS
   ECMD
-  ECMDDevice 
-  EIB 
-  EM 
-  EMEM 
-  EMGZ 
-  EMWZ 
-  ESA2000 
+  ECMDDevice
+  EIB
+  EM
+  EMEM
+  EMGZ
+  EMWZ
+  ESA2000
   EnOcean
-  FHT 
-  FHT8V 
-  FHZ 
-  FS20 
-  HMLAN 
-  HMS 
+  FBAHA
+  FBDECT
+  FHT
+  FHT8V
+  FHZ
+  FRM
+  FRM_AD
+  FRM_I2C
+  FRM_IN
+  FRM_OUT
+  FRM_PWM
+  FRM_SERVO
+  FS20
+  HMLAN
+  HMS
+  HTTPSRV
+  HUEBridge
+  HUEDevice
   IPCAM
-  IPWE 
-  IT 
+  IPWE
+  IT
   Itach_Relay
-  KM271 
-  KS300 
+  KM271
+  KS300
   LGTV
-  LIRC 
-  M232 
-  M232Counter 
-  M232Voltage 
-  NetIO230B 
+  LIRC
+  LUXTRONIK2
+  M232
+  M232Counter
+  M232Voltage
+  MAX
+  MAXLAN
+  NetIO230B
   OREGON
-  OWFS 
-  OWTEMP 
+  OWAD
+  OWCOUNT
+  OWDevice
+  OWFS
+  OWID
+  OWLCD
+  OWMULTI
+  OWSWITCH
+  OWServer
+  OWTEMP
+  OWTHERM
+  OWX
   POKEYS
-  RFXCOM 
-  RFXMETER 
-  RFXX10REC 
-  SCIVT 
-  SISPM 
-  SIS_PMS 
+  RFXCOM
+  RFXMETER
+  RFXX10REC
+  RSS
+  SCIVT
+  SISPM
+  SIS_PMS
   SML
   STV
-  TCM 
+  TCM
   TRX
   TRX_ELSE
   TRX_LIGHT
   TRX_SECURITY
   TRX_WEATHER
-  TUL 
+  TUL
   TellStick
-  USBWX 
-  USF1000 
-  VantagePro2 
+  UNIRoll
+  USBWX
+  USF1000
+  VantagePro2
   WEBCOUNT
-  WEBIO 
-  WEBIO_12DIGITAL 
-  WEBTHERM 
-  WOL 
-  WS2000 
-  WS300 
-  WS3600 
-  X10 
+  WEBIO
+  WEBIO_12DIGITAL
+  WEBTHERM
+  WS2000
+  WS300
+  WS3600
+  Weather
+  X10
+  YAMAHA_AVR
   ZWDongle
   ZWave
-  xxLG7000 
+  xxLG7000
 
 );
 
 my @help = qw(
   CULflash
   Calendar
+  DbLog
+  FB_CALLMONITOR
   FHEM2FHEM
   FileLog
-  HTTPSRV
+  HCS
+  Heating_Control
   JsonList
   MSG
   MSGFile
   MSGMail
   PID
+  PRESENCE
   PachLog
-  RSS
   SUNRISE_EL
-  Weather
+  SYSSTAT
   Twilight
+  WOL
   XmlList
   at
   autocreate
   average
   backup
+  createlog
   dewpoint
   dummy
+  fheminfo
   holiday
+  notice
   notify
   sequence
   structure
   telnet
-  updatefhem
+  update
+  usb
   watchdog
+  weblink
 
 );
 
@@ -158,12 +196,16 @@ my $title = "Used FHEM Modules & Components";
 
 my $q = new CGI;
 print $q->header,
-      $q->start_html( -title  => $title, -style=>{-src=>"style.css"}), "\n";
+      $q->start_html( -title => $title, 
+                      -style => {-src=>"../www/pgm2/style.css"}), "\n";
 
 print '
', "\n",
-      'fhem-logo', "\n",
-      '  
FHEM survey
', "\n",
-      '
', "\n";
+  '', "\n";
 
 print '