import of version 0.0.5v0.0.5

1 files changed, 720 insertions, 151 deletions

diff --git a/undelete.c b/undelete.c
index 9710d54..37f950f 100644
--- a/undelete.c
+++ b/undelete.c
@@ -3,7 +3,7 @@
  *
  * See the README file for copyright information and how to reach the author.
  *
- * $Id: undelete.c 0.3 2005/10/04 14:35:20 hflor Exp $
+ * $Id: undelete.c 0.5 2005/11/17 21:05:05 hflor Exp $
  */
 
 #include "undelete.h"
@@ -14,8 +14,9 @@
 #include <getopt.h>
 #include <ctype.h>
 #include <vdr/recording.h>
+#include <vdr/videodir.h>
 
-static const char *VERSION           = "0.0.3";
+static const char *VERSION           = "0.0.5";
 static const char *DESCRIPTION       = "undelete for recordings";
 
 // Global variables that control the overall behaviour:
@@ -23,15 +24,37 @@ static const char *DESCRIPTION       = "undelete for recordings";
 // var pos2
 tParamFile  undeleteconfigfile     = { false, false, false, "undelete.conf", "undelete.conf" };
 tParamInt   commandline_preference = { false, false, false, true };
-tParamInt   confirmdel             = { false, false, false, true };
-tParamInt   confirmdeldir          = { false, false, false, true };
-tParamInt   confirmundel           = { false, false, false, true };
-tParamInt   confirmundeldir        = { false, false, false, true };
-tParamFile  mainmenu_name          = { false, false, false, "Undelete recordings" };
+tParamInt   confirmpurge           = { false, false, false, true };
+tParamInt   confirmpurgedir        = { false, false, false, true };
+tParamInt   confirmpurgeall        = { false, false, false, true };
+tParamInt   confirmsalvage         = { false, false, false, true };
+tParamInt   confirmsalvagedir      = { false, false, false, true };
+tParamInt   confirmsalvageall      = { false, false, false, true };
+tParamInt   firstsalvage           = { false, false, false, true };
+tParamInt   functionkey[MaxFunctionName] = {
+                                     { false, false, false },
+                                     { false, false, false },
+                                     { false, false, false, 5 },
+                                     { false, false, false, 3 },
+                                     { false, false, false, 0 },
+                                     { false, false, false, 0 },
+                                     { false, false, false, 1 },
+                                     { false, false, false, 7 },
+                                     { false, false, false, 0 },
+                                     { false, false, false, 0 },
+                                     { false, false, false, 9 }};
+tParamFile  mainmenu_name          = { false, false, false };
 tParamInt   mainmenu_visible       = { false, false, false, false };
+tParamInt   okkey                  = { false, false, false, 1 };
+tParamInt   numkey                 = { false, false, false, 0 };
+tParamInt   functionline_b_e[2]    ={{ false, false, false, false },
+                                     { false, false, false, false }};
+tParamInt   functionline_num[2]    ={{ false, false, false, 14 },
+                                     { false, false, false, 14 }};
 tParamInt   verbose                = { false, false, false, false, true };
 
 char        plugin_name[MaxFileName]  = "Undelete";
+cPlugin     *plugin = NULL;
 bool        PurgeRecording = false;
 bool        SalvageRecording = false;
 #if VDRVERSNUM >= 10311
@@ -39,41 +62,89 @@ cRecordings DeletedRecordings(true);
 #else
 cRecordings DeletedRecordings;
 #endif
+bool        MenuIsOpen = false;
+char        *SVDRP_Process = NULL;
 char        *WorkFilename = NULL;
