minor fix in gnuplot.php. Webcam hideable.

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

fhem/webfrontend/pgm3/CHANGED

@@ -165,3 +165,7 @@ It is not necessary to tell fhem that there are other logs.
  -- Feature: HMS-CO supported (Peter A.) ==> hms100.php
  -- Feature: Webcams or local pictures added ==>index.php. config.php
  -- Feature: ks300 mit Drewpoint (Boris) ==>functions.php, ks300.php, config.php
+
+2007-12-24 (071224)
+ -- Bugfix: UserDef with type "temperature" now with y1tics ==> gnuplot.php
+ -- Feature: Webcam/Pics now hideable ==> index.php, config.php

fhem/webfrontend/pgm3/HISTORY

@@ -65,3 +65,7 @@
  -- Feature: HMS-CO supported (Peter A.)
  -- Feature: Webcams or local pictures added
  -- Feature: ks300 mit Drewpoint (Boris)
+
+- Martin 2007-12-24
+ -- Bugfix: Userdef-Gnuplot with type temperature now with y1tics
+ -- Feature: Webcam/Pics hideable

fhem/webfrontend/pgm3/config.php

@@ -297,7 +297,8 @@ $userdef[$sortnumber]['logrotatelines']=2200;
 	$showLOGS='no';			#show the LOGS 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
+	$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 
 
         $RSStitel='FHEM :-)';
 

fhem/webfrontend/pgm3/include/gnuplot.php

@@ -146,7 +146,6 @@ EOD;
 $gplotmain=<<<EOD
 \n set ylabel '$SemanticLong ( $SemanticShort )'  
 set size 1,0.5
-set noytics 
 set noy2tics 
 plot "$logfile" using 1:$valuefield axes x1y1 title '$SemanticLong' with lines lw 2
 EOD;

fhem/webfrontend/pgm3/index.php

@@ -6,7 +6,7 @@
 #
 #  Copyright notice
 #
-#  (c) 2006 Copyright: Martin Haas (fhz@martin-haas.de)
+#  (c) 2006 2007 2008 Copyright: Martin Haas (fhz@martin-haas.de)
 #  All rights reserved
 #
 #  This script is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ include "include/gnuplot.php";
 include "include/functions.php";
 
 
-$pgm3version='071221';
+$pgm3version='071224';
 
 	
 	$Action		=	$_POST['Action'];
@@ -130,6 +130,9 @@ $pgm3version='071221';
 
 	if (! isset($errormessage)) $errormessage=$_GET['errormessage'];
 	if ($errormessage=="") unset($errormessage);
+	
+	if (! isset($showpics)) $showpics=$_GET['showpics'];
+	if ($showpics=="none") unset($showpics);
 
 
 
@@ -143,6 +146,7 @@ $pgm3version='071221';
 		if ($showLOGS=='yes') $showlogs='yes';
 		if ($showNOTI=='yes') $shownoti='yes';
 		if ($showHIST=='yes') $showhist='yes';
+		if ($showPICS=='yes') $showpics='yes';
 	}
 
 
@@ -156,6 +160,7 @@ $pgm3version='071221';
 	if (isset ($shownoti)) { $forwardurl=$forwardurl.'&shownoti';};
 	if (isset ($showlogs)) { $forwardurl=$forwardurl.'&showlogs';};
 	if (isset ($showat)) { $forwardurl=$forwardurl.'&showat';};
+	if (isset ($showpics)) { $forwardurl=$forwardurl.'&showpics';};
 	if (isset ($showhist)) { $forwardurl=$forwardurl.'&showhist';};
 	if (isset ($showfs20)) { $forwardurl=$forwardurl.'&showfs20='.$showfs20;};
 	if (isset ($showmenu)) 
@@ -170,6 +175,7 @@ $pgm3version='071221';
 	if (isset ($showhmsgnu)) $link=$link.'&showhmsgnu='.$showhmsgnu; 
 	if (isset ($showuserdefgnu)) $link=$link.'&showuserdefgnu='.$showuserdefgnu; 
 	if (isset ($showks)) $link=$link.'&showks='.$showks; 
+	if (isset ($showpics)) $link=$link.'&showpics'; 
 
 
 switch ($Action):
@@ -198,7 +204,7 @@ switch ($Action):
 		if ($kioskmode=='off') execFHZ($order,$fhz1000,$fhz1000port);
 		header("Location:  $forwardurl");
 		break;
-	Case showfht|showroom|showks|showhmsgnu|hide|showuserdefgnu:
+	Case showfht|showroom|showks|showhmsgnu|hide|showuserdefgnu|showpics:
 		header("Location: $forwardurl");
 		break;
 	default:
@@ -480,11 +486,18 @@ xml_parser_free($xml_parser);
                 <td $bg1 colspan=4><font $fontcolor1>
                 <table  cellspacing='0' cellpadding='0' width='100%'>
                         <tr>
-                        <td>
+                        <td><font $fontcolor1> WEBCAM </font>";
-                        <font $fontcolor1>WEBCAM</font>
+		 if (! isset($showpics))
-                        </td>
+                 { echo "<a href=$formwardurl?showpics$link>show pics</a>";}
+                else
+                { echo "<a href=$formwardurl?$link&showpics=none>hide pics</a>";}
+
+                        
+   	    echo"	</td>
                         <td align=right>
 	    ";
+	    if (isset($showpics))
+	    {
 	    for($i=0; $i < count($webcam); $i++)
             {  
 		$webcam1=$webcam[$i];
@@ -504,6 +517,7 @@ xml_parser_free($xml_parser);
 		}
 	 	echo"<a href='tmp/$webcamname'><img src='tmp/$webcamname' width='$webcamwidth' border=2></a>";
 	     }   
+	     }
 	     echo"
 			</td>
 			</tr>