From e3f5128c583c757302b5cae417e29300da9003a7 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Fri, 4 Mar 2011 06:48:28 +0000
Subject: [PATCH] dupTimeout

git-svn-id: https://svn.fhem.de/fhem/trunk@847 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/docs/commandref.html | 24 +++++++++++++++++-------
 fhem/fhem.pl              |  6 +++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/fhem/docs/commandref.html b/fhem/docs/commandref.html
index ac442633f..47e221f0e 100644
--- a/fhem/docs/commandref.html
+++ b/fhem/docs/commandref.html
@@ -957,6 +957,12 @@ A line ending with \ will be concatenated with the next one, so long lines
         Recommended level is 3 for normal use.
     </li><br>
 
+    <a name="dupInterval"></a>
+    <li>dupTimeout<br>
+        Define the timeout for which 2 identical events from two different
+        receiver are considered a duplicate. Default is 0.5 seconds.
+    </li><br>
+
   </ul>
 </ul>
 
@@ -5482,9 +5488,9 @@ Terminating
 <h3>FHEMWEB</h3>
 <ul>
   FHEMWEB is the builtin web-frontend (webpgm2). It implements a simple web
-  server, so no additional program is needed. However, if HTTPS is desired,
-  FHEMWEB must be configured to run behind a webserver (e.g. apache) which
-  translates the HTTPS from the outside to HTTP for FHEMWEB.<br> <br>
+  server (optionally with Basic-Auth and HTTPS), so no additional program is
+  needed. 
+  <br> <br>
 
   <a name="FHEMWEBdefine"></a>
   <b>Define</b>
@@ -5569,11 +5575,14 @@ Terminating
 
     <a name="smallscreen"></a>
     <li>smallscreen<br/>
-        Optimize for small screen size, e.g. smartphones.
+        Optimize for small screen size, e.g. smartphones.<br>
         Note: The default configuration installed with make install-pgm2
         installs 2 FHEMWEB instances: port 8083 for desktop browsers and
-        port 8084 for smallscreen browsers. <b>Note:</b>After viewing the
-        site on the iPhone in Safari, try to add it to the home-screen.
+        port 8084 for smallscreen browsers, both using SVG rendering. As
+        Android does not support SVG at the moment, change plotmode to
+        gnuplot-scroll.<br>
+        WebApp suppport: After viewing the site on the iPhone or iPad in
+        Safari, add it to the home-screen to get full-screen support.
         </li><br>
 
     <a name="nofork"></a>
@@ -5587,6 +5596,7 @@ Terminating
         request a username/password authentication for access. You have to set
         the basicAuth attribute to the Base64 encoded value of
         &lt;user&gt;:&lt;password&gt;, e.g.:<ul>
+        # Calculate first the encoded string with the commandline program<br>
         $ echo -n fhemuser:secret | base64<br>
         ZmhlbXVzZXI6c2VjcmV0<br>
         fhem.cfg:<br>
@@ -5594,7 +5604,7 @@ Terminating
         </ul>
         You can of course use other means of base64 encoding, e.g. online
         Base64 encoders. If basicAuthMsg is set, it will be displayed in the
-        browser when requesting the username/password.
+        popup window when requesting the username/password.
     </li><br>
 
     <a name="HTTPS"></a>
diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index e107b0641..04bcbba41 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -167,7 +167,7 @@ my $nextat;                     # Time when next timer will be triggered.
 my $intAtCnt=0;
 my %duplicate;                  # Pool of received msg for multi-fhz/cul setups
 my $duplidx=0;                  # helper for the above pool
-my $cvsid = '$Id: fhem.pl,v 1.134 2011-02-28 07:27:10 rudolfkoenig Exp $';
+my $cvsid = '$Id: fhem.pl,v 1.135 2011-03-04 06:48:28 rudolfkoenig Exp $';
 my $namedef =
   "where <name> is either:\n" .
   "- a single device name\n" .
@@ -186,7 +186,7 @@ $modules{_internal_}{AttrList} =
         "archivecmd allowfrom archivedir configfile lastinclude logfile " .
         "modpath nrarchive pidfilename port statefile title userattr " .
         "verbose:1,2,3,4,5 mseclog version nofork logdir holiday2we " .
-        "autoload_undefined_devices";
+        "autoload_undefined_devices dupTimeout";
 $modules{_internal_}{AttrFn} = "GlobalAttr";
 my $commonAttr = "eventMap";
 
@@ -2376,7 +2376,7 @@ CheckDuplicate($$)
   $msg = substr($msg, 8) if($msg =~ m/^81/ && length($msg) > 8);
 
   my $now = gettimeofday();
-  my $lim = $now-0.5;
+  my $lim = $now-AttrVal("global","dupTimeout", 0.5);
 
   foreach my $oidx (keys %duplicate) {
     if($duplicate{$oidx}{TIM} < $lim) {