+time_t      NextRemoveThreadStart = 0;
+int         KeyState = 0;
+
+const char  *FunctionLine[4];
+const char  *FunctionName[MaxFunctionName];
+const char  *FunctionHotKey[MaxFunctionName];
+const char  *KeysName[MaxKeysName];
+
+cRemoveThread oRemoveThread;
+
+#ifdef UND_Debug
+int cMenuRecordingSelectItem_nextID = 0;
+int cMenuRecordingSelect_nextID = 0;
+int cMenuUndelete_nextID = 0;
+int cMenuSetupUndelete_nextID = 0;
+int cMenuDispKey_nextID = 0;
+#endif
 
 void DisplaySetings(void)
 {
   #define WriteSource(T)   plugin_name, T.r ? 'r' : ' ', T.c ? 'c' : ' '
   #define IsDefault(T)     WriteSource(T), T.u == T.d ? '*' : ' '
+  #define IsDefaultS(T)    T.r ? 'r' : ' ', T.c ? 'c' : ' ', T.u == T.d ? '*' : ' '
   #define IsDefaultFile(T) WriteSource(T), strcmp(T.u, T.d) ? ' ' : '*'
   #define BoolValue(T)     IsDefault(T), T.u ? "yes" : "no"
 
   // var pos3
   if (verbose.u)
   {
-    isyslog("%s: commandline_preference     = [ %c%c%c ] %s", BoolValue(commandline_preference));
-    isyslog("%s: mainmenu_visible           = [ %c%c%c ] %s", BoolValue(mainmenu_visible));
+    isyslog("%s: commandline_preference       = [ %c%c%c ] %s", BoolValue(commandline_preference));
+    isyslog("%s: mainmenu_visible             = [ %c%c%c ] %s", BoolValue(mainmenu_visible));
     if (mainmenu_visible.u)
-      isyslog("%s: mainmenu_name              = [ %c%c%c ] %s", IsDefaultFile(mainmenu_name), mainmenu_name.u);
-    isyslog("%s: confirm undelete           = [ %c%c%c ] %s", BoolValue(confirmundel));
-    isyslog("%s: confirm undelete directory = [ %c%c%c ] %s", BoolValue(confirmundeldir));
-    isyslog("%s: confirm delete             = [ %c%c%c ] %s", BoolValue(confirmdel));
-    isyslog("%s: confirm delete directory   = [ %c%c%c ] %s", BoolValue(confirmdeldir));
-    isyslog("%s: verbose                    = [ %c%c%c ] %s", BoolValue(verbose));
+      isyslog("%s: mainmenu_name                = [ %c%c%c ] %s", IsDefaultFile(mainmenu_name), mainmenu_name.u);
+    isyslog("%s: confirm purge                = [ %c%c%c ] %s", BoolValue(confirmpurge));
+    isyslog("%s: confirm purge directory      = [ %c%c%c ] %s", BoolValue(confirmpurgedir));
+    isyslog("%s: confirm purge all            = [ %c%c%c ] %s", BoolValue(confirmpurgeall));
+    isyslog("%s: confirm salvage              = [ %c%c%c ] %s", BoolValue(confirmsalvage));
+    isyslog("%s: confirm salvage directory    = [ %c%c%c ] %s", BoolValue(confirmsalvagedir));
+    isyslog("%s: confirm salvage all          = [ %c%c%c ] %s", BoolValue(confirmsalvageall));
+    isyslog("%s: purge lines in list          = [ %c%c%c ] %s", IsDefault(functionline_b_e[0]), FunctionLine[functionline_b_e[0].u]);
+    if (functionline_b_e[0].u == 0x3)
+      isyslog("%s: num entry for display        = [ %c%c%c ] %d", IsDefault(functionline_num[0]), functionline_num[0].u);
+    isyslog("%s: salvage lines in list        = [ %c%c%c ] %s", IsDefault(functionline_b_e[1]), FunctionLine[functionline_b_e[1].u]);
+    if (functionline_b_e[1].u == 0x3)
+      isyslog("%s: num entry for display        = [ %c%c%c ] %d", IsDefault(functionline_num[1]), functionline_num[1].u);
+    if ((functionline_b_e[0].u & functionline_b_e[1].u & 0x1) != 0x0 || (functionline_b_e[0].u & functionline_b_e[1].u & 0x2) != 0x0)
+      isyslog("%s: inward lines                 = [ %c%c%c ] %s", IsDefault(firstsalvage), firstsalvage.u ? tr("Choise$salvage") : tr("Choise$purge"));
+    for (int i = 2; i < MaxFunctionName; i++)
+      isyslog("%s: key for %-20s = [ %c%c%c ] %s", plugin_name, FunctionName[i], IsDefaultS(functionkey[i]), KeysName[functionkey[i].u]);
+    isyslog("%s: spec. function for OK-key    = [ %c%c%c ] %s", IsDefault(okkey), FunctionName[okkey.u]);
+    isyslog("%s: spec. function for numerics  = [ %c%c%c ] %s", IsDefault(numkey), FunctionName[numkey.u]);
+    isyslog("%s: verbose                      = [ %c%c%c ] %s", BoolValue(verbose));
   }
 
 #ifdef UND_Debug1
   if (!verbose.u)
   {
-    dsyslog("%s: commandline_preference     = [ %c%c%c ] %s", BoolValue(commandline_preference));
-    dsyslog("%s: mainmenu_visible           = [ %c%c%c ] %s", BoolValue(mainmenu_visible));
+    dsyslog("%s: commandline_preference       = [ %c%c%c ] %s", BoolValue(commandline_preference));
+    dsyslog("%s: mainmenu_visible             = [ %c%c%c ] %s", BoolValue(mainmenu_visible));
     if (mainmenu_visible.u)
-      dsyslog("%s: mainmenu_name              = [ %c%c%c ] %s", IsDefaultFile(mainmenu_name), mainmenu_name.u);
-    dsyslog("%s: confirm undelete           = [ %c%c%c ] %s", BoolValue(confirmundel));
-    dsyslog("%s: confirm undelete directory = [ %c%c%c ] %s", BoolValue(confirmundeldir));
-    dsyslog("%s: confirm delete             = [ %c%c%c ] %s", BoolValue(confirmdel));
-    dsyslog("%s: confirm delete directory   = [ %c%c%c ] %s", BoolValue(confirmdeldir));
-    dsyslog("%s: verbose                    = [ %c%c%c ] %s", BoolValue(verbose));
+      dsyslog("%s: mainmenu_name                = [ %c%c%c ] %s", IsDefaultFile(mainmenu_name), mainmenu_name.u);
+    dsyslog("%s: confirm purge                = [ %c%c%c ] %s", BoolValue(confirmpurge));
+    dsyslog("%s: confirm purge directory      = [ %c%c%c ] %s", BoolValue(confirmpurgedir));
+    dsyslog("%s: confirm purge all            = [ %c%c%c ] %s", BoolValue(confirmpurgeall));
+    dsyslog("%s: confirm salvage              = [ %c%c%c ] %s", BoolValue(confirmsalvage));
+    dsyslog("%s: confirm salvage directory    = [ %c%c%c ] %s", BoolValue(confirmsalvagedir));
+    dsyslog("%s: confirm salvage all          = [ %c%c%c ] %s", BoolValue(confirmsalvageall));
+    dsyslog("%s: purge lines in list          = [ %c%c%c ] %s", IsDefault(functionline_b_e[0]), FunctionLine[functionline_b_e[0].u]);
+    if (functionline_b_e[0].u == 0x3)
+      dsyslog("%s: num entry for display        = [ %c%c%c ] %d", IsDefault(functionline_num[0]), functionline_num[0].u);
+    dsyslog("%s: salvage lines in list        = [ %c%c%c ] %s", IsDefault(functionline_b_e[1]), FunctionLine[functionline_b_e[1].u]);
+    if (functionline_b_e[1].u == 0x3)
+      dsyslog("%s: num entry for display        = [ %c%c%c ] %d", IsDefault(functionline_num[1]), functionline_num[1].u);
+    if ((functionline_b_e[0].u & functionline_b_e[1].u & 0x1) != 0x0 || (functionline_b_e[0].u & functionline_b_e[1].u & 0x2) != 0x0)
+      dsyslog("%s: inward lines                 = [ %c%c%c ] %s", IsDefault(firstsalvage), firstsalvage.u ? tr("Choise$salvage") : tr("Choise$purge"));
+    for (int i = 2; i < MaxFunctionName; i++)
+      dsyslog("%s: key for %-20s = [ %c%c%c ] %s", plugin_name, FunctionName[i], IsDefaultS(functionkey[i]), KeysName[functionkey[i].u]);
+    dsyslog("%s: spec. function for OK-key    = [ %c%c%c ] %s", IsDefault(okkey), FunctionName[okkey.u]);
+    dsyslog("%s: spec. function for numerics  = [ %c%c%c ] %s", IsDefault(numkey), FunctionName[numkey.u]);
+    dsyslog("%s: verbose                      = [ %c%c%c ] %s", BoolValue(verbose));
   }
 #endif
 
@@ -85,9 +156,7 @@ void DisplaySetings(void)
 
 void ExpandEnvironment(tParamFile *FileStruc)
 {
-#ifdef UND_Debug2
-  dsyslog("%s: ExpandEnvironment text=%s", plugin_name, FileStruc->u);
-#endif
+  d2syslogi("ExpandEnvironment", "text=%s", FileStruc->u);
   char *s;
   char *p;
   strn0cpy(FileStruc->e, FileStruc->u, sizeof(FileStruc->e));
@@ -106,7 +175,7 @@ void ExpandEnvironment(tParamFile *FileStruc)
         char *buffer = NULL;
         asprintf(&buffer, "%s%s%s", FileStruc->e, e, p);
         strn0cpy(FileStruc->e, buffer, sizeof(FileStruc->e));
-        FREENULL(buffer);
+        freenull(buffer);
       } else
       {
         esyslog("%s: environmentvariable '%s' not found path=%s", plugin_name, s, FileStruc->u);
@@ -120,46 +189,143 @@ void ExpandEnvironment(tParamFile *FileStruc)
   }
   while ((p = strstr(FileStruc->e, "//")))
     strcpy(p, p + 1);
-#ifdef UND_Debug2
-  dsyslog("%s: ExpandEnvironment return=%s", plugin_name, FileStruc->e);
-#endif
+  d2syslogi("ExpandEnvironment", "return=%s", FileStruc->e);
 }
 
 // --- cPluginUndelete ----------------------------------------------------------
 
