pgm3 must not run on the same maschine like fhem.
+ The Devices of 95% of the users are detected and configured automatically. + Further 4% are adaptable by the function UserDef. See config.php for explanation. +
-
-
-
- Install PHP5 and enable it by commenting in the "LoadModule - phpX_module ..." directive in httpd.conf (perhaps it is already - done by your distro). Restart/reload httpd. + Installation: +
- Install PHP5, the php5-Apache-Modules and php-gd. Every current + distribution should do all the needed configuration without your input. -
- Create a directory (e.g.: /home/httpd/html/pgm3) and copy all the
- files from the webfrontend/pgm3 to this directory.
Make sure that this - directory is writeable by the webserver!
+ - Create a directory in the Apache2 DocumentRoot
+ (e.g.: /home/httpd/html/pgm3) and copy all the files from the
+ webfrontend/pgm3 to this directory.
Make sure that this + directory is writeable by the webserver (e.g. User www-data.www-data)! +
- - Make sure that php-gd is installed. - -
- Edit config.php (/home/httpd/html/pgm3/config.php), and check the - required settings section
- If you want to have access to the FHT temperature logs, then:
-
diff --git a/fhem/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED
index f7c471dd9..3cbe179dc 100644
--- a/fhem/webfrontend/pgm3/CHANGED
+++ b/fhem/webfrontend/pgm3/CHANGED
@@ -186,4 +186,8 @@ It is not necessary to tell fhem that there are other logs.
2009-11-10
-- Bugfix: Pulldown-Menu without selected FTDEV not possible any more
- Changed: index.php. Check for selcted dhtdev
+ Changed: index.php. Check for selected dhtdev
+
+2009-11-16
+ -- New version with Battery-check, Log-Pull-Down, Google-Weather-Api
+ -- Changed Files: index.php, config.php, fhtpulldown.php, weather.php
diff --git a/fhem/webfrontend/pgm3/HISTORY b/fhem/webfrontend/pgm3/HISTORY
index 17800d664..2dcf47c57 100644
--- a/fhem/webfrontend/pgm3/HISTORY
+++ b/fhem/webfrontend/pgm3/HISTORY
@@ -86,3 +86,10 @@
- Martin 2009-11-10
-- Bugfix: Pulldown-Menu without selected FTDEV not possible any more
+
+- Martin 2009-11-16
+ -- Feature: Google-Weather-Api added.
+ -- Feature: Dislay of all Logs including the FS20-devices (grep on fhem.log)
+ -- Feature: The status of the batteries of FHT and HMS are shown in the graphics
+ -- php4 disabled. Only php5 is supported.
+ -- A lot of examples of the UserDefs are added.
diff --git a/fhem/webfrontend/pgm3/config.php b/fhem/webfrontend/pgm3/config.php
index 84989b639..6f5267563 100644
--- a/fhem/webfrontend/pgm3/config.php
+++ b/fhem/webfrontend/pgm3/config.php
@@ -1,24 +1,28 @@
global"
- $fhz1000port="7072"; # port of fhem.pl
- $logpath="/var/tmp"; # where are your logs?
- $AbsolutPath="/srv/www/htdocs/pgm3"; # where ist your pgm3?
+ $fhemport="7072"; # port of fhem.pl
+ $logpath="/var/tmp/"; # where are your logs? Use a writabel nfs-share if pgm3 and fhem are not on the same machine
+ $AbsolutPath="/srv/www/htdocs/"; # where ist your pgm3?
- $fhz1000_pl="/home/FHZ/fhem/fhem.pl"; #only required if you are using HP4
-
##################################################################################
###### nice to have
+##### use netcat if your have problems with the stream_socket-tcp-connection
+## package netcat must be installed
+ $usenetcat=0;
+
+
###### showgnuplot
# Gnuplot will automatically show the pictures.
# There is no reason any more to deactivate Gnuplot. Values: 0/1
@@ -28,7 +32,7 @@
##### logrotate of hms, ks300, fht
# this is only possible, if the webserver (e.g.wwwrun) has the rights ro write the
- # files from fh1000.pl. If you want that then run fhz1000.pl as wwwrun too.
+ # files from fh1000.pl. If you want that then run fhem.pl as wwwrun too.
# if 'yes' then only the needed lines are in the logfiles, the rest will be deleted.
$logrotate='yes'; # yes/no default='yes'
@@ -42,6 +46,8 @@
$webcamwidth='150'; # the width of the shown picture
$wgetpath="/usr/bin/wget"; # you need the package wget for http, ftp...
$webcam[0]='http://webcam/IMAGE.JPG';
+ $webcam[1]='http://webcam2/IMAGE.JPG';
+ #$webcam[1]='http://www.bostream.nu/hoganas/OutsideTempHistory.gif';
#$webcam[1]='IMAGE.PNG'; # Supported are Webcams with http:// ftp:// ....
# and Images wich must be copied to
/tmp/ @@ -49,14 +55,21 @@ # ... +# Weather # Google-Api. It requires an Internet Connection + $enableweather=1; # show the google-weather? + $weathercity='Giessen'; + $weathercountry='Germany'; + $weatherlang='de'; + #$weatherlang='en'; + ############################################################################################## ## FHZ-DEVICES $show_general=1; #field to type FHZ1000-orders 0/1 Default:1 $show_fs20pulldown=1; #Pull-Down for the FS20 Devices 0/1 Default:1 $show_fhtpulldown=1; #Pull-Down for the FHT-Devices 0/1 Default:1 - - + $show_logpulldown=1; #Pull-Down for Log-files and FS20 (grep fhem.log) + $logsort='| sort -r'; #sort the Log-Output how you want; ############################################################################################## @@ -67,7 +80,7 @@ $fs20maxiconperline=9; # default=9 #room. Write e.g. "attr rolowz room wzo" - #into your fhz1000.cfg and restart fhz1000.pl + #into your fhem.cfg and restart fhem.pl # this will be marked on the FS20-Button. $txtroom=""; # default=""; example: $txtroom="room: "; # room hidden will not be shown @@ -94,12 +107,12 @@ $maxcount='510'; # Maximum count of pixel (from right to left) (Default:460) $XcorrectDate=380; # Text of e.g. Date from the right side (Default:380) $XcorrectMainText=32; # Text of main text from the right side (Default: 32) - $logrotateFHTlines=4800; # automatic Logrotate; $logrotate must be 'yes'. + $logrotateFHTlines=5400; # automatic Logrotate; $logrotate must be 'yes'. # Default:4800 # read docs/logrotate if you want adjust it manually! # otherwise the system will slow down # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) + # from fhem.pl (user = ???) @@ -116,7 +129,7 @@ # read docs/logrotate if you want adjust it manually! # otherwise the system will slow down # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) + # from fhem.pl (user = ???) ############################################################################################## ## KS300-Device @@ -133,7 +146,7 @@ # read docs/logrotate if you want adjust it manually # otherwise the system will slow down # pgm3 (user www-data) needs the rights to write the logs - # from fhz1000.pl (user = ???) + # from fhem.pl (user = ???) ############################################################################################## ## USERDEF @@ -153,7 +166,7 @@ # Field4: 0.0 #... # Field1 must be the date/time-field. Then tell pgm3 with $userdef[x]['valuefield'] (see below) -# the field with the needed value. It is possible to create several graphics with on logfile. +# the field with the needed value. It is possible to create several graphics with one logfile. # Do you want user defined graphics? 1/0 Default: 0 @@ -163,37 +176,37 @@ $UserDefs=0; ## Userdef: 0 # the sortnumbers must be complete. eg. 0 1 2 3 or 2 0 3 1 and so on -$sortnumber=0; +#$sortnumber=0; # No blanks or other special signs!! -$userdef[$sortnumber]['name']='SolarV'; +#$userdef[$sortnumber]['name']='SolarV'; #In which field are the values?? See the example above -$userdef[$sortnumber]['valuefield']=4; +#$userdef[$sortnumber]['valuefield']=4; -#Type of Device [temperature | piri] pgm3 will try to generate a gnuplot picture -$userdef[$sortnumber]['gnuplottype']='temperature'; +#Type of Device [temperature | piri | fs20] pgm3 will try to generate a gnuplot picture +#$userdef[$sortnumber]['gnuplottype']='temperature'; # example, path to the logfile with the entrys like above -$userdef[$sortnumber]['logpath']=$logpath.'/lse_solarV.log'; +#$userdef[$sortnumber]['logpath']=$logpath.'/lse_solarV.log'; -$userdef[$sortnumber]['room']='hidden'; +#$userdef[$sortnumber]['room']='garden'; # Semantic eg. Voltage -$userdef[$sortnumber]['semlong']='Voltage'; +#$userdef[$sortnumber]['semlong']='Voltage'; # Semantic short e.g. V -$userdef[$sortnumber]['semshort']='V'; +#$userdef[$sortnumber]['semshort']='V'; #Size of the pictures. Default: 725 -$userdef[$sortnumber]['imagemax']=725; -$userdef[$sortnumber]['imagemay']=52; +#$userdef[$sortnumber]['imagemax']=725; +#$userdef[$sortnumber]['imagemay']=52; # Maximum count of pixel (from right to left) (Default:575) -$userdef[$sortnumber]['maxcount']=575; +#$userdef[$sortnumber]['maxcount']=575; # Text of main text from the right side (Default:) -$userdef[$sortnumber]['XcorrectMainText']=25; +#$userdef[$sortnumber]['XcorrectMainText']=25; # automatic Logrotate; $logrotate must be 'yes'. # Default:2200 @@ -201,32 +214,32 @@ $userdef[$sortnumber]['XcorrectMainText']=25; # otherwise the system will slow down # pgm3 (user www-data) needs the rights to write the logs # of fhem.pl (user = ???) -$userdef[$sortnumber]['logrotatelines']=2200; +#$userdef[$sortnumber]['logrotatelines']=2200; ######################## # example: #define solarpumpe.log FileLog /var/tmp/solarpumpe.log solarpumpe:.*(on|off).* -#$sortnumber=1; -#$userdef[$sortnumber]['name']='PiriO'; -#$userdef[$sortnumber]['name']='SolarPumpe'; -##$userdef[$sortnumber]['valuefield']=3; -#$userdef[$sortnumber]['gnuplottype']='fs20'; -#$userdef[$sortnumber]['logpath']='/var/tmp/solarpumpe.log'; -#$userdef[$sortnumber]['room']='cellar'; -#$userdef[$sortnumber]['semlong']='Solarpumpe'; -#$userdef[$sortnumber]['semshort']=''; -#$userdef[$sortnumber]['imagemax']=725; -#$userdef[$sortnumber]['imagemay']=52; -#$userdef[$sortnumber]['maxcount']=575; -#$userdef[$sortnumber]['XcorrectMainText']=25; -#$userdef[$sortnumber]['logrotatelines']=50; +$sortnumber=0; +$userdef[$sortnumber]['name']='PiriO'; +$userdef[$sortnumber]['name']='SolarPumpe'; +$userdef[$sortnumber]['valuefield']=3; +$userdef[$sortnumber]['gnuplottype']='fs20'; +$userdef[$sortnumber]['logpath']='/mnt/fhz/solarpumpe.log'; +$userdef[$sortnumber]['room']='cellar'; +$userdef[$sortnumber]['semlong']='Solarpumpe'; +$userdef[$sortnumber]['semshort']=''; +$userdef[$sortnumber]['imagemax']=725; +$userdef[$sortnumber]['imagemay']=52; +$userdef[$sortnumber]['maxcount']=575; +$userdef[$sortnumber]['XcorrectMainText']=25; +$userdef[$sortnumber]['logrotatelines']=50; ########################## # example: #define rolu1.log FileLog /var/tmp/rolu1.log rolu1:.*(on|off|dimup|dimdown).* -#$sortnumber=3; +#$sortnumber=2; #$userdef[$sortnumber]['name']='Rolu1'; #$userdef[$sortnumber]['valuefield']=3; #$userdef[$sortnumber]['gnuplottype']='fs20'; @@ -243,20 +256,40 @@ $userdef[$sortnumber]['logrotatelines']=2200; ########################## # example: #define rolu1.log FileLog /var/tmp/rolu1.log rolu1:.*(on|off|dimup|dimdown).* -#$sortnumber=4; -#$userdef[$sortnumber]['name']='allight'; -#$userdef[$sortnumber]['valuefield']=3; -#$userdef[$sortnumber]['gnuplottype']='fs20'; -#$userdef[$sortnumber]['logpath']='/var/tmp/allight.log'; -#$userdef[$sortnumber]['room']='alarm'; -#$userdef[$sortnumber]['semlong']='Alarm light'; -#$userdef[$sortnumber]['semshort']=''; +$sortnumber=1; +$userdef[$sortnumber]['name']='allight'; +$userdef[$sortnumber]['valuefield']=3; +$userdef[$sortnumber]['gnuplottype']='fs20'; +$userdef[$sortnumber]['logpath']='/mnt/fhz/allight.log'; +$userdef[$sortnumber]['room']='alarm'; +$userdef[$sortnumber]['semlong']='Alarm light'; +$userdef[$sortnumber]['semshort']=''; +$userdef[$sortnumber]['imagemax']=725; +$userdef[$sortnumber]['imagemay']=52; +$userdef[$sortnumber]['maxcount']=575; +$userdef[$sortnumber]['XcorrectMainText']=25; +$userdef[$sortnumber]['logrotatelines']=30; +########################## + + +#$sortnumber=2; +#$userdef[$sortnumber]['name']='tARV'; +#$userdef[$sortnumber]['valuefield']=3; +#$userdef[$sortnumber]['gnuplottype']='temperature'; +#$userdef[$sortnumber]['logpath']='/mnt/fhz/t_arv.log'; +##$userdef[$sortnumber]['logpath']='/mnt/fhz/allight.log'; +#$userdef[$sortnumber]['room']='Hautpg'; +#$userdef[$sortnumber]['semlong']='tARV'; +#$userdef[$sortnumber]['semshort']='°C'; #$userdef[$sortnumber]['imagemax']=725; #$userdef[$sortnumber]['imagemay']=52; -#$userdef[$sortnumber]['maxcount']=575; -#$userdef[$sortnumber]['XcorrectMainText']=25; -#$userdef[$sortnumber]['logrotatelines']=30; -########################## +##$userdef[$sortnumber]['maxcount']=575; +#$userdef[$sortnumber]['XcorrectMainText']=25; +#$userdef[$sortnumber]['logrotatelines']=2200; + + + + # example: #define rolu1.log FileLog /var/tmp/rolu1.log rolu1:.*(on|off|dimup|dimdown).* #$sortnumber=5; @@ -287,20 +320,21 @@ $userdef[$sortnumber]['logrotatelines']=2200; ############################################################################################## ## misc $taillog=1; #make shure to have the correct rights. Values: 0/1 - $tailcount=20; #make shure to have the correct rights. Values: 0/1 + $tailcount=30; #make shure to have the correct rights. Values: 0/1 $tailpath="/usr/bin/tail"; $taillogorder=$tailpath." -$tailcount $logpath/fhem.log "; - #$taillogorder=$tailpath." -$tailcount $logpath/fhem-" . date("Y") . "-" . date("m") . ".log "; #if you have e.g. fhem-2009-02.log + #$taillogorder=$tailpath." -$tailcount $logpath/fhem-" . date("Y") . "-" . date("m") . ".log "; #if you have e.g. fhem-2009-02.log - -## show Information at startup. - $showLOGS='no'; #show the LOGS at startup. Default: no Values: yes/no +## show Information at STARTUP. + $showLOGS='no'; #show the entrys of the LOGS in the + #fhem.cfg at startup. Default: no Values: yes/no $showAT='no'; #show the AT_JOBS at startup. Default: yes Values: yes/no $showNOTI='no'; #show the NOTIFICATIONS at startup. Default: no Values: yes/no $showHIST='yes'; #show the HISTORY (if taillog=1) at startup. Default: yes Values: yes/no $showPICS='yes'; #if shwowebcam=1 then initial the Pics will be shown. Default: yes + $showWeath='yes'; # Show weather on startup? $enableweather must 1 $RSStitel='FHEM :-)'; diff --git a/fhem/webfrontend/pgm3/include/fht.php b/fhem/webfrontend/pgm3/include/fht.php index ebf41d2c9..7ee13151a 100755 --- a/fhem/webfrontend/pgm3/include/fht.php +++ b/fhem/webfrontend/pgm3/include/fht.php @@ -14,6 +14,7 @@ setlocale (LC_ALL, 'de_DE.utf8'); $drawfht=$_GET['drawfht']; + $battery=$_GET['battery']; $room=$_GET['room']; $file="$logpath/$drawfht.log"; @@ -206,6 +207,14 @@ setlocale (LC_ALL, 'de_DE.utf8'); $text=$resultreverse[0][0]; ImageTTFText ($im, $fontsize, 0, $imgmaxxfht-127, 13, $txtcolor, $fontttf, $text); + + $fontsize=7; + $text=$battery; + if ($battery == 'none') {$text='Bat: ok';} + else {$text='Bat: low'; $txtcolor=$red;} + ImageTTFText ($im, $fontsize, 0, 165, 10, $txtcolor, $fontttf, $text); + $fontsize=7; + imagePng($im,$savefile); header("Content-type: image/png"); imagePng($im); @@ -223,7 +232,7 @@ function show_error($file,$drawfht,$imgmaxxfht,$imgmaxyfht) ImageFill($im, 0, 0, $bg2p); ImageRectangle($im, 0, 0, $imgmaxxfht-1, $imgmaxyfht-1, $white); imagestring($im, 3, 5, 5, "Error, there is no $file", $black); - imagestring($im, 1, 3, 25, "Please add the following to your fhz1000.cfg", $black); + imagestring($im, 1, 3, 25, "Please add the following to your fhem.cfg", $black); $logname=$drawfht."log"; imagestring($im, 1, 3, 35, "define $logname FileLog $file $drawfht:.*(temp|actuator|desired).*", $black); header("Content-type: image/png"); diff --git a/fhem/webfrontend/pgm3/include/fhtpulldown.php b/fhem/webfrontend/pgm3/include/fhtpulldown.php index 667bf8272..2578521da 100644 --- a/fhem/webfrontend/pgm3/include/fhtpulldown.php +++ b/fhem/webfrontend/pgm3/include/fhtpulldown.php @@ -1,6 +1,6 @@ - FHT: + FHT: - "; + + } +?> diff --git a/fhem/webfrontend/pgm3/index.php b/fhem/webfrontend/pgm3/index.php index abc22edcd..bc2a8ff31 100644 --- a/fhem/webfrontend/pgm3/index.php +++ b/fhem/webfrontend/pgm3/index.php @@ -41,7 +41,7 @@ include "include/gnuplot.php"; include "include/functions.php"; -$pgm3version='091110'; +$pgm3version='091116'; $Action = $_POST['Action']; $order = $_POST['order']; @@ -50,6 +50,7 @@ $pgm3version='091110'; $kstyp = $_POST['kstyp']; $showroom = $_POST['showroom']; $showmenu = $_POST['showmenu']; + $showweath = $_POST['showweath']; $showhmsgnu = $_POST['showhmsgnu']; $showuserdefgnu = $_POST['showuserdefgnu']; $temp = $_POST['temp']; @@ -84,6 +85,10 @@ $pgm3version='091110'; if ($showfht=="") unset($showfht); if ($showfht=="none") unset($showfht); + if (! isset($showweath)) $showweath=$_GET['showweath']; + if ($showweath=="") unset($showweath); + if ($showweath=="none") unset($showweath); + if (! isset($showmenu)) $showmenu=$_GET['showmenu']; if ($showmenu=="") unset($showmenu); if ($showmenu=="none") unset($showmenu); @@ -146,12 +151,13 @@ $pgm3version='091110'; if ($showNOTI=='yes') $shownoti='yes'; if ($showHIST=='yes') $showhist='yes'; if ($showPICS=='yes') $showpics='yes'; + if ($showWeath=='yes') $showweath='1'; } if (isset ($showfht)) { $forwardurl=$forwardurl.'&showfht='.$showfht;}; if (isset ($fs20dev)) - { $forwardurl=$forwardurl.'&fs20dev='.$fs20dev.'&orderpulldown='.$orderpulldown.'&showmenu='.$showmenu.'&showroom='.$showroom;}; + { $forwardurl=$forwardurl.'&fs20dev='.$fs20dev.'&orderpulldown='.$orderpulldown.'&showmenu='.$showmenu.'&showroom='.$showroom.'&showweath'.$showweath;}; if (isset ($showks)) { $forwardurl=$forwardurl.'&showks='.$showks.'&kstyp='.$kstyp;}; if (isset ($showhmsgnu)) { $forwardurl=$forwardurl.'&showhmsgnu='.$showhmsgnu;}; if (isset ($showuserdefgnu)) { $forwardurl=$forwardurl.'&showuserdefgnu='.$showuserdefgnu;}; @@ -162,6 +168,7 @@ $pgm3version='091110'; if (isset ($showpics)) { $forwardurl=$forwardurl.'&showpics';}; if (isset ($showhist)) { $forwardurl=$forwardurl.'&showhist';}; if (isset ($showfs20)) { $forwardurl=$forwardurl.'&showfs20='.$showfs20;}; + if (isset ($showweath)) { $forwardurl=$forwardurl.'&showweath='.$showweath;}; if (isset ($showmenu)) { $forwardurl=$forwardurl.'&fs20dev='.$fs20dev.'&orderpulldown='.$orderpulldown.'&valuetime='.$valuetime.'&showmenu='.$showmenu.'&showroom='.$showroom;} unset($link); @@ -170,6 +177,7 @@ $pgm3version='091110'; if (isset ($showhist)) $link=$link.'&showhist'; if (isset ($showat)) $link=$link.'&showat'; if (isset ($showmenu)) $link=$link.'&showmenu='.$showmenu; + if (isset ($showweath)) $link=$link.'&showweath='.$showweath; if (isset ($showfht)) $link=$link.'&showfht='.$showfht; if (isset ($showhmsgnu)) $link=$link.'&showhmsgnu='.$showhmsgnu; if (isset ($showuserdefgnu)) $link=$link.'&showuserdefgnu='.$showuserdefgnu; @@ -183,7 +191,7 @@ switch ($Action): { $order=str_replace("\\","",$order); $order=str_replace("@","+",$order); - execFHZ($order,$fhz1000,$fhz1000port); + execFHZ($order,$fhem,$fhemport); } header("Location: $forwardurl&errormessage=$errormessage"); break; @@ -191,17 +199,17 @@ switch ($Action): if ($atorder=='at') { $atorder='define '.randdefine().' '.$atorder; } $order="$atorder $attime set $fs20dev $orderpulldown $valuetime"; - if ($kioskmode=='off') execFHZ($order,$fhz1000,$fhz1000port); + if ($kioskmode=='off') execFHZ($order,$fhem,$fhemport); header("Location: $forwardurl"); Case exec3: if ($atorder=='at') { $atorder='define '.randdefine().' '.$atorder; } if (! isset($fhtdev)) {echo "FHT-Device not set - exit"; break;} $order="$atorder $attime set $fhtdev $orderpulldown $valuetime"; - if ($kioskmode=='off') execFHZ($order,$fhz1000,$fhz1000port); + if ($kioskmode=='off') execFHZ($order,$fhem,$fhemport); Case execfht: $order="set $dofht desired-temp $temp"; - if ($kioskmode=='off') execFHZ($order,$fhz1000,$fhz1000port); + if ($kioskmode=='off') execFHZ($order,$fhem,$fhemport); header("Location: $forwardurl"); break; Case showfht|showroom|showks|showhmsgnu|hide|showuserdefgnu|showpics: @@ -220,26 +228,39 @@ function execFHZ($order,$machine,$port) { global $errormessage; -$version = explode('.', phpversion()); -if ( $version[0] == 4 ) -{ - include "config.php"; - $order="$fhz1000_pl $port '$order'"; #PHP4, only localhost +#PHP4 is not supported any more 20091115 +#$version = explode('.', phpversion()); + +#if ( $version[0] == 4 ) +#{ +# include "config.php"; +# $order="$fhem_pl $port '$order'"; #PHP4, only localhost +# exec($order,$res); +# $errormessage = $res[0]; +#}# +#else +#{ +if ($usenetcat=='1') + { + $order="$echo xmllist | netcat -w3 $machine $port"; exec($order,$res); $errormessage = $res[0]; -} -else -{ -$fp = stream_socket_client("tcp://$machine:$port", $errno, $errstr, 30); - if (!$fp) { + } + else + { + $fp = stream_socket_client("tcp://$machine:$port", $errno, $errstr, 30); + if (!$fp) { echo "$errstr ($errno)FS20: + FS20:
\n"; } else { fwrite($fp, "$order\n;quit\n"); - $errormessage= fgets($fp, 1024); + #$errormessage= fgets($fp, 1024); + #$errormessage= fgets($fp, 65535); + $errormessage= fgets($fp); fclose($fp); } -} + } +#} return $errormessage; } @@ -249,19 +270,19 @@ return $errormessage; unset($output); $stack = array(); $output=array(); - +unset($longxml); $version = explode('.', phpversion()); if ( $version[0] == 4 ) { - $xmllist="$fhz1000_pl $fhz1000port xmllist"; + $xmllist="$fhem_pl $fhemport xmllist"; exec($xmllist,$output); } else { - $fp = stream_socket_client("tcp://$fhz1000:$fhz1000port", $errno, $errstr, 30); + $fp = stream_socket_client("tcp://$fhem:$fhemport", $errno, $errstr, 30); if (!$fp) { echo "$errstr ($errno)
\n"; } else { @@ -273,8 +294,7 @@ else fclose($fp); } } -#print_r($output); -#exit; + @@ -327,11 +347,19 @@ foreach($output as $data) { xml_parser_free($xml_parser); -#searching for rooms/fs20 + + + + +#print_r($stack); +#exit; + + +#searching for rooms/fs20/Logpaths $rooms=array(); $fs20devs=array(); $fhtdevs=array(); - if ($showroombuttons==1) + $logpaths=array(); for($i=0; $i < count($stack[0][children]); $i++) { if ((substr($stack[0][children][$i][name],0,5)=='FS20_') @@ -355,6 +383,11 @@ xml_parser_free($xml_parser); if ((! in_array($fs20devxml,$fs20devs)) AND ( $room != 'hidden')) array_push($fs20devs,$fs20devxml); } }#FS20 + + +#################################################### FHTs + + elseif (substr($stack[0][children][$i][name],0,4)=='FHT_') { for($j=0; $j < count($stack[0][children][$i][children]); $j++) @@ -372,6 +405,13 @@ xml_parser_free($xml_parser); if ((! in_array($fhtdevxml,$fhtdevs)) AND ( $room != 'hidden')) array_push($fhtdevs,$fhtdevxml); } } #FHT + + + +#################################################### HMS + + + elseif (substr($stack[0][children][$i][name],0,4)=='HMS_') { for($j=0; $j < count($stack[0][children][$i][children]); $j++) @@ -385,6 +425,48 @@ xml_parser_free($xml_parser); } } } # HMS + +#################################################### LogpathFileLOG + + + elseif (substr($stack[0][children][$i][name],0,8)=='FileLog_') + { + for($j=0; $j < count($stack[0][children][$i][children]); $j++) + { + for($k=0; $k < count($stack[0][children][$i][children][$j][children]); $k++) + { + if ( $stack[0][children][$i][children][$j][children][$k][attrs][key]=="currentlogfile") + {$logpathstack=$stack[0][children][$i][children][$j][children][$k][attrs][value]; + if (! in_array($logpathistack,$logpaths)) array_push($logpaths,$logpathstack); + } + } + } + } # FileLog + + + +#################################################### INTERNAL Logpath + + + elseif (substr($stack[0][children][$i][name],0,9)=='_internal') + { + for($j=0; $j < count($stack[0][children][$i][children]); $j++) + { + for($k=0; $k < count($stack[0][children][$i][children][$j][children]); $k++) + { + if ( $stack[0][children][$i][children][$j][children][$k][attrs][key]=="currentlogfile") + {$fhemlog=$stack[0][children][$i][children][$j][children][$k][attrs][value]; + if (! in_array($fhemlog,$logpaths)) array_push($logpaths,$fhemlog); + } + } + } + } # _internal_ + + + +#################################################### SCIVT + + elseif (substr($stack[0][children][$i][name],0,6)=='SCIVT_') { for($j=0; $j < count($stack[0][children][$i][children]); $j++) @@ -398,6 +480,11 @@ xml_parser_free($xml_parser); } } } # SCIVT + + + +#################################################### SCIVT + elseif (substr($stack[0][children][$i][name],0,6)=='KS300_') { for($j=0; $j < count($stack[0][children][$i][children]); $j++) @@ -416,7 +503,7 @@ xml_parser_free($xml_parser); } } } - } # end searching rooms in the array from fhem + } # end searching rooms /logpaths in the array from fhem # user defined rooms? if ($UserDefs==1) { @@ -431,10 +518,14 @@ xml_parser_free($xml_parser); array_push($rooms,'ALL'); sort($rooms); + + + #print_r($rooms); echo "Count: $countrooms"; exit; #print_r($fs20devs); exit; #echo count($stack[0][children]);exit; - +#print_r($logpaths); exit; +#exit; @@ -457,6 +548,8 @@ xml_parser_free($xml_parser); + +$titel "; @@ -530,15 +623,36 @@ xml_parser_free($xml_parser); "; }; - ############################ FHZ + + + + + ############################ WEATHER + if ($enableweather==1) + { + echo "+
"; + echo "WEATHER "; + if ($showweath != '1') + { echo "show";} + else + { echo "hide";} + + echo "
"; echo "FHZ_DEVICE "; if ($showmenu != '1') - { echo "show menu";} + { echo "show";} else - { echo "hide menu";} + { echo "hide";} echo " - "; @@ -730,6 +853,9 @@ xml_parser_free($xml_parser); $room=""; for($k=0; $k < count($stack[0][children][$i][children][$j][children]); $k++) { + if ( $stack[0][children][$i][children][$j][children][$k][attrs][key]=="battery") + {$battery=$stack[0][children][$i][children][$j][children][$k][attrs][value]; + } if ( $stack[0][children][$i][children][$j][children][$k][attrs][key]=="room") {$room=$stack[0][children][$i][children][$j][children][$k][attrs][value]; } @@ -747,6 +873,7 @@ xml_parser_free($xml_parser);General: -+ General: +adjust "; @@ -690,7 +813,7 @@ xml_parser_free($xml_parser); }; echo "- "; echo "+
"; @@ -754,7 +881,7 @@ xml_parser_free($xml_parser); else {echo " ";} - echo " "; if ($showhmsgnu == $HMSdev and $showgnuplot == 1) { drawgnuplot($HMSdev,$type,$gnuplot,$pictype,$logpath,0,0); @@ -868,7 +995,7 @@ xml_parser_free($xml_parser); } } $name=$stack[0][children][$i][children][$j][attrs][name]; - echo "
Log: + echo "Log: $value / $name Notification: $value / $name Notification: $value / $name AT-Job: del $value / $next / $command AT-Job: del $value / $next / $command + echo " "; + "; echo " History $data History $data
-
+