V0.8.2 with minor changes

git-svn-id: https://svn.fhem.de/fhem/trunk@87 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/webfrontend/pgm3/CHANGED

@@ -115,3 +115,8 @@ Changelog
 
 2007-06-13 (0.8.1)
 -- Bugfix: Section FHZ_DEVICE is now hidden if you dont want neither Pulldowns nor General.
+
+2007-09-04 (0.8.2)
+-- bugfix: HMS100WD is now aligned with other HMS-Devices
+-- feature: Now there is a warning if there are not sufficient data to draw a gnuplot graph
+-- feature: more information about new HMS-Devices

fhem/webfrontend/pgm3/HISTORY

@@ -19,3 +19,6 @@
  
 - Martin 2007-07-13
   - Section FHZ-DEVICES s now hidden if it is not needed
+
+- Martin 2007-09-04
+  - Small changes in gnuplot.php, config.php, index.php, hms100.php

fhem/webfrontend/pgm3/config.php

@@ -27,7 +27,7 @@
 	# 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.
 	# if 'yes' then only the needed lines are in the logfiles, the rest will be deleted.
-	$logrotate='yes';	# yes/no default='no'
+	$logrotate='no';	# yes/no default='no'
 
 
 ## Kioskmode. Only show but don't switch anything. Values: on/off
@@ -51,6 +51,7 @@
         $imgmaxyfs20=85; 		# default=85 
 	$fs20fontsizetitel=10;  	# default=10 
 	$fs20maxiconperline=9; 	# default=9
+
 					#room. Write e.g. "attr rolowz room wzo" 
 					#into your fhz1000.cfg and restart fhz1000.pl
 					# this will be marked on the FS20-Button. 
@@ -62,7 +63,7 @@
 	$showroombuttons=1; 		#default 1  Values 0/1
 	$imgmaxxroom=$imgmaxxfs20;  	#Size of the pictures, default=$imgmaxxfs20
         $imgmaxyroom=30; 		# default=30 
-	$roomfontsizetitel=10;  	# default=9
+	$roomfontsizetitel=9;  	# default=9
 	$roommaxiconperline=$fs20maxiconperline; # default=$fs20maxiconperline
 
 ##############################################################################################
@@ -122,13 +123,14 @@
 ##############################################################################################
 ## misc
 	$taillog=1; 			#make shure to have the correct rights. Values: 0/1
-	$taillogorder="/usr/bin/tail -20 $logpath/fhem.log"; 
+	$tailcount=20; 			#make shure to have the correct rights. Values: 0/1
+	$taillogorder="/usr/bin/tail -$tailcount $logpath/fhem.log ";
 
 
 
 ## show Information at startup. 
 	$showLOGS='no';			#show the LOGS at startup. Default: no Values: yes/no
-	$showAT='yes';			#show the AT_JOBS at startup. Default: yes Values: yes/no
+	$showAT='no';			#show the AT_JOBS at startup. Default: no 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
 
@@ -137,6 +139,7 @@
 	$urlreload=90;			# Automatic reloading page [sec]. Default fast: 60 slow:90
 	$titel="PHP-Webmachine for fhem :-)"; #feel free to create an own title
 	$timeformat="Y-m-d H:i:s";
+	$winsize=800;			# width of the pgm3
 	$bodybg="bgcolor='#F5F5F5'"; 
 	$bg1="bgcolor='#6E94B7'";
 	$bg2="bgcolor='#AFC6DB'";

fhem/webfrontend/pgm3/include/gnuplot.php

@@ -120,6 +120,9 @@ $f2=fopen("tmp/gnu2","w");
 fputs($f2,$message);
 fclose($f2);
 exec("$gnuplot tmp/gnu2",$output);
+$FOUT='tmp/'.$gnudraw1.'.'.$pictype;
+$FS=filesize($FOUT);
+if ($FS == '0')echo "Warning, there are not all required data in the logfile of $gnudraw to create a graph (e.g. actuator, desired-temp...).";
 
 
 };

fhem/webfrontend/pgm3/include/hms100.php

@@ -357,6 +357,7 @@ function show_error_type($imgmaxx,$imgmaxy,$type)
 	include "../config.php";
 	$bg3p = ImageColorAllocate($im, $fontcol_grap_R,$fontcol_grap_G,$fontcol_grap_B);
  	$text="HMS-Device $type is not supported";
