From 6183d52e2d6cfcb49a9e4d2ba0dee406e75c70b0 Mon Sep 17 00:00:00 2001 From: krikan <> Date: Fri, 16 Dec 2016 18:03:32 +0000 Subject: [PATCH] fhem.html: survey.pl discontinued, svn repository changed git-svn-id: https://svn.fhem.de/fhem/trunk@12789 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/survey.pl | 309 --------------------------------------- fhem/docs/Impressum.html | 85 +++++++++++ fhem/docs/fhem.html | 40 +++-- fhem/docs/fhem_DE.html | 43 ++++-- 4 files changed, 137 insertions(+), 340 deletions(-) delete mode 100755 fhem/contrib/survey.pl create mode 100644 fhem/docs/Impressum.html diff --git a/fhem/contrib/survey.pl b/fhem/contrib/survey.pl deleted file mode 100755 index 0f7e8f3b5..000000000 --- a/fhem/contrib/survey.pl +++ /dev/null @@ -1,309 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use CGI; - -sub collectSubmitted($$@); -sub printChapter($$@); - -my @hw = qw( - ALL3076 - ALL4000T - ALL4027 - BS - CM11 - CUL - CUL_EM - CUL_FHTTK - CUL_HM - CUL_HOERMANN - CUL_IR - CUL_MAX - CUL_RFR - CUL_TX - CUL_WS - ECMD - ECMDDevice - EIB - EM - EMEM - EMGZ - EMWZ - ESA2000 - EnOcean - FB_CALLMONITOR - 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 - Itach_Relay - KM271 - KS300 - LGTV - LINDY_HDMI_SWITCH - LIRC - LUXTRONIK2 - M232 - M232Counter - M232Voltage - MAX - MAXLAN - NetIO230B - OREGON - OWAD - OWCOUNT - OWDevice - OWFS - OWID - OWLCD - OWMULTI - OWSWITCH - OWServer - OWTEMP - OWTHERM - OWX - POKEYS - PRESENCE - RFXCOM - RFXMETER - RFXX10REC - RSS - SCIVT - SISPM - SIS_PMS - SML - STV - TCM - TRX - TRX_ELSE - TRX_LIGHT - TRX_SECURITY - TRX_WEATHER - TUL - TellStick - UNIRoll - USBWX - USF1000 - VantagePro2 - WEBCOUNT - WEBIO - WEBIO_12DIGITAL - WEBTHERM - WS2000 - WS300 - WS3600 - Weather - X10 - YAMAHA_AVR - ZWDongle - ZWave - xxLG7000 - -); - -my @help = qw( - CULflash - Calendar - DbLog - FB_CALLMONITOR - FHEM2FHEM - FileLog - HCS - Heating_Control - JsonList - MSG - MSGFile - MSGMail - PID - PRESENCE - PachLog - SUNRISE_EL - SYSSTAT - Twilight - WOL - XmlList - at - autocreate - average - backup - createlog - dewpoint - dummy - fheminfo - holiday - notice - notify - sequence - structure - telnet - update - usb - watchdog - weblink - -); - -my @fe = ( - "FHEMRENDERER", - "HomeMini", - "android: andFHEM", - "fheME", - "iPhone: dhs-computertechnik", - "iPhone: fhemgw", - "iPhone: fhemobile", - "iPhone: phyfhem", - "myHCE", - "pgm2/FHEMWEB with SVG", - "pgm2/FHEMWEB with gnuplot", - "pgm3", - "pgm5", - -); - -my @platform = ( - "Fritz!Box 7170", - "Fritz!Box 7270", - "Fritz!Box 7390", - "NSLU2", - "OSX", - "PC: BSD", - "PC: Linux", - "PC: Windows", - "Plug Computer", - "Raspberry PI", - "Synology", - "TuxRadio", - -); - - -my $title = "Used FHEM Modules & Components"; - -my $q = new CGI; -print $q->header, - $q->start_html( -title => $title, - -style => {-src=>"../www/pgm2/style.css"}), "\n"; - -print '
', "\n", - '', "\n"; - -print '\n"; - print $q->end_html; - exit(0); -} - - -print "This is a survey to get a feeling which fhem modules are used.
"; -print "
"; -print $q->start_form; - -############################################## -print $q->h4("User (optional):"); -print $q->textfield(-name=>'user', -size=>18, -maxsize=>36); - -############################################## -sub -printChapter($$@) -{ - my @arr = @_; - my $name = shift @arr; - my $cols = shift @arr; - @arr = sort(@arr); - print $q->h4("$name:"); - print "
"; - print ""; - foreach(my $i=0; $i < @arr; $i++) { - print ""; - print "\n" if($i % $cols == ($cols-1)); - } - print "
",$q->checkbox(-name=>"$arr[$i]",-label=>"$arr[$i]"),"
"; - print "
"; -} - -sub -collectSubmitted($$@) -{ - my ($name, $flags, @arr) = @_; - my $ret = ""; - my @set; - foreach my $f (@arr) { - #print "Testing $f ", ($q->param($f) ? $q->param($f) : "UNDEF"), "
\n"; - push @set, $f if($q->param($f) && $flags); - push @set, $q->param($f) if($q->param($f) && !$flags); - } - $ret .= join(", ' '", @set) if(@set); - return "$name\n '$ret'\n"; -} - -printChapter("Hardware devices", 4, @hw); -printChapter("Helper modules", 6, @help); -printChapter("Frontends", 3, @fe); -printChapter("Platform", 5, @platform); - - -############################################## -print $q->h4("Other modules:"); -print $q->textfield(-name=>'other', -size=>80, -maxsize=>80); -print "


