From 0d66c4b5d972e6e439bec0a3028c8de70e137db8 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 6 Oct 2008 09:00:44 +0000
Subject: * TIMER/tlist: display used recorder * CONFIG: Remove double
 reconfigure * CONFIG: Remove unusable command write configuation * Base:
 remove command restart

---
 bin/xxvd | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

(limited to 'bin')

diff --git a/bin/xxvd b/bin/xxvd
index 7c4ac5c..7de3b3f 100755
--- a/bin/xxvd
+++ b/bin/xxvd
@@ -5,7 +5,6 @@ use strict;
 use FindBin qw($RealBin);
 
 my $TEMPLMOD;
-my $START   = time;
 
 # Test on Template Modul in normale Path
 BEGIN {
@@ -181,8 +180,6 @@ $MODULES->{'XXV::MODULES::General'}->{MOD} = &module;
 
 &docu;
 
-my $starttime = time - $START;
-
 while(Event::loop(1)) {};
 
 # THE MAIN PROGRAM --------------------------------- END
@@ -392,14 +389,6 @@ sub getGeneralConfig {
     return $Config->{General};
 }
 
-
-# ------------------
-sub getStartTime {
-# ------------------
-    return $START;
-}
-
-
 # ------------------
 sub getVersion {
 # ------------------
@@ -512,27 +501,6 @@ sub more {
     }
 }
 
-# ------------------
-sub restart {
-# ------------------
-    my $watcher = shift;
-    my $console = shift;
-
-    if(-x $Config->{General}->{initscript}) {
-        my $msg = sprintf(gettext("The xxv system will restart now. Please try to re-login in %d seconds."), $starttime);
-        $console->message($msg);
-        debug $msg;
-        $console->redirect({url => '/', wait => $starttime, parent => 'top'})
-            if($console->typ eq 'HTML');
-        my $initscript = $Config->{General}->{initscript};
-        my $run = sprintf('echo "%s restart" | at now', $initscript);
-
-        my $erg = `$run`;
-    } else {
-        $console->err(gettext("Couldn't restart the xxv system! Script for initialization couldn't be executed."));
-    }
-}
-
 # ------------------
 sub getDBVersion {
 # ------------------
@@ -734,12 +702,6 @@ sub module {
                     }
                 },
             },
-            initscript => {
-                description => gettext('Initialization script to restart xxv'),
-                default     => '/etc/init.d/xxvd',
-                type        => 'file',
-                required    => gettext("This is required!"),
-            },
         },
         Commands => {
             doc => {
@@ -756,16 +718,6 @@ sub module {
             },
         },
     };
-    # Only as superuser
-    if(0 == $<)
-    {
-      $args->{'Commands'}->{'restart'} = {
-                description => gettext('Call initialization script to restart the xxv system.'),
-                short       => 'restart',
-                callback    => sub{ restart(@_) },
-                Level       => 'admin',
-             };
-    }
     return $args;
 }
 
-- 
cgit v1.2.3