+class cPluginUndelete : public cPlugin {
+private:
+  // Add any member variables or functions you may need here.
+  int OSDLanguage;
+  void TestAndSetOSDLanguage(void);
+  bool ProcessArg(int argc, char *argv[]);
+#ifdef UND_Debug
+  int objID;  
+#endif
+
+public:
+  cPluginUndelete(void);
+  virtual ~cPluginUndelete();
+  virtual const char *Version(void)                             { return VERSION; }
+  virtual const char *Description(void)                         { return tr(DESCRIPTION); }
+  virtual const char *CommandLineHelp(void);
+  virtual bool ProcessArgs(int argc, char *argv[]);
+  virtual bool Start(void);
+  virtual void Housekeeping(void);
+
+  virtual const char *MainMenuEntry(void)                       { return (mainmenu_visible.u) ? mainmenu_name.u : NULL; }
+  virtual cOsdObject *MainMenuAction(void)                      { TestAndSetOSDLanguage(); return new cMenuUndelete; }
+
+  virtual cMenuSetupPage *SetupMenu(void)                       { TestAndSetOSDLanguage(); return new cMenuSetupUndelete; }
+  virtual bool SetupParse(const char *Name, const char *Value);
+
+#ifdef HAVE_SVDRP
+  virtual const char **SVDRPHelpPages(void);
+  virtual cString SVDRPCommand(const char *Command, const char *Option, int &ReplyCode);
+#endif
+  };
+
 cPluginUndelete::cPluginUndelete(void)
 {
-#ifdef UND_Debug1
-  dsyslog("%s: cPluginUndelete::cPluginUndelete", plugin_name);
+#ifdef UND_Debug
+  objID = 1;
+  d2syslog("cPluginUndelete::cPluginUndelete", "%s", "");
 #endif
   // Initialize any member variables here.
   // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
   // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT!
+  plugin = this;
 }
 
 cPluginUndelete::~cPluginUndelete()
 {
-#ifdef UND_Debug1
-  dsyslog("%s: cPluginUndelete::~cPluginUndelete", plugin_name);
-#endif
+  d2syslog("cPluginUndelete::~cPluginUndelete", "%s", "");
+  plugin = NULL;
+  freenull(SVDRP_Process);
+  freenull(WorkFilename);
   // Clean up after yourself!
 }
 