\n"; - -print $q->submit('Submit'); -print "


\n"; - -print $q->end_form; -print "
\n"; -print $q->end_html; diff --git a/fhem/docs/Impressum.html b/fhem/docs/Impressum.html new file mode 100644 index 000000000..05446c414 --- /dev/null +++ b/fhem/docs/Impressum.html @@ -0,0 +1,85 @@ + + + + + + FHEM Impressum + + + + + + + + + + +
-
Forum: - http://forum.fhem.de
Although most entries are in german here, +
Forum: + https://forum.fhem.de
Although most entries are in german here, don't be afraid to ask something in english.
@@ -252,9 +261,8 @@ - + diff --git a/fhem/docs/fhem_DE.html b/fhem/docs/fhem_DE.html index a03326ff7..8ab91cb4d 100644 --- a/fhem/docs/fhem_DE.html +++ b/fhem/docs/fhem_DE.html @@ -43,6 +43,18 @@ Lizenz +
+ FHEM Links: + + Forum + + SVN + + Wiki + + Verein + + @@ -103,11 +115,10 @@ fhem-cvs.tgz, debian.fhem.de

- Füllen Sie bitte unsere Umfrage aus, da wir gerne - wüssten, welche FHEM Module verwendet werden. Hier sind die Ergebnisse.
Oder verwenden sie den - fheminfo Befehl in FHEM um diese - Statistiken automatisch zu generieren. + Verwenden sie bitte den fheminfo + Befehl in FHEM, da wir gerne wüssten, welche FHEM Module verwendet + werden. + Hier sind die Ergebnisse. @@ -133,9 +144,9 @@ und SmartVisu
-
  • +
  • Charting Frontend und - YAF + YAF (Yet Another Frontend).
  • @@ -239,11 +250,11 @@ enthält eine detaillierte Beschreibung aller Module und Features.
    -
    Unser wiki ist erreichbar unter fhemwiki.de
    +
    Unser Wiki ist erreichbar unter https://wiki.fhem.de
    Forum: http://forum.fhem.de + href="https://forum.fhem.de">https://forum.fhem.de
    HOWTO_DE.html für eine kurze Installation/Konfiguration.
    @@ -265,9 +276,8 @@ + +