search timer mails can now be buffered and delayed

30 files changed, 335 insertions, 30 deletions

diff --git a/Makefile b/Makefile
index 51c4c19..c88bb8d 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ DEFINES4 += $(EPGSEARCH_DEFINES) -DPLUGIN_NAME_I18N='"$(PLUGIN4)"'
 
 ### The object files (add further files here):
 
-OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o i18n.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o  
+OBJS = afuzzy.o blacklist.o changrp.o confdloader.o conflictcheck.o conflictcheck_thread.o distance.o $(PLUGIN).o epgsearchcats.o epgsearchcfg.o epgsearchext.o epgsearchsetup.o  epgsearchsvdrp.o epgsearchtools.o i18n.o mail.o md5.o menu_announcelist.o menu_blacklistedit.o menu_blacklists.o menu_commands.o menu_conflictcheck.o menu_deftimercheckmethod.o menu_dirselect.o menu_event.o menu_favorites.o menu_main.o menu_myedittimer.o menu_quicksearch.o menu_recsdone.o menu_search.o menu_searchactions.o menu_searchedit.o menu_searchresults.o menu_searchtemplate.o menu_switchtimers.o menu_templateedit.o menu_timersdone.o menu_whatson.o noannounce.o pending_notifications.o rcfile.o  recdone.o recstatus.o searchtimer_thread.o services.o switchtimer.o switchtimer_thread.o templatefile.o timer_thread.o timerdone.o timerstatus.o uservars.o varparser.o  
 
 ifdef HAVE_PCREPOSIX
 LIBS += $(shell pcre-config --libs-posix)
diff --git a/doc-src/de/epgsearch.1.txt b/doc-src/de/epgsearch.1.txt
index 020a2df..f2cbe44 100644
--- a/doc-src/de/epgsearch.1.txt
+++ b/doc-src/de/epgsearch.1.txt
@@ -768,6 +768,12 @@ der Suchtimer-Hintergrund-Thread
 
 (Dazu muss ebenfalls die Option 'Verwende Suchtimer' im Suchtimer-Setup aktiv sein.)
 
+=item - B<Zeit zwischen Mails [h]:>
+
+Für Benachrichtigungen zu Suchtimern kann hier angegeben werden, welchen Mindestabstand in Stunden
+die Mails haben sollen. Sobald die entsprechende Zeit verstrichen ist, wird eine Mail nach dem nächsten Suchtimer-Update
+versandt. Der Wert '0' bedeutet keine Verzögerung und bewirkt einen sofortigen Mailversand.
+
 =item - B<Timer-Konflikt-Benachrichtigung:>
 
 Diese Option aktivieren, wenn man eine Email-Benachrichtigung bei
diff --git a/doc-src/en/epgsearch.1.txt b/doc-src/en/epgsearch.1.txt
index e18820a..8a38f6a 100644
--- a/doc-src/en/epgsearch.1.txt
+++ b/doc-src/en/epgsearch.1.txt
@@ -748,6 +748,12 @@ background thread has
 
 (Also requires 'Use search timers' in the search timer setup to be activated.)
 
+=item - B<Time between mails [h]:>
+
+For search timer notifications one can set the minimum distance in hours between the mails.
+As soon as this time has elapsed a new mail is sent after the next search timer update.
+A value of '0' means no delay and will cause immediate mail delivery.
+
 =item - B<Timer conflict notification:>
 
 Enable this, if you want to get an email notification about timer
diff --git a/epgsearch.c b/epgsearch.c
index a11b33d..b37a320 100644
--- a/epgsearch.c
+++ b/epgsearch.c
@@ -65,8 +65,9 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "menu_quicksearch.h"
 #include "menu_announcelist.h"
 #include "confdloader.h"
+#include "pending_notifications.h"
 
-static const char VERSION[]        = "0.9.25.beta14";
+static const char VERSION[]        = "0.9.25.beta15";
 static const char DESCRIPTION[]    =  trNOOP("search the EPG for repeats and more");
 
 // globals
@@ -455,6 +456,7 @@ bool cPluginEpgsearch::Start(void)
    NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf"));
    DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf"));
    TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf"));
+   PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf"));
 
    cSearchTimerThread::Init(this);    
    cSwitchTimerThread::Init();    
@@ -664,6 +666,8 @@ bool cPluginEpgsearch::SetupParse(const char *Name, const char *Value)
   
    if      (!strcasecmp(Name, "MailViaScript"))  EPGSearchConfig.mailViaScript = atoi(Value); 
    if      (!strcasecmp(Name, "MailNotificationSearchtimers"))  EPGSearchConfig.sendMailOnSearchtimers = atoi(Value); 
