diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-03-08 06:39:36 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-03-08 06:39:36 +0000 |
| commit | 3d506c66cc8ec133730edddeaff4bd2ffd8a129b (patch) | |
| tree | 5ddb0bd2b2b222bf33ae696e437ef344d6ece94c /lib/XXV/MODULES | |
| parent | 6384e7c0ed150717da4c29e39adf78b26804c8ad (diff) | |
| download | xxv-3d506c66cc8ec133730edddeaff4bd2ffd8a129b.tar.gz xxv-3d506c66cc8ec133730edddeaff4bd2ffd8a129b.tar.bz2 | |
* AJAX: add handler 'question'
* REPORT: Don't fail if'nt HTTPD loaded
* HTTPD: remove unused ->{cgi} from 'question'
Diffstat (limited to 'lib/XXV/MODULES')
| -rw-r--r-- | lib/XXV/MODULES/AUTOTIMER.pm | 18 | ||||
| -rw-r--r-- | lib/XXV/MODULES/RECORDS.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/MODULES/REPORT.pm | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm index db2c02e..ec20e90 100644 --- a/lib/XXV/MODULES/AUTOTIMER.pm +++ b/lib/XXV/MODULES/AUTOTIMER.pm @@ -707,11 +707,11 @@ You can also fine tune your search : def => sub { my $value = $epg->{InFields} || ['title','subtitle']; my @vals = (ref $value eq 'ARRAY') ? @$value : split(/\s*,\s*/, $value); - my @ret; + my $ret; foreach my $v (@vals) { - push(@ret,$in{$v}); + push(@$ret,$in{$v}); } - return @ret; + return $ret; }, check => sub{ my $value = shift || return; @@ -757,11 +757,11 @@ You can also fine tune your search : def => sub { my $value = $epg->{Done}; my @vals = (ref $value eq 'ARRAY') ? @$value : split(/\s*,\s*/, $value); - my @ret; + my $ret; foreach my $v (@vals) { - push(@ret,$do{$v}); + push(@$ret,$do{$v}); } - return @ret; + return $ret; }, check => sub{ my $value = shift || ''; @@ -834,11 +834,11 @@ You can also fine tune your search : def => sub { my $value = $epg->{Weekdays} || ['Mon','Tue','Wed','Thu','Fri','Sat','Sun']; my @vals = (ref $value eq 'ARRAY') ? @$value : split(/\s*,\s*/, $value); - my @ret; + my $ret; foreach my $v (@vals) { - push(@ret,$wd{$v}); + push(@$ret,$wd{$v}); } - return @ret; + return $ret; }, check => sub{ my $value = shift || [$wd{'Mon'}, $wd{'Tue'}, $wd{'Wed'}, $wd{'Thu'}, $wd{'Fri'}, $wd{'Sat'}, $wd{'Sun'}]; diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm index 829dc21..d5f37ac 100644 --- a/lib/XXV/MODULES/RECORDS.pm +++ b/lib/XXV/MODULES/RECORDS.pm @@ -1764,7 +1764,7 @@ sub delete { my $record = shift || return con_err($console,gettext("No recording defined for deletion! Please use rdelete 'id'.")); my $answer = shift || 0; - my @rcs = split(/_/, $record); + my @rcs = split(/[^0-9a-fl\:]/, $record); my $todelete; my $md5delete; my %rec; diff --git a/lib/XXV/MODULES/REPORT.pm b/lib/XXV/MODULES/REPORT.pm index 39fd46b..bba0b06 100644 --- a/lib/XXV/MODULES/REPORT.pm +++ b/lib/XXV/MODULES/REPORT.pm @@ -214,7 +214,9 @@ sub news { my $lev = $obj->scala($levname) || return error('Problem to analyze level!'); - my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port}); + my $hmod = main::getModule('HTTPD') or return; + + my $url = sprintf("http://%s:%s/", $obj->{host}, $hmod->{Port}); $url = sprintf("%s?cmd=%s&data=%s", $url, $cmd, $id) if($cmd && $id); |