diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2009-11-08 20:09:17 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2009-11-08 20:09:17 +0000 |
| commit | d48498579ceaa0ab4a9b4ae8f2a6a95b0ee89311 (patch) | |
| tree | 077992b2b175ad23ba85dd2b82721295b61a94ef /lib | |
| parent | 4571a61a157b8fb60594e2f2c793a39c8c82a6e6 (diff) | |
| download | xxv-d48498579ceaa0ab4a9b4ae8f2a6a95b0ee89311.tar.gz xxv-d48498579ceaa0ab4a9b4ae8f2a6a95b0ee89311.tar.bz2 | |
* USER: fix typo
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/XXV/MODULES/MOVETIMER.pm | 16 | ||||
| -rw-r--r-- | lib/XXV/MODULES/USER.pm | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lib/XXV/MODULES/MOVETIMER.pm b/lib/XXV/MODULES/MOVETIMER.pm index e4aa4a1..728aefe 100644 --- a/lib/XXV/MODULES/MOVETIMER.pm +++ b/lib/XXV/MODULES/MOVETIMER.pm @@ -384,6 +384,8 @@ sub movetimeredit { my $modC = main::getModule('CHANNELS'); + my $vlist = $self->{svdrp}->enum_onlinehosts(); + my $rule; if($id and not ref $data) { my $sth = $self->{dbh}->prepare("select * from MOVETIMER where id = ?"); @@ -393,10 +395,14 @@ sub movetimeredit { } elsif (ref $data eq 'HASH') { $rule = $data; + if(scalar @$vlist <= 1) { + $data->{sourcevid} = $self->{svdrp}->primary_hosts(); + $data->{destinationvid} = $self->{svdrp}->primary_hosts(); + } } my $con = $console->typ eq "CONSOLE"; - my $vlist = $self->{svdrp}->enum_onlinehosts(); + my $questions = [ 'id' => { @@ -420,8 +426,8 @@ sub movetimeredit { return undef, gettext("This is required!") unless($value); - my $ch = $modC->ToCID($value,$rule->{sourcevid}); - return undef, sprintf(gettext("Channel '%s' does not exist on video disk recorder %s!"),$value, $self->{svdrp}->hostname($rule->{sourcevid})) + my $ch = $modC->ToCID($value,$data->{sourcevid}); + return undef, sprintf(gettext("Channel '%s' does not exist on video disk recorder %s!"),$value, $self->{svdrp}->hostname($data->{sourcevid})) unless($ch); return $ch; }, @@ -443,8 +449,8 @@ sub movetimeredit { return undef, gettext("This is required!") unless($value); - my $ch = $modC->ToCID($value,$rule->{destinationvid}); - return undef, sprintf(gettext("Channel '%s' does not exist on video disk recorder %s!"),$value, $self->{svdrp}->hostname($rule->{destinationvid})) + my $ch = $modC->ToCID($value,$data->{destinationvid}); + return undef, sprintf(gettext("Channel '%s' does not exist on video disk recorder %s!"),$value, $self->{svdrp}->hostname($data->{destinationvid})) unless($ch); return $ch; }, diff --git a/lib/XXV/MODULES/USER.pm b/lib/XXV/MODULES/USER.pm index 288bc33..00e13e6 100644 --- a/lib/XXV/MODULES/USER.pm +++ b/lib/XXV/MODULES/USER.pm @@ -215,7 +215,7 @@ sub _init { main::after(sub{ # Remove old data - $self->{dbh}->do('delete from SESSION'); + $self->_deleteSession(); # Remove expires session every one hour Event->timer( @@ -223,7 +223,7 @@ sub _init { prio => 6, # -1 very hard ... 6 very low cb => sub{ lg sprintf('Remove expires session.'); - $self->deleteSession(); + $self->_deleteSession(); }, ); return 1; |