+	if ($type=="HMS_LIST") $text="Waiting for the first message from the HMS-Device...";
         $fontsize=7;
         $txtcolor=$bg3p;
         ImageTTFText ($im, $fontsize, 0, 5, 12, $txtcolor, $fontttf, $text);

fhem/webfrontend/pgm3/index.php

@@ -1,6 +1,6 @@
 <?php
 
-#### pgm3 -- a PHP-webfrontend for fhz1000.pl 
+#### pgm3 -- a PHP-webfrontend for fhem.pl 
 
 ################################################################
 #
@@ -40,7 +40,7 @@ include "include/gnuplot.php";
 include "include/functions.php";
 
 
-$pgm3version='0.8.1';
+$pgm3version='0.8.2';
 
 	
 	$Action		=	$_POST['Action'];
@@ -191,7 +191,7 @@ if (! isset($showroom)) $showroom="ALL";
 if ($taillog==1) exec($taillogorder,$tailoutput);
 
 
-#executes over the network to the fhz1000.pl (or localhost)
+#executes over the network to the fhem.pl (or localhost)
 function execFHZ($order,$machine,$port)
 {
 global $errormessage;
@@ -219,6 +219,18 @@ $fp = stream_socket_client("tcp://$machine:$port", $errno, $errstr, 30);
 return $errormessage;
 }
 
+###### write the header on screen
+ echo "
+         <html>
+	 <head>
+	 <meta http-equiv='refresh' content='$urlreload; URL=$forwardurl'>
+	 <meta http-equiv='pragma' content='no-cache'>
+	 <meta http-equiv='Cache-Control' content='no-cache'>
+ 	 <link rel='shortcut icon' href='include/fs20.ico' >
+	 <title>$titel</title>";
+ 	  include ("include/style.css");	 
+ echo "	 </head>";
+
 
 ###### make an array from the xmllist
 unset($output);
@@ -247,8 +259,8 @@ else
 	   fclose($fp);
 	}
 }
-
+#print_r($output);
-#workaround for older fhz1000-Versions
+#exit;
 
 
 
@@ -300,9 +312,6 @@ foreach($output as $data) {
 
 xml_parser_free($xml_parser);
 
-#for testing
-#print_r($stack);exit;
-
 
 #searching for rooms/fs20
 	$rooms=array();
@@ -391,21 +400,11 @@ xml_parser_free($xml_parser);
 
  $now=date($timeformat);
 
- echo "
-         <html>
-	 <head>
-	 <meta http-equiv='refresh' content='$urlreload; URL=$forwardurl'>
-	 <meta http-equiv='pragma' content='no-cache'>
-	 <meta http-equiv='Cache-Control' content='no-cache'>
- 	 <link rel='shortcut icon' href='include/fs20.ico' >
-	 <title>$titel</title>";
- 	  include ("include/style.css");	 
- echo "	 </head>";
 
  echo"      <body $bodybg>
 	$errormessage
-	<table width='800' cellspacing='1' cellpadding='10' border='0' $bgcolor1><tr><td></td></tr></table>
+	<table width='$winsize' cellspacing='1' cellpadding='10' border='0' $bgcolor1><tr><td></td></tr></table>
-	<table width='800' cellspacing='1' cellpadding='0' border='0' align='CENTER' $bg4>
+	<table width='$winsize' cellspacing='1' cellpadding='0' border='0' align='CENTER' $bg4>
 	  <tr> 
 	      <td bgcolor='#6394BD' width='100%'> 
 	      <table bgcolor='#FFFFFF' width='100%' cellspacing='0' cellpadding='0' border='0'>
@@ -631,7 +630,7 @@ xml_parser_free($xml_parser);
 				
 			}
 			else
-		 	{echo "<tr><td $bg2 colspan=3>";}
+		 	{echo "<tr><td $bg2><td $bg2 colspan=2> ";}
 		       	
 			echo "<img src='include/hms100.php?drawhms=$HMSdev&room=$room&type=$type' width='$imgmaxxhms' height='$imgmaxyhms'></td> </tr>";