+void cPluginUndelete::TestAndSetOSDLanguage(void)
+{
+  d2syslog("cPluginUndelete::TestAndSetOSDLanguage", "OSDLanguage=%d", Setup.OSDLanguage);
+  if (OSDLanguage != Setup.OSDLanguage) {
+    OSDLanguage = Setup.OSDLanguage;
+    FunctionLine[0] = tr("Choise$none");
+    FunctionLine[1] = tr("Choise$top");
+    FunctionLine[2] = tr("Choise$bottom");
+    FunctionLine[3] = tr("Choise$top and bottom");
+    FunctionName[0] = tr("Choise$none");
+    FunctionName[1] = tr("Choise$open/summary");
+    FunctionName[2] = tr("Choise$purge");
+    FunctionName[3] = tr("Choise$salvage");
+    FunctionName[4] = tr("Choise$purge all");
+    FunctionName[5] = tr("Choise$salvage all");
+    FunctionName[6] = tr("Choise$open");
+    FunctionName[7] = tr("Choise$summary");
+    FunctionName[8] = tr("Choise$switch hotkeys to 1");
+    FunctionName[9] = tr("Choise$switch hotkeys to 2");
+    FunctionName[10] = tr("Choise$Display keys");
+    FunctionHotKey[2] = tr("Display$purge");
+    FunctionHotKey[3] = tr("Display$salvage");
+    FunctionHotKey[4] = tr("Display$purge all");
+    FunctionHotKey[5] = tr("Display$salvage all");
+    FunctionHotKey[6] = tr("Open");
+    FunctionHotKey[7] = tr("Summary");
+    FunctionHotKey[8] = tr("Display$<--1");
+    FunctionHotKey[9] = tr("Display$2-->");
+    FunctionHotKey[10] = tr("Display$disp. keys");
+    KeysName[0] = tr("Choise$none");
+    KeysName[1] = tr("Choise$Red (1)");
+    KeysName[2] = tr("Choise$Red (2)");
+    KeysName[3] = tr("Choise$Green (1)");
+    KeysName[4] = tr("Choise$Green (2)");
+    KeysName[5] = tr("Choise$Yellow (1)");
+    KeysName[6] = tr("Choise$Yellow (2)");
+    KeysName[7] = tr("Choise$Blue (1)");
+    KeysName[8] = tr("Choise$Blue (2)");
+    KeysName[9] = "0";
+    KeysName[10] = "1";
+    KeysName[11] = "2";
+    KeysName[12] = "3";
+    KeysName[13] = "4";
+    KeysName[14] = "5";
+    KeysName[15] = "6";
+    KeysName[16] = "7";
+    KeysName[17] = "8";
+    KeysName[18] = "9";
+    KeysName[19] = tr("Choise$User1");
+    KeysName[20] = tr("Choise$User2");
+    KeysName[21] = tr("Choise$User3");
+    KeysName[22] = tr("Choise$User4");
+    KeysName[23] = tr("Choise$User5");
+    KeysName[24] = tr("Choise$User6");
+    KeysName[25] = tr("Choise$User7");
+    KeysName[26] = tr("Choise$User8");
+    KeysName[27] = tr("Choise$User9");
+  }
+}
+
 bool cPluginUndelete::ProcessArg(int argc, char *argv[])
 {
   int c;
   static struct option long_options[] = {
-    { "confirm_del_rec",           no_argument,       NULL, 'c' },
-    { "not_confirm_del_rec",       no_argument,       NULL, 'C' },
-    { "confirm_del_dir",           no_argument,       NULL, 'd' },
-    { "not_confirm_del_dir",       no_argument,       NULL, 'D' },
+    { "confirm_purge_rec",         no_argument,       NULL, 'c' },
+    { "not_confirm_purge_rec",     no_argument,       NULL, 'C' },
+    { "confirm_purge_dir",         no_argument,       NULL, 'd' },
+    { "not_confirm_purge_dir",     no_argument,       NULL, 'D' },
+    { "confirm_purge_all",         no_argument,       NULL, 'e' },
+    { "not_confirm_purge_all",     no_argument,       NULL, 'E' },
     { "visible_in_mainmenu",       no_argument,       NULL, 'm' },
     { "hide_in_mainmenu",          no_argument,       NULL, 'M' },
     { "mainmenu_name",             required_argument, NULL, 'n' },
-    { "confirm_undel_rec",         no_argument,       NULL, 's' },
-    { "not_confirm_undel_rec",     no_argument,       NULL, 'S' },
-    { "confirm_undel_dir",         no_argument,       NULL, 't' },
-    { "not_confirm_undel_dir",     no_argument,       NULL, 'T' },
+    { "confirm_salvage_rec",       no_argument,       NULL, 's' },
+    { "not_confirm_salvage_rec",   no_argument,       NULL, 'S' },
+    { "confirm_salvage_dir",       no_argument,       NULL, 't' },
+    { "not_confirm_salvage_dir",   no_argument,       NULL, 'T' },
+    { "confirm_salvage_all",       no_argument,       NULL, 'u' },
+    { "not_confirm_salvage_all",   no_argument,       NULL, 'U' },
     { "verbose",                   no_argument,       NULL, 'v' },
     { "noverbose",                 no_argument,       NULL, 'V' },
     { "nosetup_commandline",       no_argument,       NULL, 1   },
@@ -183,13 +349,17 @@ bool cPluginUndelete::ProcessArg(int argc, char *argv[])
     {
       case 1:   commandline_preference.h = true;
                 break;
-      case 'c': Setvalue(confirmdel) = true;
+      case 'c': Setvalue(confirmpurge) = true;
+                break;
+      case 'C': Setvalue(confirmpurge) = false;
                 break;
-      case 'C': Setvalue(confirmdel) = false;
+      case 'd': Setvalue(confirmpurgedir) = true;
                 break;
-      case 'd': Setvalue(confirmdeldir) = true;
+      case 'D': Setvalue(confirmpurgedir) = false;
                 break;
-      case 'D': Setvalue(confirmdeldir) = false;
+      case 'e': Setvalue(confirmpurgeall) = true;
+                break;
+      case 'E': Setvalue(confirmpurgeall) = false;
                 break;
       case 'm': Setvalue(mainmenu_visible) = true;
                 break;
@@ -198,13 +368,17 @@ bool cPluginUndelete::ProcessArg(int argc, char *argv[])
       case 'n': SetvalueFile(mainmenu_name);
                 Setvalue(mainmenu_visible) = true;
                 break;
-      case 's': Setvalue(confirmundel) = true;
+      case 's': Setvalue(confirmsalvage) = true;
+                break;
+      case 'S': Setvalue(confirmsalvage) = false;
+                break;
+      case 't': Setvalue(confirmsalvagedir) = true;
                 break;
-      case 'S': Setvalue(confirmundel) = false;
+      case 'T': Setvalue(confirmsalvagedir) = false;
                 break;
-      case 't': Setvalue(confirmundeldir) = true;
+      case 'u': Setvalue(confirmsalvageall) = true;
                 break;
-      case 'T': Setvalue(confirmundeldir) = false;
+      case 'U': Setvalue(confirmsalvageall) = false;
                 break;
       case 'v': Setvalue(verbose) = true;
                 break;
@@ -225,62 +399,60 @@ bool cPluginUndelete::ProcessArg(int argc, char *argv[])
   return optind >= argc;
 }
 
-const char *cPluginUndelete::Version(void)
-{
-  return VERSION;
-}
-
-const char *cPluginUndelete::Description(void)
-{
-  return tr(DESCRIPTION);
-}
-
 const char *cPluginUndelete::CommandLineHelp(void)
 {
   // Return a string that describes all known command line options.            column 80 --> |
-  return tr("  -m        --visible_in_mainmenu    Show the plugin in the mainmenu\n"
-            "  -M        --hide_in_mainmenu       Hide the plugin in the mainmenu\n"
-            "                                     You can start the Plugin in the setupmenu\n"
-            "  -n Name   --mainmenu_name=Name     Select Name for entry in the mainmenu\n"
-            "                                     (set also -m)\n"
-            "  -c        --confirm_del_rec        show confirmation for delete recording\n"
-            "  -C        --not_confirm_del_rec    delete recording without confirmation\n"
-            "  -d        --confirm_del_dir        show confirmation for delete directory\n"
-            "  -D        --not_confirm_del_dir    delete directory without confirmation\n"
-            "  -s        --confirm_undel_rec      show confirmation for undelete recording\n"
-            "  -S        --not_confirm_undel_rec  undelete recording without confirmation\n"
-            "  -t        --confirm_undel_dir      show confirmation for undelete directory\n"
-            "  -T        --not_confirm_undel_dir  undelete directory without confirmation\n"
-            "  -v        --verbose                Enable more logging\n"
-            "  -V        --noverbose              Disable more loggig\n"
-            "            --nosetup_commandline    Hide the 'Preferr Command Line Parameter'\n"
-            "                                     form setup-menu\n"
-            "  @config-file                       Read also parameters from this file"
+  return tr("  -m        --visible_in_mainmenu     Show the plugin in the mainmenu\n"
+            "  -M        --hide_in_mainmenu        Hide the plugin in the mainmenu\n"
+            "                                      You can start the Plugin in the setupmenu\n"
+            "  -n Name   --mainmenu_name=Name      Select Name for entry in the mainmenu\n"
+            "                                      (set also -m)\n"
+            "  -c        --confirm_purge_rec       show confirmation for purge recording\n"
+            "  -C        --not_confirm_purge_rec   purge recording without confirmation\n"
+            "  -d        --confirm_purge_dir       show confirmation for purge directory\n"
+            "  -D        --not_confirm_purge_dir   purge directory without confirmation\n"
+            "  -e        --confirm_purge_all       show confirmation for purge all function\n"
+            "  -E        --not_confirm_purge_all   purge all function without confirmation\n"
+            "  -s        --confirm_salvage_rec     show confirmation for salvage recording\n"
+            "  -S        --not_confirm_salvage_rec salvage recording without confirmation\n"
+            "  -t        --confirm_salvage_dir     show confirmation for salvage directory\n"
+            "  -T        --not_confirm_salvage_dir salvage directory without confirmation\n"
+            "  -u        --confirm_salvage_all     show confirmation for salvage all function\n"
+            "  -U        --not_confirm_salvage_all salvage all function without confirmation\n"
+            "  -v        --verbose                 Enable more logging\n"
+            "  -V        --noverbose               Disable more loggig\n"
+            "            --nosetup_commandline     Hide the 'Preferr Command Line Parameter'\n"
+            "                                      form setup-menu\n"
+            "  @config-file                        Read also parameters from this file"
             "\n"
             "  note: recording means deleted recordings (there not show in VDR)");
 
 /* only for translation:
-         "  -m        --visible_in_mainmenu    Plugin wird im Hautmenü angezeigt\n"
-         "  -M        --hide_in_mainmenu       kein Eintrag im Hauptmenü für das Plugin\n"
-         "                                     es kann über das Setup-Menü gestartet werden\n"
-         "  -n Name   --mainmenu_name=Name     Name für den Eintrag im Hauptmenü\n"
-         "                                     (diese Option setzt auch -m)\n"
-         "  -c        --confirm_del_rec        Bestätigung für das Löschen von Aufnahmen\n"
-         "  -C        --not_confirm_del_rec    keine Bestätigung (löschen Aufnahmen)\n"
-         "  -d        --confirm_del_dir        Bestätigung beim Löschen von Verzeichnissen\n"
-         "  -D        --not_confirm_del_dir    keine Bestätigung (löschen Verzeichnissen)\n"
-         "  -s        --confirm_undel_rec      Bestätigung Wiederherstellung von Aufnahmen\n"
-         "  -S        --not_confirm_undel_rec  keine Best. Wiederherstellung von Aufnahmen\n"
-         "  -t        --confirm_undel_dir      Bestätigung Wiederherstellung von Verzei.\n"
-         "  -T        --not_confirm_undel_dir  keine Best. Wiederherstellung von Verzei.\n"
-         "  -v        --verbose                erweiterte Protokollierung aktivieren\n"
-         "  -V        --noverbose              keine erweiterte Protokollierung\n"
-         "            --nosetup_commandline    Option 'Kommandozeile hat Vorrang'\n"
-         "                                     im Setup-Menü verbergen\n"
-         "  @config-file                       Komandozeilenoptionen auch aus der angegebenen\n"
-         "                                     Datei lesen\n"
-         "\n"
-         "  Hinweis: Mit Aufnahmen sind hier die gelöschten Aufnahmen gemeint"
+            "  -m        --visible_in_mainmenu     Plugin wird im Hautmenü angezeigt\n"
+            "  -M        --hide_in_mainmenu        kein Eintrag im Hauptmenü für das Plugin\n"
+            "                                      es kann über das Setup-Menü gestartet werden\n"
+            "  -n Name   --mainmenu_name=Name      Name für den Eintrag im Hauptmenü\n"
+            "                                      (diese Option setzt auch -m)\n"
+            "  -c        --confirm_purge_rec       Bestätigung für das Löschen von Aufnahmen\n"
+            "  -C        --not_confirm_purge_rec   keine Bestätigung (löschen Aufnahmen)\n"
+            "  -d        --confirm_purge_dir       Bestätigung beim Löschen von Verzeichnissen\n"
+            "  -D        --not_confirm_purge_dir   keine Bestätigung (löschen Verzeichnissen)\n"
+            "  -e        --confirm_purge_all       Bestätigung beim "alles Löschen"\n"
+            "  -E        --not_confirm_purge_all   "alles Löschen" ohne Bestätigung\n"
+            "  -s        --confirm_salvage_rec     Bestätigung Wiederherstellung von Aufnahmen\n"
+            "  -S        --not_confirm_salvage_rec keine Best. Wiederherstellung von Aufnahmen\n"
+            "  -t        --confirm_salvage_dir     Bestätigung Wiederherstellung von Verzei.\n"
+            "  -T        --not_confirm_salvage_dir keine Best. Wiederherstellung von Verzei.\n"
+            "  -u        --confirm_salvage_all     Bestätigung beim "alles Wiederherstellen"\n"
+            "  -U        --not_confirm_salvage_all "alles Wiederherstellen" ohne Bestätigung\n"
+            "  -v        --verbose                 erweiterte Protokollierung aktivieren\n"
+            "  -V        --noverbose               keine erweiterte Protokollierung\n"
+            "            --nosetup_commandline     Option 'Kommandozeile hat Vorrang'\n"
+            "                                      im Setup-Menü verbergen\n"
+            "  @config-file                        Komandozeilenoptionen auch aus der angegebenen\n"
+            "                                      Datei lesen\n"
+            "\n"
+            "  Hinweis: Mit Aufnahmen sind hier die gelöschten Aufnahmen gemeint"
 */
          // free: a b e f g h i j k l o p q r u w x y z
 }
@@ -295,46 +467,40 @@ bool cPluginUndelete::Start(void)
 {
   // Start any background activities the plugin shall perform.
   RegisterI18n(Phrases);
+  TestAndSetOSDLanguage();
 
-#ifdef UND_Debug1
-  dsyslog("%s: cPluginUndelete::Start undeleteconfigfile=%s", plugin_name, undeleteconfigfile.u);
-#endif
+  d1syslog("cPluginUndelete::Start", "undeleteconfigfile=%s", undeleteconfigfile.u);
 
   char *p;
-  char *q = strdup(ConfigDirectory(""));
+  char *q = strdup(ConfigDirectory());
   asprintf(&p, "%s%s%s", q, *(q + strlen(q) - 1) == '/' ? "" : "/", undeleteconfigfile.u);
   if (!access(undeleteconfigfile.u, F_OK) && !access(undeleteconfigfile.u, R_OK) || !access(p, F_OK) && !access(p, R_OK))
   {
     #define MAXARGS 100
     int fargc = 1;
     char *fargv[MAXARGS];
-    char buffer[MAXPARSEBUFFER];
+    cReadLine ReadLine;
     bool done;
     FILE *f;
 
     if (!access(undeleteconfigfile.u, F_OK))
     {
       f = fopen(undeleteconfigfile.u, "r");
-#ifdef UND_Debug1
-      dsyslog("%s: cPluginUndelete::Start open undeleteconfigfile=%s", plugin_name, undeleteconfigfile.u);
-#endif
+      d1syslog("cPluginUndelete::Start", "open undeleteconfigfile=%s", undeleteconfigfile.u);
     } else
     {
       f = fopen(p, "r");
-#ifdef UND_Debug1
-      dsyslog("%s: cPluginUndelete::Start open undeleteconfigfile=%s", plugin_name, p);
-#endif
+      d1syslog("cPluginUndelete::Start", "open undeleteconfigfile=%s", p);
     }
     free(p);
     free(q);
     if (!f)
     {
-      esyslog("%s: ERROR: cannot open config file: [%s]%s", plugin_name, ConfigDirectory(""), undeleteconfigfile.u);
+      esyslog("%s: ERROR: cannot open config file: [%s]%s", plugin_name, ConfigDirectory(), undeleteconfigfile.u);
       return false;
     }
-    while (fgets(buffer, sizeof(buffer), f) > 0)
+    while ((p = compactspace(ReadLine.Read(f))) != NULL)
     {
-      p = skipspace(stripspace(buffer));
       q = NULL;
       done = false;
       while (!done)
@@ -386,7 +552,7 @@ bool cPluginUndelete::Start(void)
     if (fargc > 1)
       if (!ProcessArg(fargc, fargv))
       {
-        esyslog("%s: ERROR: cannot parse config file: [%s]%s", plugin_name, ConfigDirectory(""), undeleteconfigfile.u);
+        esyslog("%s: ERROR: cannot parse config file: [%s]%s", plugin_name, ConfigDirectory(), undeleteconfigfile.u);
         return false;
       }
       while(fargc) free(fargv[--fargc]);
@@ -396,10 +562,10 @@ bool cPluginUndelete::Start(void)
     free(q);
     if (strcmp(undeleteconfigfile.u, undeleteconfigfile.d))
     {
-      esyslog("%s: ERROR: config file not found: [%s]%s", plugin_name, ConfigDirectory(""), undeleteconfigfile.u);
+      esyslog("%s: ERROR: config file not found: [%s]%s", plugin_name, ConfigDirectory(), undeleteconfigfile.u);
       return false;
     } else if (verbose.u)
-      isyslog("%s: INFO: config file not found: [%s]%s", plugin_name, ConfigDirectory(""), undeleteconfigfile.u);
+      isyslog("%s: INFO: config file not found: [%s]%s", plugin_name, ConfigDirectory(), undeleteconfigfile.u);
   }
 
   strn0cpy(mainmenu_name.d, tr("Menu$Undelete recordings"), sizeof(mainmenu_name.d));
@@ -417,12 +583,24 @@ bool cPluginUndelete::Start(void)
 
   // var pos5
   SetParamFile (undeleteconfigfile);
-  SetParam     (confirmdel);
-  SetParam     (confirmdeldir);
-  SetParam     (confirmundel);
-  SetParam     (confirmundeldir);
+  SetParam     (confirmpurge);
+  SetParam     (confirmpurgedir);
+  SetParam     (confirmpurgeall);
+  SetParam     (confirmsalvage);
+  SetParam     (confirmsalvagedir);
+  SetParam     (confirmsalvageall);
+  SetParam     (firstsalvage);
+  for (int i = 2; i < MaxFunctionName; i++)
+    SetParam   (functionkey[i]);
   SetParamFile (mainmenu_name);
   SetParam     (mainmenu_visible);
+  SetParam     (numkey);
+  SetParam     (okkey);
+  for (int i = 0; i < 2; i++)
+  {
+    SetParam   (functionline_b_e[i]);
+    SetParam   (functionline_num[i]);
+  }
   SetParam     (verbose);
 
   #undef SetParam
@@ -434,52 +612,443 @@ bool cPluginUndelete::Start(void)
   return true;
 }
 
-const char *cPluginUndelete::MainMenuEntry(void)
-{
-  return mainmenu_visible.u ? mainmenu_name.u : NULL;
-}
-
-cOsdObject *cPluginUndelete::MainMenuAction(void)
+void cPluginUndelete::Housekeeping(void)
 {
-#ifdef UND_Debug1
-  dsyslog("%s: cPluginUndelete::MainMenuAction", plugin_name);
-#endif
-  return new cMenuUndelete;
-}
-
-cMenuSetupPage *cPluginUndelete::SetupMenu(void)
-{
-#ifdef UND_Debug1
-  dsyslog("%s: cPluginUndelete::SetupMenu", plugin_name);
-#endif
-  return new cMenuSetupUndelete;
+  d2syslog("cPluginUndelete::Housekeeping", "NextRemoveThreadStart=%d (%d)", (int)NextRemoveThreadStart, (int)(NextRemoveThreadStart > 0 ? NextRemoveThreadStart - time(NULL) : 0));
+  if (NextRemoveThreadStart > 0 && NextRemoveThreadStart <= time(NULL))
+  {
+    if (oRemoveThread.ActiveWithCancel())
+      oRemoveThread.Start();
+    NextRemoveThreadStart = 0;
+  }
 }
 
-
 bool cPluginUndelete::SetupParse(const char *Name, const char *Value)
 {
   #define SetParam(T) { T.r = true; T.s = strtol(Value, NULL, 0); }
-  #define SetParamFile(T) { T.r = true; strn0cpy(T.s, Value, sizeof(T.s)); }
+  #define SetParamChar(T) { T.r = true; strn0cpy(T.s, Value, sizeof(T.s)); }
 
   // Parse your own setup parameters and store their values.
   dsyslog("%s: Setupparameter %s=%s", plugin_name, Name, Value);
   // var pos6
-
-  if      (!strcasecmp(Name, "commandline"))  SetParam     (commandline_preference)
-  else if (!strcasecmp(Name, "confdel"))      SetParam     (confirmdel)
-  else if (!strcasecmp(Name, "confdeldir"))   SetParam     (confirmdeldir)
-  else if (!strcasecmp(Name, "confundel"))    SetParam     (confirmundel)
-  else if (!strcasecmp(Name, "confundeldir")) SetParam     (confirmundeldir)
-  else if (!strcasecmp(Name, "name"))         SetParamFile (mainmenu_name)
-  else if (!strcasecmp(Name, "visible"))      SetParam     (mainmenu_visible)
-  else if (!strcasecmp(Name, "verbose"))      SetParam     (verbose)
+  if      (!strcasecmp(Name, "commandline"))   SetParam     (commandline_preference)
+  else if (!strcasecmp(Name, "confpurge1"))    SetParam     (confirmpurge)
+  else if (!strcasecmp(Name, "confpurge2"))    SetParam     (confirmpurgedir)
+  else if (!strcasecmp(Name, "confpurge3"))    SetParam     (confirmpurgeall)
+  else if (!strcasecmp(Name, "confsalvage1"))  SetParam     (confirmsalvage)
+  else if (!strcasecmp(Name, "confsalvage2"))  SetParam     (confirmsalvagedir)
+  else if (!strcasecmp(Name, "confsalvage3"))  SetParam     (confirmsalvageall)
+  else if (!strcasecmp(Name, "firstsalvage"))  SetParam     (firstsalvage)
+  else if (!strcasecmp(Name, "functionkey02")) SetParam     (functionkey[2])
+  else if (!strcasecmp(Name, "functionkey03")) SetParam     (functionkey[3])
+  else if (!strcasecmp(Name, "functionkey04")) SetParam     (functionkey[4])
+  else if (!strcasecmp(Name, "functionkey05")) SetParam     (functionkey[5])
+  else if (!strcasecmp(Name, "functionkey06")) SetParam     (functionkey[6])
+  else if (!strcasecmp(Name, "functionkey07")) SetParam     (functionkey[7])
+  else if (!strcasecmp(Name, "functionkey08")) SetParam     (functionkey[8])
+  else if (!strcasecmp(Name, "functionkey09")) SetParam     (functionkey[9])
+  else if (!strcasecmp(Name, "functionkey10")) SetParam     (functionkey[10])
+  else if (!strcasecmp(Name, "name"))          SetParamChar (mainmenu_name)
+  else if (!strcasecmp(Name, "visible"))       SetParam     (mainmenu_visible)
+  else if (!strcasecmp(Name, "numkey"))        SetParam     (numkey)
+  else if (!strcasecmp(Name, "okkey"))         SetParam     (okkey)
+  else if (!strcasecmp(Name, "purgebe"))       SetParam     (functionline_b_e[0])
+  else if (!strcasecmp(Name, "purgenum"))      SetParam     (functionline_num[0])
+  else if (!strcasecmp(Name, "salvagebe"))     SetParam     (functionline_b_e[1])
+  else if (!strcasecmp(Name, "salvagenum"))    SetParam     (functionline_num[1])
+  else if (!strcasecmp(Name, "verbose"))       SetParam     (verbose)
   else
     return false;
   return true;
 
   #undef SetParam
   #undef SetParamChar
-  #undef SetParamFile
+}
+
+#ifdef HAVE_SVDRP
+const char **cPluginUndelete::SVDRPHelpPages(void)
+{
+  static const char *HelpPages[] = {
+  "LSTD    [ <number> ]\n"
+  "        List deleted recordings. Without option, all deleted recordings are\n"
+  "        listed.\n"
+  "        Otherwise the information for the given deleted recording is listed.",
+  "SIZED   [ -h ]\n"
+  "        Caclulate the size of deleted recordings. Result is in Bytes or\n"
+  "        with option -h in human readable format.",
+  "RMDIR\n"
+  "        Start remove empty directory in the background",
+  "PURGE   ALL | <number>\n"
+  "        purge the selected deleted recording (number see LSTD)",
+  "SALVAGE ALL | <number>\n"
+  "        salvage the selected deleted recording (number see LSTD)",
+  NULL
+  };
+  return HelpPages;
+}
+
+cString cPluginUndelete::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode)
+{
+#define CMD(c) (strcasecmp(Command, c) == 0)
+
+  d1syslog("cPluginUndelete::SVDRPCommand", "Command=%s Option=%s ReplyCode=%d MenuIsOpen=%s", Command ? Command : "(NULL)", Option ? Option : "(NULL)", ReplyCode, MenuIsOpen ? "yes" : "no");
+  if (MenuIsOpen)
+  {
+    ReplyCode = 554;
+    return "OSD-Menu is currently open";
+  }
+  if        CMD("LSTD")
+  {
+    ReplyCode = 550;
+    if (*Option)
+    {
+      if (isnumber(Option))
+      {
+        cRecording *recording = DeletedRecordings.Get(atoi(Option) - 1);
+        if (recording)
+        {
+#if VDRVERSNUM >= 10325
+          const char *summary = NULL;
+          if (recording->Info())
+            summary = recording->Info()->Description();
+#else 
+          const char *summary = recording->Summary();
+#endif
+          if (summary && *summary)
+          {
+            ReplyCode = 902;
+            return summary;
+          } else
+            return "no summary availabe";
+        } else
+          return cString::sprintf("deleted recording \"%s\" not found%s", Option, DeletedRecordings.Count() ? "" : " (use LSTD before get summary)");
+      } else
+      {
+        ReplyCode = 501;
+        return cString::sprintf("Error in deleted recording number \"%s\"", Option);
+      }
+    } else
+    {
+      // list deleted recordings
+#if VDRVERSNUM >= 10311
+      DeletedRecordings.Load();
+#else
+      DeletedRecordings.Load(true);
+#endif
+      DeletedRecordings.Sort();
+      freenull(SVDRP_Process);
+      char *list = NULL;
+      for (cRecording *recording = DeletedRecordings.First(); recording; recording = DeletedRecordings.Next(recording))
+      {
+        char *newline;
+	asprintf(&newline, "%s%d %s\n", list ? list : "", recording->Index() + 1, recording->Title(' ', true, -1));
+        freenull(list);
+        list = newline;
+      }
+      if (list)
+      {
+        ReplyCode = 901;
+        return cString(list, true);
+      } else
+        return "No deleted recordings available";
+    }
+  } else if CMD("SIZED")
+  {
+    long long llsize = 0;
+    if (DeletedRecordings.Count())
+    {
+      for (cRecording *recording = DeletedRecordings.First(); recording; recording = DeletedRecordings.Next(recording))
+      {
+        char *process = NULL;
+        if (SVDRP_Process)
+        {
+          char *temp;
+          asprintf(&temp, "#%d#", recording->Index() + 1);
+          process = strstr(SVDRP_Process, temp);
+          free(temp);
+        }
+        if (!process)
+          GetVDRSize(recording->FileName(), llsize);
+      }
+    } else
+    {
+#if VDRVERSNUM >= 10311
+      DeletedRecordings.Load();
+#else
+      DeletedRecordings.Load(true);
+#endif
+      for (cRecording *recording = DeletedRecordings.First(); recording; recording = DeletedRecordings.Next(recording))
+        GetVDRSize(recording->FileName(), llsize);
+      DeletedRecordings.Clear();
+    }
+    if (*Option)
+      if (strcasecmp(Option, "-h"))
+      {
+        ReplyCode = 501;
+        return cString::sprintf("Error in parameter \"%s\" (only -h allow)", Option);
+      } else
+      {
+        float llsizetmp = llsize;
+        const char* strUnit[5] = { tr("Bytes"), "KB", "MB", "GB", "TB" };
+        int Unit;
+        for(Unit = 0; (llsizetmp > 1024) && (Unit < 5); Unit++)
+          llsizetmp /= 1024;
+        int decimalplaces = Unit < 2 ? 0 : Unit > 2 ? 2 : 1;
+        ReplyCode = 904;
+        return cString::sprintf("size of deleted recordings are %1.*f %s", decimalplaces, llsizetmp, strUnit[Unit]);
+      }
+    else
+    {
+      ReplyCode = 903;
+      return cString::sprintf("%lld bytes in deleted recordings", llsize);
+    }
+  } else if CMD("RMDIR")
+  {
+    NextRemoveThreadStart = 0;
+    if (oRemoveThread.ActiveWithCancel())
+    {
+      ReplyCode = 554;
+      return "thread for remove empty directory alredy active";
+    } else
+    {
+      oRemoveThread.Start();
+      ReplyCode = 905;
+      return "thread for remove empty directory is started";
+    }
+  } else if CMD("PURGE")
+  {
+    ReplyCode = 550;
+    if (*Option)
+    {
+      if (isnumber(Option))
+      {
+        int recnumber = atoi(Option);
+        char *process = NULL;
+        if (SVDRP_Process)
+        {
+          char *temp;
+          asprintf(&temp, "#%d#", recnumber);
+          process = strstr(SVDRP_Process, temp);
+          free(temp);
+        }
+        if (process)
+          return cString::sprintf("deleted recording \"%s\" is already %s", Option, *--process == 'P' ? "purged" : "salvaged");
+        else
+        {
+          cRecording *recording = DeletedRecordings.Get(recnumber - 1);
+          if (recording)
+          {
+            if (verbose.u)
+              isyslog("%s: purge deleted recording (%s)", plugin_name, recording->FileName());
+            if (!RemoveVideoFile(recording->FileName()))
+            {
+              esyslog("%s: Error while remove deleted recording (%s)", plugin_name, recording->FileName());
+              return cString::sprintf("error while purge the deleted recording \"%s\"  [%s]", Option, recording->Title());
+            }
+            NextRemoveThreadStart = time(NULL) + 600;
+            char *temp;
+            asprintf(&temp, "%sP#%d#", SVDRP_Process ? SVDRP_Process : "", recnumber);
+            freenull(SVDRP_Process);
+            SVDRP_Process = temp;
+            ReplyCode = 906;
+            return cString::sprintf("purge of deleted recording \"%s\" [%s] is successful", Option, recording->Title());
+          } else
+            return cString::sprintf("deleted recording \"%s\" not found%s", Option, DeletedRecordings.Count() ? "" : " (use LSTD before purge)");
+        }
+      } else if (!strcasecmp(Option, "ALL"))
+      {
+        if (!DeletedRecordings.Count())
+        {
+#if VDRVERSNUM >= 10311
+          DeletedRecordings.Load();
+#else
+          DeletedRecordings.Load(true);
+#endif
+          DeletedRecordings.Sort();
+          freenull(SVDRP_Process);
+          if (!DeletedRecordings.Count())
+            return "No deleted recordings available";
+        }
+        int replycode = 0;
+        char *list = NULL;
+        for (cRecording *recording = DeletedRecordings.First(); recording; recording = DeletedRecordings.Next(recording))
+        {
+          replycode = 0;
+          cString reply = SVDRPCommand("purge", (const char *)cString::sprintf("%d", recording->Index() + 1), replycode);
+          if (replycode < 900)
+          {
+            char *newline;
+            asprintf(&newline, "%s%s\n", list ? list : "", (const char *)reply);
+            freenull(list);
+            list = newline;
+          }
+        }
+        if (!oRemoveThread.ActiveWithCancel())
+          oRemoveThread.Start();
+        DeletedRecordings.Clear();
+        freenull(SVDRP_Process);
+#if VDRVERSNUM >= 10311
+        DeletedRecordings.Load();
+#else
+        DeletedRecordings.Load(true);
+#endif
+        bool recordingsavailable = DeletedRecordings.Count();
+        DeletedRecordings.Clear();
+        if (recordingsavailable)
+          return cString::sprintf("%snot all deleted recordings are purged (see lstd)", list ? (const char *)cString(list, true) : "");
+        else if (list)
+        {
+          ReplyCode = 907;
+          return cString::sprintf("%swarings while purge deleted recordings", (const char *)cString(list, true));
+        } else
+        {
+          ReplyCode = 908;
+          return "all deleted recordings are purged and thread for remove empty directory is started";
+        }
+      } else
+      {
+        ReplyCode = 501;
+        return cString::sprintf("Error in deleted recording number \"%s\"", Option);
+      }
+    } else
+    {
+      ReplyCode = 501;
+      return "number of deleted recoding for purge missing";
+    }
+  } else if CMD("SALVAGE")
+  {
+    ReplyCode = 550;
+    if (*Option)
+    {
+      if (isnumber(Option))
+      {
+        int recnumber = atoi(Option);
+        char *process = NULL;
+        if (SVDRP_Process)
+        {
+          char *temp;
+          asprintf(&temp, "#%d#", recnumber);
+          process = strstr(SVDRP_Process, temp);
+          free(temp);
+        }
+        if (process)
+          return cString::sprintf("deleted recording \"%s\" is already %s", Option, *--process == 'P' ? "purged" : "salvaged");
+        else
+        {
+          cRecording *recording = DeletedRecordings.Get(recnumber - 1);
+          if (recording)
+          {
+            if (verbose.u)
+              isyslog("%s: undelete recording (%s)", plugin_name, recording->FileName());
+            cString NewName = recording->FileName();
+            char *ext = strrchr(NewName, '.');
+            if (!strcmp(ext, DELEXT))
+            {
+              strncpy(ext, RECEXT, strlen(ext));
+              if (!access(NewName, F_OK))
+              {
+                if (verbose.u)
+                  isyslog("%s: Recording with the same name exists (%s)", plugin_name, (const char *)NewName);
+                return cString::sprintf("recording with the same name exists \"%s\" [%s]", Option, recording->Title());
+              } else
+              {
+                if (!RenameVideoFile(recording->FileName(), (const char *)NewName))
+                {
+                  esyslog("%s: Error while rename deleted recording (%s) to (%s)", plugin_name, recording->FileName(), (const char *)NewName);
+                  return cString::sprintf("error while rename deleted recording \"%s\" [%s]", Option, recording->Title());
+                }
+              }
+            }
+            char *temp;
+            asprintf(&temp, "%sS#%d#", SVDRP_Process ? SVDRP_Process : "", recnumber);
+            freenull(SVDRP_Process);
+            SVDRP_Process = temp;
+            ReplyCode = 909;
+            return cString::sprintf("salvage of deleted recording \"%s\" [%s] is successful", Option, recording->Title());
+          } else
+            return cString::sprintf("deleted recording \"%s\" not found%s", Option, DeletedRecordings.Count() ? "" : " (use LSTD before salvage)");
+        }
+      } else if (!strcasecmp(Option, "ALL"))
+      {
+        if (!DeletedRecordings.Count())
+        {
+#if VDRVERSNUM >= 10311
+          DeletedRecordings.Load();
+#else
+          DeletedRecordings.Load(true);
+#endif
+          DeletedRecordings.Sort();
+          freenull(SVDRP_Process);
+          if (!DeletedRecordings.Count())
+            return "No deleted recordings available";
+        }
+        int replycode = 0;
+        char *list = NULL;
+        for (cRecording *recording = DeletedRecordings.First(); recording; recording = DeletedRecordings.Next(recording))
+        {
+          replycode = 0;
+          cString reply = SVDRPCommand("salvage", (const char *)cString::sprintf("%d", recording->Index() + 1), replycode);
+          if (replycode < 900)
+          {
+            char *newline;
+            asprintf(&newline, "%s%s\n", list ? list : "", (const char *)reply);
+            freenull(list);
+            list = newline;
+          }
+        }
+        DeletedRecordings.Clear();
+        freenull(SVDRP_Process);
+#if VDRVERSNUM >= 10311
+        DeletedRecordings.Load();
+#else
+        DeletedRecordings.Load(true);
+#endif
+        bool recordingsavailable = DeletedRecordings.Count();
+        DeletedRecordings.Clear();
+        if (recordingsavailable)
+          return cString::sprintf("%snot all deleted recordings are salvaged (see lstd)", list ? (const char *)cString(list, true) : "");
+        else if (list)
+        {
+          ReplyCode = 910;
+          return cString::sprintf("%swarings while salvage deleted recordings", (const char *)cString(list, true));
+        } else
+        {
+          ReplyCode = 911;
+          return "all deleted recordings are salvaged";
+        }
+      } else
+      {
+        ReplyCode = 501;
+        return cString::sprintf("Error in deleted recording number \"%s\"", Option);
+      }
+    } else
+    {
+      ReplyCode = 501;
+      return "number of deleted recoding for purge missing";
+    }
+  }
+  return NULL;
+#undef CMD
+}
+#endif
+
+void cRemoveThread::Action(void)
+{
+  d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread started (pid=%d)", getpid());
+  RemoveEmptyVideoDirectories();
+  d1syslogi("cRemoveThread::Action", "RemoveEmptyVideoDirectories thread ended (pid=%d)", getpid());
+}
+
+bool cRemoveThread::ActiveWithCancel(void)
+{
+#if VDRVERSNUM >= 10318
+  return Active();
+#else
+  if (Active())
+    return true;
+  Cancel(1); // reset the var "running" to restart the thread, fixed in 1.3.18
+  return false;
+#endif
 }
 
 VDRPLUGINCREATOR(cPluginUndelete); // Don't touch this!