diff --git a/webfrontend/pgm3/CHANGED b/webfrontend/pgm3/CHANGED index c5017b7f6..613a29514 100644 --- a/webfrontend/pgm3/CHANGED +++ b/webfrontend/pgm3/CHANGED @@ -133,3 +133,6 @@ It is not necessary to tell fhem that there are other logs. 2007-10-16 (CVS) -- feature: User defined graphics now for Piri and FS20 too. Everthing is explained in the config.php. + +2007-10-18 (CVS) +-- feature: User defined graphics for FS20 now with a full picture. diff --git a/webfrontend/pgm3/HISTORY b/webfrontend/pgm3/HISTORY index 00619bbe7..bcd555ac6 100644 --- a/webfrontend/pgm3/HISTORY +++ b/webfrontend/pgm3/HISTORY @@ -32,3 +32,5 @@ - User defined logs with several values in one file now supported. Changes in index.php, gnuplot.php, userdefs.php and config.php. - Martin 2007-10-16 - User defined graphics now for Piri an FS20 too +- Martin 2007-10-18 + - User defined graphics for FS20 improved ("full" picture) diff --git a/webfrontend/pgm3/include/userdefs.php b/webfrontend/pgm3/include/userdefs.php index 3ee57fe71..646a4dc7d 100755 --- a/webfrontend/pgm3/include/userdefs.php +++ b/webfrontend/pgm3/include/userdefs.php @@ -11,15 +11,6 @@ include "../config.php"; include "functions.php"; -#function normalize($piriarray) -#{ -# print_r($piriarray); -# exit; - -# -#} - - $userdefnr=$_GET['userdefnr']; $room=$userdef[$userdefnr]['room']; @@ -39,7 +30,6 @@ include "functions.php"; - #if (! in_array($type,$supported_USERDEF)) show_error_type($imgmaxxuserdef,$imgmaxyuserdef,$type); if (! file_exists($file)) show_error($file,$drawuserdef,$imgmaxxuserdef,$imgmaxyuserdef,$type,$userdefnr); $_SESSION["arraydata"] = array(); @@ -101,7 +91,6 @@ include "functions.php"; } } -# normalize($_SESSION["arraydata"]); $resultreverse = array_reverse($_SESSION["arraydata"]); $xold=$imgmaxxuserdef; @@ -166,9 +155,23 @@ switch ($gnuplottype): EOD; break; Case 'fs20': + $actdate= date("Y-m-d_H:i:s"); + $newlastline=$actdate." ".$f2." ".$f3." ".$f4." ".$f5." ".$f6; + array_push( $array ,$newlastline); + $filename=substr($file,strrpos($file, '/')+1); + $filename='../tmp/'.$filename.'.tmp'; + $f1=fopen("$filename","w"); + for ($x = 0; $x <= count($array); $x++) + { + fputs($f1,$array[$x]); + } + fputs($f1,"\n"); + fclose($f1); + + $messageB=<<