+   if      (!strcasecmp(Name, "MailNotificationSearchtimersHours")) EPGSearchConfig.sendMailOnSearchtimerHours = atoi(Value);
+   if      (!strcasecmp(Name, "MailNotificationSearchtimersLastAt")) EPGSearchConfig.lastMailOnSearchtimerAt = atol(Value);
    if      (!strcasecmp(Name, "MailNotificationConflicts"))  EPGSearchConfig.sendMailOnConflicts = atoi(Value); 
    if      (!strcasecmp(Name, "MailAddress")) strcpy(EPGSearchConfig.MailAddress, Value);
    if      (!strcasecmp(Name, "MailAddressTo")) strcpy(EPGSearchConfig.MailAddressTo, Value);
@@ -678,6 +682,7 @@ bool cPluginEpgsearch::SetupParse(const char *Name, const char *Value)
 
    if      (!strcasecmp(Name, "LastMailConflicts")) strcpy(EPGSearchConfig.LastMailConflicts, Value);
 
+
    return true;
 }
 
diff --git a/epgsearchcfg.c b/epgsearchcfg.c
index 8678ce1..be8058b 100644
--- a/epgsearchcfg.c
+++ b/epgsearchcfg.c
@@ -82,6 +82,8 @@ cEPGSearchConfig::cEPGSearchConfig(void)
   TimerProgRepeat = 0;
   maxChannelMenuNow = 0;
   noConflMsgWhileReplay = 0;
+  sendMailOnSearchtimerHours = 0;
+  lastMailOnSearchtimerAt = 0;
 }
 
 int cShowMode::Compare(const cListObject &ListObject) const
diff --git a/epgsearchcfg.h b/epgsearchcfg.h
index 0b762ea..85f29c6 100644
--- a/epgsearchcfg.h
+++ b/epgsearchcfg.h
@@ -141,6 +141,9 @@ cEPGSearchConfig(void);
     int TimerProgRepeat;
     int maxChannelMenuNow;
     int noConflMsgWhileReplay;
+    int sendMailOnSearchtimerHours;
+
+    time_t lastMailOnSearchtimerAt;
 };
 
 extern cEPGSearchConfig EPGSearchConfig;
diff --git a/epgsearchsetup.c b/epgsearchsetup.c
index 14ae56c..bb9a812 100644
--- a/epgsearchsetup.c
+++ b/epgsearchsetup.c
@@ -251,6 +251,7 @@ void cMenuEPGSearchSetup::Store(void)
     SetupStore("AddSubtitleToTimerMode",  EPGSearchConfig.addSubtitleToTimer);
 
     SetupStore("MailNotificationSearchtimers",  EPGSearchConfig.sendMailOnSearchtimers);
+    SetupStore("MailNotificationSearchtimersHours",  EPGSearchConfig.sendMailOnSearchtimerHours);
     SetupStore("MailNotificationConflicts",  EPGSearchConfig.sendMailOnConflicts);
     SetupStore("MailAddress",  EPGSearchConfig.MailAddress);
     SetupStore("MailAddressTo",  EPGSearchConfig.MailAddressTo);
@@ -844,6 +845,11 @@ void cMenuSetupMailNotification::Set()
   Add(new cMenuEditBoolItem(tr("Search timer notification"), &data->sendMailOnSearchtimers, trVDR("no"), trVDR("yes")));
   AddHelp(tr("Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."));
 
+  if (data->sendMailOnSearchtimers)
+  {
+    Add(new cMenuEditIntItem(IndentMenuItem(tr("Time between mails [h]")), &data->sendMailOnSearchtimerHours,  0, 999999, ""));   
+    AddHelp(tr("Help$Specifiy how much time in [h] you would\nlike to have atleast between two mails.\nWith '0' you get a new mail after each\nsearch timer update with new results.")); 
+  }
   Add(new cMenuEditBoolItem(tr("Timer conflict notification"), &data->sendMailOnConflicts, trVDR("no"), trVDR("yes")));
   AddHelp(tr("Help$Set this to 'yes' if you want to get an email notification about the timer conflicts."));
 
