From e6fcd9804687bcc3e0497b087ba23d05c285ceb2 Mon Sep 17 00:00:00 2001
From: martinhaas <>
Date: Thu, 26 Mar 2009 12:19:03 +0000
Subject: [PATCH] pgm3: bugfix: format table of userdef. taillogorder with
 date, X10_

git-svn-id: https://svn.fhem.de/fhem/trunk@358 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/HISTORY                      | 4 ++++
 fhem/webfrontend/pgm3/CHANGED     | 3 +++
 fhem/webfrontend/pgm3/HISTORY     | 4 ++++
 fhem/webfrontend/pgm3/config.php  | 2 ++
 fhem/webfrontend/pgm3/docs/README | 3 +++
 fhem/webfrontend/pgm3/index.php   | 9 +++++----
 6 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/fhem/HISTORY b/fhem/HISTORY
index bfa63f1ad..973ff854c 100644
--- a/fhem/HISTORY
+++ b/fhem/HISTORY
@@ -392,4 +392,8 @@
   - added counter differential per time in 81_M232Counter.pm, commandref.html
     updated
 
+- Thu Mar 29 2009 (MartinH)
+  - pgm3: bugfix, format table for userdef
+  - pgm3: feature X10_support, taillogorder optional with date
+  
 
diff --git a/fhem/webfrontend/pgm3/CHANGED b/fhem/webfrontend/pgm3/CHANGED
index 679229a62..74ad77339 100644
--- a/fhem/webfrontend/pgm3/CHANGED
+++ b/fhem/webfrontend/pgm3/CHANGED
@@ -179,3 +179,6 @@ It is not necessary to tell fhem that there are other logs.
 
 2008-04-13
    -- Bugfix: FHT: lime-protection not more in the field of actuator: Small Changes in fht.php
+
+2009-03-26
+   -- Bugfix: table-format for userdefs changed
diff --git a/fhem/webfrontend/pgm3/HISTORY b/fhem/webfrontend/pgm3/HISTORY
index 6efc0b29a..a1944bbe1 100644
--- a/fhem/webfrontend/pgm3/HISTORY
+++ b/fhem/webfrontend/pgm3/HISTORY
@@ -78,3 +78,7 @@
 
 - Martin 2008-14-13
  -- Bugfix: FHT: lime-protection not more in the field of actuator
+
+- Martin 2009-03-2
+  -- Bugfix: table-format for userdefs changed
+  -- Feature: taillogor der optional with date (config.php)
diff --git a/fhem/webfrontend/pgm3/config.php b/fhem/webfrontend/pgm3/config.php
index b92093753..84989b639 100644
--- a/fhem/webfrontend/pgm3/config.php
+++ b/fhem/webfrontend/pgm3/config.php
@@ -290,6 +290,8 @@ $userdef[$sortnumber]['logrotatelines']=2200;
 	$tailcount=20; 			#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
+
 
 
 
diff --git a/fhem/webfrontend/pgm3/docs/README b/fhem/webfrontend/pgm3/docs/README
index 23b92cf54..c7e47f067 100644
--- a/fhem/webfrontend/pgm3/docs/README
+++ b/fhem/webfrontend/pgm3/docs/README
@@ -1,6 +1,9 @@
 Be sure that the directory <pgm3>/tmp is writeable for the user of the webserver (e.g. wwwrun.www)
 Make something like "chown -R wwwrun.www tmp"
 
+
+Hint: you need the package php-gd to see the graphics
+
 All the other  Documentation of pgm3 is now only online
 http://www.martin-haas.de/fhz
 
diff --git a/fhem/webfrontend/pgm3/index.php b/fhem/webfrontend/pgm3/index.php
index 998bc0c98..49c2245a2 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='080413';
+$pgm3version='090326';
 
 	
 	$Action		=	$_POST['Action'];
@@ -334,7 +334,8 @@ xml_parser_free($xml_parser);
       if ($showroombuttons==1)
 	for($i=0; $i < count($stack[0][children]); $i++) 
 	{
-	      if ( (substr($stack[0][children][$i][name],0,5)=='FS20_') || (substr($stack[0][children][$i][name],0,4)=='X10_'))
+	      if ((substr($stack[0][children][$i][name],0,5)=='FS20_') 
+		  || (substr($stack[0][children][$i][name],0,4)=='X10_'))
 	      {
 		 	for($j=0; $j < count($stack[0][children][$i][children]); $j++)
 			 {
@@ -599,7 +600,7 @@ xml_parser_free($xml_parser);
 	for($i=0; $i < count($stack[0][children]); $i++) 
 	{
 	############################
-	      if ((substr($stack[0][children][$i][name],0,5)=='FS20_')||(substr($stack[0][children][$i][name],0,4)=='X10_'))
+	      if ((substr($stack[0][children][$i][name],0,5)=='FS20_') || (substr( $stack[0][children][$i][name],0,4)=='X10_'))
 	      {
 			$type=$stack[0][children][$i][name];
 			echo "<tr><td $bg1 colspan=4><font $fontcolor1>";
@@ -955,7 +956,7 @@ xml_parser_free($xml_parser);
                  {
                         if ($showuserdefgnu== $UserDef) {$formvalue="hide";$gnuvalue="";}
                         else {$formvalue="show";$gnuvalue=$UserDef;};
-                        echo "<tr valign=center><td align=center $bg2 valign=center>
+                        echo "<tr valign=center><td align=center $bg2 valign=center colspan=2>
                                        <form action=$forwardurl method='POST'>
                                        <input type=hidden name=Action value=showuserdefgnu>
                                         <input type=hidden name=showroom value=$showroom>