@@ -932,6 +938,7 @@ void cMenuSetupMailNotification::SetHelpKeys()
 eOSState cMenuSetupMailNotification::ProcessKey(eKeys Key)
 {
    int iTemp_MailUseAuth = data->MailUseAuth;
+   int iTemp_sendMailOnSearchtimers = data->sendMailOnSearchtimers;
    int iTemp_mailViaScript = data->mailViaScript;
    
    const char* ItemText = Get(Current())->Text();
@@ -963,7 +970,8 @@ eOSState cMenuSetupMailNotification::ProcessKey(eKeys Key)
    }
 
    if (iTemp_MailUseAuth != data->MailUseAuth ||
-       iTemp_mailViaScript != data->mailViaScript)
+       iTemp_mailViaScript != data->mailViaScript ||
+       iTemp_sendMailOnSearchtimers != data->sendMailOnSearchtimers)
    {
       Set();
       Display();
diff --git a/mail.c b/mail.c
index 4fb1d9f..90c93ed 100644
--- a/mail.c
+++ b/mail.c
@@ -31,6 +31,7 @@ The project's page is at http://winni.vdr-developer.org/epgsearch
 #include "epgsearchtools.h"
 #include "uservars.h"
 #include "noannounce.h"
+#include "pending_notifications.h"
 
 #ifndef SENDMAIL
 #define SENDMAIL "/usr/sbin/sendmail"
@@ -111,6 +112,13 @@ cMailDelTimerNotification::cMailDelTimerNotification(cTimer* pTimer, const cEven
     formatted =  varExprTimer.Evaluate(pTimer);
 }
 
+cMailDelTimerNotification::cMailDelTimerNotification(const string& Formatted, tChannelID ChannelID, time_t Start)
+{
+    formatted = Formatted;
+    channelID = ChannelID;
+    start = Start;
+}
+
 bool cMailDelTimerNotification::operator< (const cMailDelTimerNotification &N) const
 {
     const cChannel* channel = Channels.GetByChannelID(channelID,true,true);
@@ -217,10 +225,20 @@ bool cMailNotifier::SendMailViaScript()
 
 bool cMailNotifier::SendMail()
 {
-    if (!EPGSearchConfig.mailViaScript)
+  time_t nextMailDelivery = EPGSearchConfig.lastMailOnSearchtimerAt + EPGSearchConfig.sendMailOnSearchtimerHours*60*60;
+  if (time(NULL) > nextMailDelivery)
+    {
+      if (!EPGSearchConfig.mailViaScript)
 	return SendMailViaSendmail();
-    else
+      else
 	return SendMailViaScript();
+    }
+  else
+    {
+      
+      LogFile.Log(2, "mail delivery delayed until %s", DAYDATETIME(nextMailDelivery));
+      return false;
+    }
 }
 
 bool cMailNotifier::ExecuteMailScript(string ScriptArgs)
@@ -326,6 +344,12 @@ void cMailUpdateNotifier::AddRemoveTimerNotification(cTimer* t, const cEvent* e)
     delTimers.insert(N);
 }
 
+void cMailUpdateNotifier::AddRemoveTimerNotification(const string& Formatted, tChannelID ChannelID, time_t Start)
+{
+    cMailDelTimerNotification N(Formatted, ChannelID, Start);
+    delTimers.insert(N);
+}
+
 void cMailUpdateNotifier::AddAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID)
 {
   cMailAnnounceEventNotification N(EventID, ChannelID, SearchExtID);
@@ -334,6 +358,21 @@ void cMailUpdateNotifier::AddAnnounceEventNotification(tEventID EventID, tChanne
 
 void cMailUpdateNotifier::SendUpdateNotifications()
 {
+    // insert pending notifications
+    cPendingNotification* p = PendingNotifications.First();
+    while (p) 
+    {
+      if (p->type == 0) 
+	AddNewTimerNotification(p->eventID, p->channelID);
+      else if (p->type == 1)
+	AddModTimerNotification(p->eventID, p->channelID, p->timerMod);
+      else if (p->type == 2)
+	AddRemoveTimerNotification(p->formatted, p->channelID, p->start);
+      else if (p->type == 3)
+	AddAnnounceEventNotification(p->eventID, p->channelID, p->searchID);
+      p = PendingNotifications.Next(p);
+    }	    
+
     if (newTimers.size() == 0 && 
 	modTimers.size() == 0 && 
 	delTimers.size() == 0 &&
@@ -380,7 +419,7 @@ void cMailUpdateNotifier::SendUpdateNotifications()
     std::set<cMailDelTimerNotification>::iterator itdt;
     for (itdt = delTimers.begin(); itdt != delTimers.end(); itdt++) 
     {
-	string message = (*itdt).formatted;
+      string message = (*itdt).Format("");
 	if (message != "") deltimers += message;
     }
 
@@ -419,8 +458,29 @@ void cMailUpdateNotifier::SendUpdateNotifications()
     body = ReplaceAll(body, "%update.deltimers%", deltimers);
     body = ReplaceAll(body, "%update.newevents%", announceevents);
 
-    SendMail();
-
+    if (SendMail())
+    {
+      EPGSearchConfig.lastMailOnSearchtimerAt = time(NULL);
+      cPluginManager::GetPlugin("epgsearch")->SetupStore("MailNotificationSearchtimersLastAt",  
+							 EPGSearchConfig.lastMailOnSearchtimerAt);
+      // remove pending notifications
+      while((p = PendingNotifications.First()) != NULL)
+	PendingNotifications.Del(p);
+    }
+    else
+    {
+      // add current notifications to pending ones
+      for (itnt = newTimers.begin(); itnt != newTimers.end(); itnt++) 
+	PendingNotifications.Add(new cPendingNotification(0, itnt->eventID, itnt->channelID, -1));
+      for (itmt = modTimers.begin(); itmt != modTimers.end(); itmt++) 
+	PendingNotifications.Add(new cPendingNotification(1, itmt->eventID, itmt->channelID, -1, itmt->timerMod));
+      for (itdt = delTimers.begin(); itdt != delTimers.end(); itdt++) 
+	PendingNotifications.Add(new cPendingNotification(2, -1, itdt->channelID, itdt->start, -1, -1, itdt->formatted));
+      for (itae = announceEvents.begin(); itae != announceEvents.end(); itae++) 
+ 	PendingNotifications.Add(new cPendingNotification(3, itae->eventID, itae->channelID, -1, -1, itae->searchextID));     
+    } 
+    PendingNotifications.Save();
+    
     newTimers.clear();
     modTimers.clear();
     delTimers.clear();
diff --git a/mail.h b/mail.h
index 70790fd..f54d2b4 100644
--- a/mail.h
+++ b/mail.h
@@ -76,17 +76,21 @@ class cMailTimerNotification
 
 class cMailDelTimerNotification
 {
-    tChannelID channelID;
+  friend class cMailUpdateNotifier;
     time_t start;
+    tChannelID channelID;
  public:
     string formatted;
 
     cMailDelTimerNotification(cTimer* t, const cEvent* pEvent, const string& templ); 
+    cMailDelTimerNotification(const string& Formatted, tChannelID ChannelID, time_t Start);
     bool operator< (const cMailDelTimerNotification &N) const;
+    string Format(const string& templ) const { return formatted; }
 };
 
 class cMailAnnounceEventNotification : public cMailTimerNotification
 {
+  friend class cMailUpdateNotifier;
   int searchextID;
  public:
  cMailAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID) 
@@ -107,6 +111,7 @@ class cMailUpdateNotifier : public cMailNotifier
     void AddNewTimerNotification(tEventID EventID, tChannelID ChannelID);
     void AddModTimerNotification(tEventID EventID, tChannelID ChannelID, uint timerMod = tmNoChange);
     void AddRemoveTimerNotification(cTimer* t, const cEvent* e = NULL);
+    void AddRemoveTimerNotification(const string& Formatted, tChannelID ChannelID, time_t Start);
     void AddAnnounceEventNotification(tEventID EventID, tChannelID ChannelID, int SearchExtID);
     void SendUpdateNotifications();
 };
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 5ad62ab..9608e88 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Jordi Vilà <jvila@tinet.org>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -460,6 +460,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index df2bfd2..1a126fe 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vladimír Bárta <vladimir.barta@k2atmitec.cz>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/da_DK.po b/po/da_DK.po
index cea587a..41aaf6d 100644
--- a/po/da_DK.po
+++ b/po/da_DK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Mogens Elneff <mogens@elneff.dk>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/de_DE.po b/po/de_DE.po
index d62e300..e22810e 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -491,6 +491,16 @@ msgstr "Suchtimer-Benachrichtigung"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Hier mit 'Ja' auswählen, ob eine Email-Benachrichtigung über automatisch im Hintergrund programmierte Suchtimer versandt werden soll."
 
+msgid "Time between mails [h]"
+msgstr "Zeit zwischen Mails [h]"
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr "Hier die gewünschte Zeit in [h] zwischen\nzwei Mails angeben. Mit '0' erhält man eine\nneue Mail nach jedem Suchtimer-Update\nmit neuen Ergebnissen."
+
 msgid "Timer conflict notification"
 msgstr "Timer-Konflikt-Benachrichtigung"
 
diff --git a/po/el_GR.po b/po/el_GR.po
index cd994b7..7b42881 100644
--- a/po/el_GR.po
+++ b/po/el_GR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Dimitrios Dimitrakos <mail@dimitrios.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/es_ES.po b/po/es_ES.po
index d19f881..b963a7f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-11-18 20:09+0200\n"
 "Last-Translator: bittor from open7x0.org <bittor7x0 _at_ gmail.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -490,6 +490,16 @@ msgstr "Notificar prog. por búsqueda"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Establecer a 'sí' cuando desee tener una notificación por correo de las programaciones por búsqueda que fueron creadas automáticamente."
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr "Notificar conflicto en programación"
 
diff --git a/po/et_EE.po b/po/et_EE.po
index 3712379..4dc393e 100644
--- a/po/et_EE.po
+++ b/po/et_EE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Arthur Konovalov <kasjas@hot.ee>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/fi_FI.po b/po/fi_FI.po
index ee8c08e..f43dbfb 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2009-07-19 23:22+0200\n"
 "Last-Translator: Ville Skyttä <ville.skytta@iki.fi>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -494,6 +494,16 @@ msgstr "Ilmoitukset hakuajastimista"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Tällä asetuksella saat ilmoitukset automaattisesti lisätyistä hakuajastimista sähköpostiisi."
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr "Ilmoitukset päällekkäisistä ajastimista"
 
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 85578c6..faed434 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2008-04-30 08:36+0200\n"
 "Last-Translator: Patrice Staudt <patrice.staudt@laposte.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -494,6 +494,16 @@ msgstr "Notification de recherche"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Mettez 'oui',si vous voulez que les nouvelles programmations automatiques soient notifiées par mail."
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr "Notification de conflit de programmation"
 
diff --git a/po/hr_HR.po b/po/hr_HR.po
index 75de88a..52cc1f9 100644
--- a/po/hr_HR.po
+++ b/po/hr_HR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Drazen Dupor <drazen.dupor@dupor.com>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -459,6 +459,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 814c300..84a7d79 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Istvan Koenigsberger <istvnko@hotmail.com>, Guido Josten <guido.josten@t-online.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/it_IT.po b/po/it_IT.po
index 5f2db3e..5972d41 100755
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2009-07-15 23:30+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
@@ -496,6 +496,16 @@ msgstr "Notifica timer di ricerca"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Imposta 'sì' se vuoi avere una email di notifica sui timer di ricerca che sono stati programmati automaticamente dal sistema."
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr "Notifica timer in conflitto"
 
diff --git a/po/nl_NL.po b/po/nl_NL.po
index 6156cc4..59df552 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Maarten Wisse <Maarten.Wisse@urz.uni-hd.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -492,6 +492,16 @@ msgstr "Zoektimer notificatie"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr "Kies 'ja' wanneer er een notificatie e-mail verstuurd moet worden over zoektimers die automatisch op de achtergrond werden aangenaakt."
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr "Timer conflict notificatie"
 
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 1c749a5..f452e35 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Truls Slevigen <truls@slevigen.no>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/pl_PL.po b/po/pl_PL.po
index c481132..e7a4ec8 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Michael Rakowski <mrak@gmx.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr "/oui"
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index c8c4036..409753f 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Paulo Lopes <pmml@netvita.pt>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -457,6 +457,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/ro_RO.po b/po/ro_RO.po
index 15a4480..2fac54c 100644
--- a/po/ro_RO.po
+++ b/po/ro_RO.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Lucian Muresan <lucianm@users.sourceforge.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d4d75cd..cea92ac 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Vyacheslav Dikonov <sdiconov@mail.ru>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -457,6 +457,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/sl_SI.po b/po/sl_SI.po
index 5d5befb..6965ffa 100644
--- a/po/sl_SI.po
+++ b/po/sl_SI.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Matjaz Thaler <matjaz.thaler@guest.arnes.si>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index ce0f3ab..851ee32 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Tomas Prybil <tomas@prybil.se>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -458,6 +458,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""
 
diff --git a/po/tr_TR.po b/po/tr_TR.po
index af9d38e..a9f302e 100644
--- a/po/tr_TR.po
+++ b/po/tr_TR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <cwieninger@gmx.de>\n"
-"POT-Creation-Date: 2009-09-20 09:51+0200\n"
+"POT-Creation-Date: 2009-09-21 19:28+0200\n"
 "PO-Revision-Date: 2007-08-14 20:21+0200\n"
 "Last-Translator: Oktay Yolgeçen <oktay_73@yahoo.de>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
@@ -457,6 +457,16 @@ msgstr ""
 msgid "Help$Set this to 'yes' if you want to get an email notification about the search timers that where programmed automatically in the background."
 msgstr ""
 
+msgid "Time between mails [h]"
+msgstr ""
+
+msgid ""
+"Help$Specifiy how much time in [h] you would\n"
+"like to have atleast between two mails.\n"
+"With '0' you get a new mail after each\n"
+"search timer update with new results."
+msgstr ""
+
 msgid "Timer conflict notification"
 msgstr ""