diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-09-09 16:24:47 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-09-09 16:24:47 +0000 |
| commit | c58704322fa8fcbee809d4c02643197d05293160 (patch) | |
| tree | 317742f5fd47ac8c70791bca517c55abb7f324da /lib | |
| parent | 3c9849839582d238ef75a191728a14b84a8eb577 (diff) | |
| download | xxv-c58704322fa8fcbee809d4c02643197d05293160.tar.gz xxv-c58704322fa8fcbee809d4c02643197d05293160.tar.bz2 | |
* Update english translation
* Send proper mime header if file not modified (on state 304)
Diffstat (limited to 'lib')
37 files changed, 802 insertions, 813 deletions
diff --git a/lib/Tools.pm b/lib/Tools.pm index e5bdce7..30998d7 100644 --- a/lib/Tools.pm +++ b/lib/Tools.pm @@ -276,7 +276,7 @@ sub load_file { #-------------------------------------------------------- my $file = shift || die "Kein File bei Loader $!"; - lg sprintf('Load file "%s" from system', + lg sprintf('Load file "%s"', $file, ); @@ -298,7 +298,7 @@ sub save_file { $data =~ s/\r\n/\n/sig; - lg sprintf('Save %s in file "%s"', + lg sprintf('Save file %s(%s)', $file, convert(length($data)) ); diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm index 90efb71..2aa3171 100644 --- a/lib/XXV/MODULES/AUTOTIMER.pm +++ b/lib/XXV/MODULES/AUTOTIMER.pm @@ -12,13 +12,13 @@ use Locale::gettext; # Usage: my $modhash = $obj->module(); # ------------------ sub module { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'AUTOTIMER', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module search for epg entries with an user defined text and create new timer.'), + Description => gettext('This module searches for EPG entries with user-defined text and creates new timers.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -32,7 +32,7 @@ sub module { required => gettext('This is required!'), }, exclude => { - description => gettext('Exclude channel list for autotimer.'), + description => gettext('Exclude channels from autotimer'), type => 'string', default => 'POS > 50', check => sub{ @@ -47,13 +47,13 @@ sub module { }, Commands => { astatus => { - description => gettext('Status from autotimers'), + description => gettext('Display status of autotimers.'), short => 'as', callback => sub{ $obj->status(@_) }, DenyClass => 'alist', }, anew => { - description => gettext("Create a new autotimer"), + description => gettext("Create new autotimer"), short => 'an', callback => sub{ $obj->autotimerCreate(@_) }, Level => 'user', @@ -67,7 +67,7 @@ sub module { DenyClass => 'aedit', }, aedit => { - description => gettext("Edit a autotimer 'aid'"), + description => gettext("Edit an autotimer 'aid'"), short => 'ae', callback => sub{ $obj->autotimerEdit(@_) }, Level => 'user', @@ -80,13 +80,13 @@ sub module { DenyClass => 'alist', }, alist => { - description => gettext("List the autotimer 'aid'"), + description => gettext("Show autotimer 'aid'"), short => 'al', callback => sub{ $obj->list(@_) }, DenyClass => 'alist', }, aupdate => { - description => gettext("Start the autotimer process"), + description => gettext("Start autotimer search."), short => 'au', callback => sub{ $obj->autotimer(@_) }, Level => 'user', @@ -107,7 +107,7 @@ sub module { }, RegEvent => { 'newTimerfromAutotimer' => { - Descr => gettext('Create event entries, if a new timer from autotimer created.'), + Descr => gettext('Create event entries if an autotimer has created a new timer.'), # You have this choices (harmless is default): # 'harmless', 'interesting', 'veryinteresting', 'important', 'veryimportant' @@ -136,7 +136,7 @@ sub module { my $autotimer = getDataById($timer->{AutotimerId}, 'AUTOTIMER', 'Id'); my $title = sprintf(gettext("Autotimer('%s') found: %s"), $autotimer->{Search}, $timer->{File}); - my $description = sprintf(gettext("At: %s to %s\nDescription: %s"), + my $description = sprintf(gettext("On: %s to %s\nDescription: %s"), $timer->{NextStartTime}, fmttime($timer->{Stop}), $desc && $desc->{description} ? $desc->{description} : '' @@ -159,7 +159,7 @@ sub module { # Usage: my $report = $obj->status([$watcher, $console]); # ------------------ sub status { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift || 0; @@ -201,7 +201,7 @@ ORDER BY unshift(@$erg, $fields); return { - message => sprintf(gettext('Autotimer has %d new timer programmed, since last report at %s'), + message => sprintf(gettext('Autotimer has programmed %d new timer(s) since last report to %s'), (scalar @$erg - 1), scalar localtime($lastReportTime)), table => $erg, }; @@ -248,7 +248,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -306,7 +306,7 @@ sub _init { # Usage: $obj->autotimer([$autotimerid]); # ------------------ sub autotimer { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $autotimerid = shift; @@ -327,7 +327,7 @@ sub autotimer { my $waiter; if(ref $console && !$autotimerid && $console->typ eq 'HTML') { my $zaehler = scalar keys %$att; - $waiter = $console->wait(gettext("Look for autotimer ..."), 0, ++$zaehler, 'no'); + $waiter = $console->wait(gettext("Searching for autotimer ..."), 0, ++$zaehler, 'no'); } my $l = 0; # Lines for Waiter @@ -342,12 +342,12 @@ sub autotimer { foreach my $id (sort keys %$att) { my $a = $att->{$id}; - $waiter->next(++$l, undef, sprintf(gettext("Look for autotimer with ID(%d) with search '%s'"), $id, $a->{Search})) + $waiter->next(++$l, undef, sprintf(gettext("Search for autotimer with ID(%d) with search pattern '%s'"), $id, $a->{Search})) if(ref $waiter); if(ref $console && $autotimerid) { $console->message(' ') if($console->{TYP} eq 'HTML'); - $console->message(sprintf(gettext("Look for autotimer with ID(%d) with search '%s'"), $id, $a->{Search})); + $console->message(sprintf(gettext("Search for autotimer with ID(%d) with search pattern '%s'"), $id, $a->{Search})); } # Build SQL Command and run it .... @@ -436,16 +436,16 @@ sub autotimer { } } if($error) { - $console->err(sprintf(gettext("Can't save timer for '%s' : %s"), $events->{$Id}->{File}, $error)) + $console->err(sprintf(gettext("Could not save timer for '%s' : %s"), $events->{$Id}->{File}, $error)) if(ref $console && $autotimerid); } else { if($timerID) { ++$m; - $console->message(sprintf(gettext("Modify timer for '%s'."), $events->{$Id}->{File})) + $console->message(sprintf(gettext("Modified timer for '%s'."), $events->{$Id}->{File})) if(ref $console && $autotimerid); } else { ++$c; - $console->message(sprintf(gettext("Create timer for '%s'."), $events->{$Id}->{File})) + $console->message(sprintf(gettext("Timer for '%s' has been created."), $events->{$Id}->{File})) if(ref $console && $autotimerid); } } @@ -453,7 +453,7 @@ sub autotimer { $C += $c; $M += $m; if($c) { - my $msg = sprintf(gettext("Create %d timer for '%s'."), $c, $a->{Search}); + my $msg = sprintf(gettext("Created %d timer for '%s'."), $c, $a->{Search}); if(ref $console && $autotimerid) { $console->message($msg); } @@ -462,7 +462,7 @@ sub autotimer { } } if($m) { - my $msg = sprintf(gettext("Modify %d timer for '%s'."), $m, $a->{Search}); + my $msg = sprintf(gettext("Modified %d timer for '%s'."), $m, $a->{Search}); if(ref $console && $autotimerid) { $console->message($msg); } @@ -472,7 +472,7 @@ sub autotimer { } } - $waiter->next(undef,undef,gettext('Read new timer in data base.')) + $waiter->next(undef,undef,gettext('Read new timers into database.')) if(ref $waiter); sleep 1; @@ -484,11 +484,11 @@ sub autotimer { if(ref $console) { $console->start() if(ref $waiter); - unshift(@{$log},sprintf(gettext("Autotimer process has %d timers created and %d timers modified."), $C, $M)); + unshift(@{$log},sprintf(gettext("Autotimer process created %d timers and modified %d timers."), $C, $M)); lg join("\n", @$log); $console->message($log); $console->link({ - text => gettext("Back to autotimer list"), + text => gettext("Back to autotimer listing."), url => "?cmd=alist", }) if($console->typ eq 'HTML'); } @@ -502,7 +502,7 @@ sub autotimer { # Usage: $obj->autotimerCreate($watcher, $console, [$userdata]); # ------------------ sub autotimerCreate { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $timerid = shift || 0; @@ -517,7 +517,7 @@ sub autotimerCreate { # Usage: $obj->autotimerEdit($watcher, $console, [$atid], [$userdata]); # ------------------ sub autotimerEdit { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $timerid = shift || 0; @@ -530,7 +530,7 @@ sub autotimerEdit { if($timerid and not ref $data) { my $sth = $obj->{dbh}->prepare("select * from AUTOTIMER where Id = ?"); $sth->execute($timerid) - or return $console->err(sprintf(gettext("Autotimer with ID '%s' does not exist in the database!"),$timerid)); + or return $console->err(sprintf(gettext("The autotimer '%s' does not exist in the database."),$timerid)); $epg = $sth->fetchrow_hashref(); # Channels Ids in Namen umwandeln @@ -567,7 +567,7 @@ sub autotimerEdit { my %do = ( 'timer' => gettext('Timer'), - 'recording' => gettext('Exist recording'), + 'recording' => gettext('Existing recording'), 'chronicle' => gettext('Recording chronicle') ); my $DoneChoices = [$do{'timer'}, $do{'recording'}]; @@ -585,13 +585,16 @@ sub autotimerEdit { 'Activ' => { typ => 'confirm', def => $epg->{Activ} || 'y', - msg => gettext('Switch this autotimer on?'), + msg => gettext('Activate this autotimer'), }, 'Search' => { req => gettext('This is required!'), - msg => gettext( -"Search terms to look for EPG entries.\nYou can also improve your searches :\n* by adding 'operators' to your search terms like 'AND', 'OR', 'AND NOT' e.g. 'today AND NOT tomorrow'\n* by comma seperated multiply search terms e.g. 'today,tomorrow'\n* by minus sign to exclude search terms e.g. 'today,-tomorrow'" -), + msg => +gettext("Search terms to search for EPG entries. +You can also fine tune your search : +* by adding 'operators' to your search terms such as 'AND', 'OR', 'AND NOT' e.g. 'today AND NOT tomorrow' +* by comma-separated search terms e.g. 'today,tomorrow' +* by a hyphen to exclude search terms e.g. 'today,-tomorrow'"), def => $epg->{Search} || '', }, 'InFields' => { @@ -631,7 +634,7 @@ sub autotimerEdit { def => $epg->{Channels}, choices => $mod->ChannelArray('Name', sprintf(' NOT (%s)', $obj->{exclude})), options => 'multi', - msg => gettext('Restrict search to this channels'), + msg => gettext('Limit search to these channels'), check => sub{ my $value = shift || return; my @vals; @@ -682,20 +685,20 @@ sub autotimerEdit { my $value = $epg->{Start} || return ""; return fmttime($value); }, - msg => gettext("Starttime in format 'HH:MM'"), + msg => gettext("Start time in format 'HH:MM'"), check => sub{ my $value = shift || 0; - return undef, gettext('You set a start-time without a stop-time!') + return undef, gettext('You set a start time without an end time!') if(not $data->{Stop} and $value); return "" if(not $value); $value = fmttime($value) if($value =~ /^\d+$/sig); - return undef, gettext('No right time!') if($value !~ /^\d+:\d+$/sig); + return undef, gettext('The time is incorrect!') if($value !~ /^\d+:\d+$/sig); my @v = split(':', $value); $value = sprintf('%02d%02d',$v[0],$v[1]); if(int($value) < 2400 and int($value) >= 0) { return sprintf('%04d',$value); } else { - return undef, gettext('No right time!'); + return undef, gettext('The time is incorrect!'); } }, }, @@ -705,25 +708,25 @@ sub autotimerEdit { my $value = $epg->{Stop} || return ""; return fmttime($value); }, - msg => gettext("Endtime in format 'HH:MM'"), + msg => gettext("End time in format 'HH:MM'"), check => sub{ my $value = shift || 0; - return undef, gettext('You set a stop-time without a start-time!') + return undef, gettext('You set an end time without a start time!') if(not $data->{Start} and $value); return "" if(not $value); $value = fmttime($value) if($value =~ /^\d+$/sig); - return undef, gettext('No right time!') if($value !~ /^\d+:\d+$/sig); + return undef, gettext('The time is incorrect!') if($value !~ /^\d+:\d+$/sig); my @v = split(':', $value); $value = sprintf('%02d%02d',$v[0],$v[1]); if(int($value) < 2400 and int($value) >= 0) { return sprintf('%04d',$value); } else { - return undef, gettext('No right time!'); + return undef, gettext('The time is incorrect!'); } }, }, 'Weekdays' => { - msg => gettext('Search only on this weekdays'), + msg => gettext('Only search these weekdays'), typ => 'checkbox', choices => [$wd{'Mon'}, $wd{'Tue'}, $wd{'Wed'}, $wd{'Thu'}, $wd{'Fri'}, $wd{'Sat'}, $wd{'Sun'}], def => sub { @@ -756,11 +759,11 @@ sub autotimerEdit { 'VPS' => { typ => 'confirm', def => $epg->{VPS} || 'n', - msg => gettext('Activate VPS for new timer?'), + msg => gettext('Activate VPS for new timers'), }, 'prevminutes' => { typ => 'integer', - msg => gettext('Buffer time in minutes before the scheduled end of the recorded program.'), + msg => gettext('Buffer time in minutes before the scheduled start of a recording'), def => $epg->{prevminutes}, check => sub{ my $value = shift; @@ -768,13 +771,13 @@ sub autotimerEdit { if($value =~ /^\d+$/sig and $value >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'afterminutes' => { typ => 'integer', - msg => gettext('Buffer time in minutes after the scheduled end of the recorded program.'), + msg => gettext('Buffer time in minutes past the scheduled end of a recording'), def => $epg->{afterminutes}, check => sub{ my $value = shift; @@ -782,58 +785,58 @@ sub autotimerEdit { if($value =~ /^\d+$/sig and $value >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'MinLength' => { typ => 'integer', - msg => gettext('Minimum length in minutes'), + msg => gettext('Minimum play time in minutes'), def => $epg->{MinLength} || 0, check => sub{ my $value = shift || return; if($value =~ /^\d+$/sig and $value > 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'Priority' => { typ => 'integer', - msg => sprintf(gettext('Priority (0 .. %d)'),$console->{USER}->{MaxPriority} ? $console->{USER}->{MaxPriority} : 99 ), + msg => sprintf(gettext('Priority (%d ... %d)'),0,$console->{USER}->{MaxPriority} ? $console->{USER}->{MaxPriority} : 99 ), def => (defined $epg->{Priority} ? $epg->{Priority} : $modT->{Priority}), check => sub{ my $value = shift || 0; if($value =~ /^\d+$/sig and $value >= 0 and $value < 100) { if($console->{USER}->{MaxPriority} and $value > $console->{USER}->{MaxPriority}) { - return undef, sprintf(gettext('Sorry, but maximum priority is limited on %d!'), $console->{USER}->{MaxPriority}); + return undef, sprintf(gettext('Sorry, but the maximum priority is limited to %d!'), $console->{USER}->{MaxPriority}); } return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'Lifetime' => { typ => 'integer', - msg => sprintf(gettext('Lifetime (0 .. %d)'),$console->{USER}->{MaxLifeTime} ? $console->{USER}->{MaxLifeTime} : 99 ), + msg => sprintf(gettext('Lifetime (%d ... %d)'),0,$console->{USER}->{MaxLifeTime} ? $console->{USER}->{MaxLifeTime} : 99 ), def => (defined $epg->{Lifetime} ? $epg->{Lifetime} : $modT->{Lifetime}), check => sub{ my $value = shift || 0; if($value =~ /^\d+$/sig and $value >= 0 and $value < 100) { if($console->{USER}->{MaxLifeTime} and $value > $console->{USER}->{MaxLifeTime}) { - return undef, sprintf(gettext('Sorry, but maximum lifetime is limited on %d!'), $console->{USER}->{MaxLifeTime}); + return undef, sprintf(gettext('Sorry, but the maximum life time is limited to %d!'), $console->{USER}->{MaxLifeTime}); } return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'Dir' => { typ => 'string', - msg => gettext('Group all recordings on a directory'), + msg => gettext('Group all recordings into one directory'), def => $epg->{Dir}, # choices => main::getModule('TIMERS')->getRootDirs, }, @@ -841,13 +844,13 @@ sub autotimerEdit { # Ask Questions $data = $console->question(($timerid ? gettext('Edit autotimer') - : gettext('Create a new autotimer')), $questions, $data); + : gettext('Create new autotimer')), $questions, $data); if(ref $data eq 'HASH') { delete $data->{Channel}; # Last chance ;) - return $console->err(gettext('Nothing to search defined!')) + return $console->err(gettext('Nothing defined for this search!')) unless($data->{Search}); $obj->_insert($data); @@ -864,7 +867,7 @@ sub autotimerEdit { $obj->autotimer($watcher, $console, $data->{Id}); $console->link({ - text => gettext("Back to referred side"), + text => gettext("Back to previous page."), url => $console->{browser}->{Referer}, }) if($console->typ eq 'HTML'); @@ -878,10 +881,10 @@ sub autotimerEdit { # Usage: $obj->autotimerDelete($watcher, $console, $atid); # ------------------ sub autotimerDelete { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $timerid = shift || return $console->err(gettext("No ID for autotimer to delete! Please use adelete 'aid'")); # If timerid the edittimer + my $timerid = shift || return $console->err(gettext("No autotimer defined to delete! Please use adelete 'aid'!")); # If timerid the edittimer my @timers = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid); @@ -889,11 +892,11 @@ sub autotimerDelete { my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@timers)) { error sprintf("Can't execute query: %s.",$sth->errstr); - $console->err(sprintf gettext("Autotimer with ID '%s' does not exist in the database!"), join(',', @timers)); + $console->err(sprintf gettext("The autotimer '%s' does not exist in the database."), join(',', @timers)); return 0; } - $console->message(sprintf gettext("Autotimer %s is deleted."), join(',', @timers)); + $console->message(sprintf gettext("Autotimer %s deleted."), join(',', @timers)); debug sprintf('autotimer with id "%s" is deleted%s', join(',', @timers), ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) @@ -908,10 +911,10 @@ sub autotimerDelete { # Usage: $obj->autotimerToogle($watcher, $console, $atid); # ------------------ sub autotimerToggle { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $timerid = shift || return $console->err(gettext("No ID for autotimer to toggle! Please use atoggle 'aid'")); + my $timerid = shift || return $console->err(gettext("No autotimer defined to toggle! Please use atoggle 'aid'!")); my @timers = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid); @@ -919,7 +922,7 @@ sub autotimerToggle { my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@timers)) { error sprintf("Can't execute query: %s.",$sth->errstr); - $console->err(sprintf(gettext("Autotimer with ID '%s' does not exist in the database!"),$timerid)); + $console->err(sprintf(gettext("The autotimer '%s' does not exist in the database."),$timerid)); return 0; } my $data = $sth->fetchall_hashref('Id'); @@ -928,7 +931,7 @@ sub autotimerToggle { for my $timer (@timers) { unless(exists $data->{$timer}) { - $console->err(sprintf(gettext("Autotimer with ID '%s' does not exist in the database!"), $timer)); + $console->err(sprintf(gettext("The autotimer '%s' does not exist in the database."), $timer)); next; } @@ -975,7 +978,7 @@ sub autotimerToggle { # Usage: $obj->list($watcher, $console, [$atid], [$params]); # ------------------ sub list { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $text = shift || ''; @@ -1046,7 +1049,7 @@ sub list { # ------------------ sub _eventsearch { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $a = shift || return error ('No Data from Autotimer!' ); my $timermod = shift || main::getModule('TIMERS') || return error ("Can't access modul TIMERS!"); @@ -1136,7 +1139,7 @@ WHERE # ------------------ sub _timerexists { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventdata = shift || return error ('No Data from Autotimer!' ); my ($nexttime, $aidcomment) = @_; @@ -1168,7 +1171,7 @@ sub _timerexists { # ------------------ sub _timerexistsfuzzy { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventdata = shift || return error ('No Data from Autotimer!' ); my ($nexttime, $aidcomment) = @_; @@ -1194,7 +1197,7 @@ sub _timerexistsfuzzy { # ------------------ sub _recordexists { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventdata = shift || return error ('No Data from Autotimer!' ); my ($nexttime, $aidcomment) = @_; @@ -1216,7 +1219,7 @@ sub _recordexists { # ------------------ sub _chronicleexists { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventdata = shift || return error ('No Data from Autotimer!' ); my ($nexttime, $aidcomment) = @_; @@ -1237,7 +1240,7 @@ sub _chronicleexists { # ------------------ sub _timerexiststitle { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventdata = shift || return error ('No Data from Autotimer!' ); my ($nexttime, $aidcomment) = @_; @@ -1256,7 +1259,7 @@ sub _timerexiststitle { # ------------------ sub _insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return; if(ref $data eq 'HASH') { @@ -1285,7 +1288,7 @@ sub _insert { # Usage: my $text = $obj->_placeholder($epgdata, $autotimerdata); # ------------------ sub _placeholder { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $at = shift || return error ('No AtData!' ); @@ -1328,7 +1331,7 @@ sub _placeholder { # ------------------ sub suggest {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; diff --git a/lib/XXV/MODULES/CHANNELS.pm b/lib/XXV/MODULES/CHANNELS.pm index e660dbe..5adeaa6 100644 --- a/lib/XXV/MODULES/CHANNELS.pm +++ b/lib/XXV/MODULES/CHANNELS.pm @@ -10,7 +10,7 @@ use File::stat; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'CHANNELS', Prereq => { @@ -23,7 +23,7 @@ sub module { Status => sub{ $obj->status(@_) }, Preferences => { file => { - description => gettext('Location of channels.conf on your system.'), + description => sprintf(gettext("Path of file '%s'"),'channels.conf'), default => '/var/lib/vdr/channels.conf', type => 'file', required => gettext('This is required!'), @@ -35,12 +35,12 @@ sub module { required => gettext('This is required!'), }, empty => { - description => gettext('Include channels with empty PID'), + description => gettext('Insert channels with blank PID'), default => 'n', type => 'confirm', }, filterCA => { - description => gettext('Filter channels, set all wanted CA(Common Access)'), + description => gettext('Filter channel list, set all wanted CA (Common Access)'), # 0 for FTA, 1-4 for DVB Device, 32001 for AnalogPlugin type => 'list', options => 'multi', @@ -49,7 +49,7 @@ sub module { my @knownCA; foreach my $CA (@{$obj->{knownCA}}) { my $desc; - if($CA eq '0') { $desc = gettext("Free to air"); } + if($CA eq '0') { $desc = gettext("Free-to-air"); } elsif($CA eq '1' or $CA eq '2' or $CA eq '3' @@ -69,7 +69,7 @@ sub module { }, }, stripCH => { - description => gettext("Clean channel names, only the 'long' part is visible."), + description => gettext("Cleans out channel names, only the 'long' part is visible."), # Format in vdr 1.2.6 (Format "" or "long"). it show also all parts # Format in vdr 1.3.10 (Format "short,long") # Format in vdr 1.3.12 (Format "short,long;provider") @@ -81,34 +81,34 @@ sub module { }, Commands => { cupdate => { - description => gettext('Read channels and write them into database'), + description => gettext('Read channels and write them to the database'), short => 'cu', callback => sub{ $obj->readData(@_) }, DenyClass => 'cedit', Level => 'user', }, clist => { - description => gettext("List Channels from database 'cname'"), + description => gettext("List channels from database 'cname'"), short => 'cl', callback => sub{ $obj->list(@_) }, Level => 'user', }, cnew => { - description => gettext("Create a new channel"), + description => gettext("Create new channel"), short => 'cne', callback => sub{ $obj->newChannel(@_) }, Level => 'user', DenyClass => 'cedit', }, cedit => { - description => gettext("Edit a channel 'cid'"), + description => gettext("Edits a channel 'cid'"), short => 'ced', callback => sub{ $obj->editChannel(@_) }, Level => 'user', DenyClass => 'cedit', }, cdelete => { - description => gettext("Delete one or more channels 'pos'"), + description => gettext("Deletes one or more channels 'pos'"), short => 'cdl', callback => sub{ $obj->deleteChannel(@_) }, Level => 'user', @@ -122,7 +122,7 @@ sub module { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift || 0; @@ -134,7 +134,7 @@ sub status { my $groups = $obj->{dbh}->selectrow_arrayref($sql)->[0]; return { - message => sprintf(gettext('The system has %d saved Channels in %d Groups'), $gesamt, $groups), + message => sprintf(gettext('The system has saved %d channels from %d groups'), $gesamt, $groups), }; } @@ -188,7 +188,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -246,7 +246,7 @@ sub _init { # ------------------ sub insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return; my $pos = shift || return; my $grp = shift || 0; @@ -323,7 +323,7 @@ sub insert { # ------------------ sub insertGrp { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $pos = shift || return; my $name = shift || 0; @@ -337,7 +337,7 @@ sub insertGrp { # ------------------ sub readData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $file = $obj->{file} || return 1, error ('No Channels File'); @@ -423,7 +423,7 @@ sub is_numeric { defined getnum($_[0]) } # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || ''; @@ -464,7 +464,7 @@ where # ------------------ sub NameToChannel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return undef; my $sth = $obj->{dbh}->prepare('select Id from CHANNELS where UPPER(Name) = UPPER( ? )'); @@ -477,7 +477,7 @@ sub NameToChannel { # ------------------ sub PosToName { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $pos = shift || return undef; my $sth = $obj->{dbh}->prepare('select Name from CHANNELS where POS = ?'); @@ -490,7 +490,7 @@ sub PosToName { # ------------------ sub PosToChannel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $pos = shift || return undef; my $sth = $obj->{dbh}->prepare('select Id from CHANNELS where POS = ?'); @@ -503,7 +503,7 @@ sub PosToChannel { # ------------------ sub ChannelGroupsArray { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return undef; my $where = shift || ''; $where = sprintf('WHERE %s', $where) if($where); @@ -516,7 +516,7 @@ sub ChannelGroupsArray { # ------------------ sub ChannelArray { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return undef; my $where = shift || ''; $where = sprintf('WHERE %s', $where) if($where); @@ -529,7 +529,7 @@ sub ChannelArray { # ------------------ sub ChannelIDArray { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return undef; my $where = shift || ''; $where = sprintf('WHERE %s', $where) if($where); @@ -542,7 +542,7 @@ sub ChannelIDArray { # ------------------ sub ChannelHash { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return undef; my $where = shift || ''; $where = sprintf('WHERE %s', $where) if($where); @@ -555,7 +555,7 @@ sub ChannelHash { # ------------------ sub ChannelToName { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return undef; my $sth = $obj->{dbh}->prepare('select Name from CHANNELS where Id = ?'); @@ -568,7 +568,7 @@ sub ChannelToName { # ------------------ sub ChannelToPos { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return undef; my $sth = $obj->{dbh}->prepare('select POS from CHANNELS where Id = ?'); @@ -582,7 +582,7 @@ sub ChannelToPos { # ------------------ sub getChannelType { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return undef; my $pos = $obj->ChannelToPos($id); if($pos and $pos >= 1) @@ -604,7 +604,7 @@ sub getChannelType { # ------------------ sub _LastChannel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sql = sprintf('select * from CHANNELS order by POS desc limit 1'); my $erg = $obj->{dbh}->selectrow_hashref($sql); return $erg; @@ -613,7 +613,7 @@ sub _LastChannel { # ------------------ sub newChannel { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -625,7 +625,7 @@ sub newChannel { # ------------------ sub editChannel { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $cid = shift || 0; # If channelid then edit channel @@ -661,7 +661,7 @@ sub editChannel { if(int($value) > 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, } ]; @@ -692,7 +692,7 @@ sub editChannel { if(int($value) > 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -712,7 +712,7 @@ sub editChannel { 'Parameters' => { typ => 'string', def => $defaultData->{Parameters} || "", - msg => gettext("Various parameters, depends on signal source"), + msg => gettext("Various parameters, depending on signal source"), check => sub{ my $value = shift || return; if($value ne '') { @@ -731,7 +731,7 @@ sub editChannel { if(int($value) > 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -744,7 +744,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -770,7 +770,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -796,7 +796,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -809,7 +809,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -822,7 +822,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -835,7 +835,7 @@ sub editChannel { if(int($value) >= 0) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -881,7 +881,7 @@ sub editChannel { # ------------------ sub saveChannel { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $data = shift || return error('No Data to Save!'); my $pos = shift || 0; @@ -923,10 +923,10 @@ sub saveChannel { # ------------------ sub deleteChannel { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; - my $channelid = shift || return $console->err(gettext("No channel to delete! Please use cdelete 'pos'")); + my $channelid = shift || return $console->err(gettext("No channel defined for deletion! Please use cdelete 'pos'!")); my $answer = shift || 0; my @channels = reverse sort{ $a <=> $b } split(/[^0-9]/, $channelid); @@ -939,7 +939,7 @@ sub deleteChannel { foreach my $pos (@channels) { unless(exists $data->{$pos}) { - $console->err(sprintf(gettext("Channel with number '%s' does not exist in database!"), $pos)); + $console->err(sprintf(gettext("Channel '%s' does not exist in the database!"), $pos)); next; } @@ -948,7 +948,7 @@ sub deleteChannel { my $confirm = $console->confirm({ typ => 'confirm', def => 'y', - msg => gettext('Are you sure to delete this channel?'), + msg => gettext('Do you want to delete this channel?'), }, $answer); next if(! $answer eq 'y'); } @@ -973,7 +973,7 @@ sub deleteChannel { $console->redirect({url => $console->{browser}->{Referer}, wait => 1}) if(ref $console and $console->typ eq 'HTML'); } else { - $console->err(gettext("No channel to delete!")); + $console->err(gettext("No channel defined for deletion!")); } return 1; @@ -982,7 +982,7 @@ sub deleteChannel { # ------------------ sub _brandNewChannels { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $oldmaximumpos = shift || return; my $sql = 'select * from CHANNELS where POS > ?'; @@ -1006,7 +1006,7 @@ sub _brandNewChannels { my $rm = main::getModule('REPORT'); $rm->news( - sprintf(gettext('Discover %d new channels!'), scalar keys %$erg), + sprintf(gettext('Found %d new channels!'), scalar keys %$erg), $text, 'clist', undef, diff --git a/lib/XXV/MODULES/CHRONICLE.pm b/lib/XXV/MODULES/CHRONICLE.pm index 790fce5..b5fb209 100644 --- a/lib/XXV/MODULES/CHRONICLE.pm +++ b/lib/XXV/MODULES/CHRONICLE.pm @@ -8,14 +8,14 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $args = { Name => 'CHRONICLE', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module store recordings at chronicle.'), + Description => gettext('This module saves recordings in a chronicle.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'Andreas Brachold', @@ -36,13 +36,13 @@ sub module { DenyClass => 'rlist', }, chrsearch => { - description => gettext("Search at chronicle for 'text'"), + description => gettext("Search chronicle for 'text'."), short => 'chrs', callback => sub{ $self->search(@_) }, DenyClass => 'rlist', }, chrdelete => { - description => gettext("Delete at chronicle with 'id'"), + description => gettext("Delete within chronicle with 'ID'"), short => 'chrd', callback => sub{ $self->delete(@_) }, DenyClass => 'redit', @@ -89,7 +89,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); if($self->{active} eq 'y') { return 0, panic("Session to database is'nt connected") @@ -131,7 +131,7 @@ sub _init { # ------------------ sub _insertData { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $sql = qq| INSERT IGNORE INTO CHRONICLE @@ -191,7 +191,7 @@ sub search { my $self = shift; my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $quest = shift || return $console->err(gettext("No 'text' to search! Please use chrsearch 'text'")); + my $quest = shift || return $console->err(gettext("No 'string' to search for! Please use chrsearch 'text'.")); $quest =~ s/\'/\./sg; $quest =~ s/\+/\\\\\+/sg; @@ -232,7 +232,7 @@ ORDER BY CHRONICLE.starttime # ------------------ sub delete { # ------------------ - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $items = shift || return $console->err(gettext("No ID to delete! Please use chrdelete 'id'")); diff --git a/lib/XXV/MODULES/CONFIG.pm b/lib/XXV/MODULES/CONFIG.pm index 036be29..f7f48b6 100644 --- a/lib/XXV/MODULES/CONFIG.pm +++ b/lib/XXV/MODULES/CONFIG.pm @@ -9,13 +9,13 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'CONFIG', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module edit, write and reconfigure the configuration.'), + Description => gettext('This module edits, writes and saves the configuration.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -23,12 +23,12 @@ sub module { Level => 'admin', Commands => { configedit => { - description => gettext("Edit configuration 'sector'"), + description => gettext("Edit configuration 'section'"), short => 'ce', callback => sub{ $obj->edit(@_) }, }, configwrite => { - description => gettext('Write configuration'), + description => gettext('Saves the configuration.'), short => 'cw', callback => sub{ $obj->write(@_) }, }, @@ -38,7 +38,7 @@ sub module { callback => sub{ $obj->get(@_) }, }, reconfigure => { - description => gettext('Reconfigure all Processes'), + description => gettext('Edit all processes'), short => 'cr', callback => sub{ $obj->reconfigure(@_) }, }, @@ -75,13 +75,13 @@ sub new { # ------------------ sub menu { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $sector = shift || 0; my $ret = {}; - $ret->{title} = gettext("Preferences for XXV"); + $ret->{title} = gettext("Settings for XXV"); $ret->{highlight} = $sector; my $mods = main::getModules; @@ -95,11 +95,11 @@ sub menu { }; } $ret->{links}->{'reconfigure'} = { - text => gettext("Reconfigure"), + text => gettext("Save configuration"), link => "?cmd=reconfigure", }; $ret->{links}->{'write'} = { - text => gettext("Write configuration"), + text => gettext("Saves the configuration."), link => "?cmd=configwrite", }; @@ -109,7 +109,7 @@ sub menu { # ------------------ sub edit { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $sector = shift || 0; @@ -122,12 +122,12 @@ sub edit { $sector = uc($sector) unless($sector eq 'General'); my $cfg = $obj->{config}->{$sector} - or return $console->err(sprintf(gettext("Sorry, but the section %s does not exist in configuration!"),$sector)); + or return $console->err(sprintf(gettext("Sorry, but section %s does not exist in the configuration!"),$sector)); my $mod = main::getModule($sector); my $prefs = $mod->{MOD}->{Preferences} - or return $console->err(sprintf(gettext("Sorry, but the 'Preferences' in Module: %s do not exist"),$sector)); + or return $console->err(sprintf(gettext("Sorry, but the settings in module: %s do not exist!"),$sector)); my $questions = []; foreach my $name (sort { lc($a) cmp lc($b) } keys(%{$prefs})) { @@ -138,7 +138,7 @@ sub edit { { typ => $prefs->{$name}->{type} || 'string', options => $prefs->{$name}->{options}, - msg => sprintf("%s:\n%s", ucfirst($name), ($prefs->{$name}->{description} || gettext('No Description'))), + msg => sprintf("%s:\n%s", ucfirst($name), ($prefs->{$name}->{description} || gettext('No description'))), def => $def, req => $prefs->{$name}->{required}, choices => $prefs->{$name}->{choices}, @@ -151,7 +151,7 @@ sub edit { $console->link({text => sprintf(gettext('%s manual'), $sector), url => "?cmd=doc&data=$sector"}) if($console->typ eq 'HTML'); - $cfg = $console->question(sprintf(gettext('Change %s configuration'), $sector), $questions, $data); + $cfg = $console->question(sprintf(gettext('Edit configuration %s'), $sector), $questions, $data); if(ref $cfg eq 'HASH') { $obj->{config}->{$sector} = $cfg; @@ -163,7 +163,7 @@ sub edit { ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) ); - $console->message(sprintf(gettext("Sector: '%s' save .. please wait."), $sector)); + $console->message(sprintf(gettext("Section: '%s' saving ... please wait."), $sector)); $console->redirect({url => $console->{browser}->{Referer}, wait => 2}) if($console->typ eq 'HTML'); } @@ -172,7 +172,7 @@ sub edit { # ------------------ sub write { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -181,7 +181,7 @@ sub write { $obj->{config}->write( $configfile ) or return error( sprintf ("Can't written '%s': %s", $configfile , $! )); - $console->message(sprintf gettext("Configuration written in '%s'."), $configfile) + $console->message(sprintf gettext("Configuration written to '%s'."), $configfile) if(ref $console); $console->redirect({url => $console->{browser}->{Referer}, wait => 1}) @@ -191,19 +191,19 @@ sub write { # ------------------ sub get { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $modname = shift || 0; - return $console->err(gettext('I need a name of the module, in order to indicate the configuration!')) + return $console->err(gettext('Need a name of the module to display the configuration!')) unless($modname and ref $console); $modname = uc($modname) unless($modname eq 'General'); my $cfg = $obj->{config}->{$modname}; - $console->err(sprintf(gettext("Sorry, but the section %s does not exist in configuration!"),$modname)) + $console->err(sprintf(gettext("Sorry, but section %s does not exist in the configuration!"),$modname)) if(! $cfg and ref $console); if(ref $console) { @@ -216,7 +216,7 @@ sub get { # ------------------ sub reconfigure { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -249,7 +249,7 @@ sub reconfigure { } } else { - $console->err(sprintf(gettext("Strange, i can not find %s in %s"), $parameter, $moduleName)) + $console->err(sprintf(gettext("Cannot find %s in %s!"), $parameter, $moduleName)) if(ref $console); } } @@ -258,14 +258,14 @@ sub reconfigure { $obj->menu( $watcher, $console ) if(ref $console and $console->{TYP} eq 'HTML'); - $console->message(gettext('Reconfigure successfully')) + $console->message(gettext('Edit successful!')) if(ref $console); } # ------------------ sub realModNames { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $mods = main::getModules(); my @realModName; diff --git a/lib/XXV/MODULES/EPG.pm b/lib/XXV/MODULES/EPG.pm index e8ba1ef..5122577 100644 --- a/lib/XXV/MODULES/EPG.pm +++ b/lib/XXV/MODULES/EPG.pm @@ -10,14 +10,14 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'EPG', Prereq => { 'Date::Manip' => 'date manipulation routines', 'Time::Local' => 'efficiently compute time from local and GMT time ', }, - Description => gettext('This module reads new EPG Data and stores them in the database.'), + Description => gettext('This module reads new EPG data and saves it to the database.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -36,7 +36,7 @@ sub module { required => gettext('This is required!'), }, periods => { - description => gettext("Pre-defined list for the 'Running Now' view (comma separated list)"), + description => gettext("Preferred program times. (eg. 12:00, 18:00)"), default => '12:00,18:00,20:15,22:00', type => 'string', required => gettext('This is required!'), @@ -50,7 +50,7 @@ sub module { }, Commands => { search => { - description => gettext('Search in EPG Data'), + description => gettext('Search within EPG data'), short => 's', callback => sub{ $obj->search(@_) }, }, @@ -60,17 +60,17 @@ sub module { callback => sub{ $obj->program(@_) }, }, display => { - description => gettext("Show program event 'eventid'"), + description => gettext("Show program 'eventid'"), short => 'd', callback => sub{ $obj->display(@_) }, }, now => { - description => gettext('Display events is running now'), + description => gettext('Display events currently showing.'), short => 'n', callback => sub{ $obj->runningNow(@_) }, }, next => { - description => gettext('Display events is running next'), + description => gettext('Display events showing next.'), short => 'nx', callback => sub{ $obj->runningNext(@_) }, }, @@ -80,7 +80,7 @@ sub module { callback => sub{ $obj->schema(@_) }, }, erestart => { - description => gettext('Reload EPG data'), + description => gettext('Update EPG data.'), short => 'er', callback => sub{ my $watcher = shift || return error ('No Watcher!'); @@ -95,7 +95,7 @@ sub module { Level => 'admin', }, erun => { - description => gettext('Display the epg event running in vdr'), + description => gettext('Display the current program running in the VDR'), short => 'en', callback => sub{ $obj->NowOnChannel(@_) }, Level => 'user', @@ -122,7 +122,7 @@ sub module { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift || 0; @@ -153,7 +153,7 @@ sub status { } return { - message => sprintf(gettext('EPG table contains %d entries and since the last login at %s %d new entries'), + message => sprintf(gettext('EPG table contains %d entries and since the last login on %s %d new entries.'), $total, scalar localtime($lastReportTime), $newEntrys), }; } @@ -195,7 +195,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -260,7 +260,7 @@ sub _init { # ------------------ sub startReadEpgData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -308,7 +308,7 @@ sub startReadEpgData { # ------------------ sub updated { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cb = shift || 0; my $log = shift || 0; @@ -329,7 +329,7 @@ sub updated { # ------------------ sub compareEpgData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vdata = shift || return error('No data'); my $watcher = shift; my $console = shift; @@ -407,7 +407,7 @@ sub compareEpgData { # ------------------ sub moveOldEPGEntrys { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # Copy and delete old EPG Entrys $obj->{dbh}->do('REPLACE INTO OLDEPG SELECT * FROM EPG WHERE (UNIX_TIMESTAMP(EPG.starttime) + EPG.duration) < UNIX_TIMESTAMP()'); @@ -417,7 +417,7 @@ sub moveOldEPGEntrys { # ------------------ sub deleteDoubleEPGEntrys { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # Delete double EPG Entrys my $erg = $obj->{dbh}->selectall_arrayref('SELECT eventid FROM EPG GROUP BY starttime, channel_id having count(*) > 1'); @@ -459,7 +459,7 @@ sub replace { # ------------------ sub encodeEpgId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $epgid = shift || return error('No EPG Id!'); my $channel = shift || return error('No Channel!'); @@ -475,7 +475,7 @@ sub encodeEpgId { # ------------------ sub readEpgData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vdata = shift || return error('Problem to read Data!'); my $count = shift || 0; my $dataHash = {}; @@ -504,7 +504,7 @@ sub readEpgData { $channel = $event->{channel}; my $eventid = $obj->encodeEpgId($event->{eventid}, $channel); - $event->{title} = gettext("No Title") + $event->{title} = gettext("No title") unless($event->{title}); $event->{description} = "" unless($event->{description}); @@ -574,7 +574,7 @@ sub readEpgData { # ------------------ sub search { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift; @@ -664,7 +664,7 @@ sub search { # ------------------ sub program { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $channel = shift || $obj->{dbh}->selectrow_arrayref("select POS from CHANNELS limit 1")->[0]; @@ -720,10 +720,10 @@ order by # ------------------ sub display { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $eventid = shift || return $console->err(gettext("No EventID to display the Event Programm! Please use display 'eventid'")); + my $eventid = shift || return $console->err(gettext("No ID defined to display this program! Please use display 'eid'!")); my %f = ( 'Id' => umlaute(gettext('Service')), @@ -778,7 +778,7 @@ where if(scalar @{$erg} != 0 ); } - return $console->err(sprintf(gettext("No data for event '%d' present to display!"),$eventid)) + return $console->err(sprintf(gettext("No data to display for event '%d'!"),$eventid)) if(scalar @{$erg} == 0 ); unshift(@$erg, $fields); @@ -790,7 +790,7 @@ where # ------------------ sub runningNext { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift; @@ -878,7 +878,7 @@ ORDER BY # ------------------ sub runningNow { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $zeit = shift || time; @@ -954,7 +954,7 @@ ORDER BY # ------------------ sub NowOnChannel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $channel = shift || $obj->_actualChannel || return error('No Channel!'); @@ -1002,7 +1002,7 @@ LIMIT 1 # ------------------ sub _actualChannel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $erg = $obj->{svdrp}->command('chan'); my ($chanpos, $channame) = $erg->[1] =~ /^250\s+(\d+)\s+(\S+)/sig; @@ -1012,7 +1012,7 @@ sub _actualChannel { # ------------------ sub schema { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $zeit = shift || time; @@ -1100,7 +1100,7 @@ ORDER BY # ------------------ sub checkOnTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $eid = shift || return error('No Id'); @@ -1139,7 +1139,7 @@ WHERE # ------------------ sub getDescription {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $eid = shift || 0; @@ -1153,7 +1153,7 @@ sub getDescription {# ------------------ # ------------------ sub toFullHour { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $zeit = shift || return error ('No Time to convert!' ); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = @@ -1166,7 +1166,7 @@ sub toFullHour { # ------------------ sub getId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return error ('No Id!' ); my $fields = shift || '*'; @@ -1187,7 +1187,7 @@ sub getId { # ------------------ sub suggest {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; diff --git a/lib/XXV/MODULES/EVENTS.pm b/lib/XXV/MODULES/EVENTS.pm index 7ea1de1..409592d 100644 --- a/lib/XXV/MODULES/EVENTS.pm +++ b/lib/XXV/MODULES/EVENTS.pm @@ -10,7 +10,7 @@ use File::Find; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'EVENTS', Prereq => { @@ -98,7 +98,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); main::after(sub{ $obj->{EVENTS} = $obj->searchForEvents(); @@ -115,7 +115,7 @@ sub _init { # ------------------ sub searchForEvents { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $mods = main::getModules(); my $events = {}; diff --git a/lib/XXV/MODULES/GRAB.pm b/lib/XXV/MODULES/GRAB.pm index ec2b25b..bb97e36 100644 --- a/lib/XXV/MODULES/GRAB.pm +++ b/lib/XXV/MODULES/GRAB.pm @@ -10,7 +10,7 @@ use File::Find; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'GRAB', Prereq => { @@ -51,7 +51,7 @@ sub module { type => 'integer', }, font => { - description => gettext('True type font to draw image text.'), + description => gettext('TrueType font to draw overlay text'), default => 'VeraIt.ttf', type => 'list', choices => $obj->findttf, @@ -129,7 +129,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); @@ -145,7 +145,7 @@ sub _init { # ------------------ sub grab { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $file = $obj->{file}; @@ -203,7 +203,7 @@ sub grab { # ------------------ sub display { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -220,7 +220,7 @@ sub display { # ------------------ sub makeImgText { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $file = shift || $obj->{file} || return error ('No File to display'); @@ -270,7 +270,7 @@ sub makeImgText { sub findttf # ------------------ { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $found; find({ wanted => sub{ if($File::Find::name =~ /\.ttf$/sig) { diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm index b760f0c..3e5ab64 100644 --- a/lib/XXV/MODULES/HTTPD.pm +++ b/lib/XXV/MODULES/HTTPD.pm @@ -34,7 +34,7 @@ my $mime = { # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'HTTPD', Prereq => { @@ -58,7 +58,7 @@ sub module { required => gettext('This is required!'), }, Clients => { - description => gettext('Maximum number from simultaneous connections to the same time'), + description => gettext('Maximum number of simultaneous connections'), default => 5, type => 'integer', required => gettext('This is required!'), @@ -76,14 +76,14 @@ sub module { required => gettext('This is required!'), }, HtmlRoot => { - description => gettext('Used Skin'), + description => gettext('Skin used'), default => 'default', type => 'list', required => gettext('This is required!'), choices => sub{ return $obj->findskins }, }, StartPage => { - description => gettext('First page, which is to be seen when logon'), + description => gettext('Startup screen'), default => 'now', type => 'list', required => gettext('This is required!'), @@ -101,7 +101,7 @@ sub module { ], }, Debug => { - description => gettext('Dump additional debugging information, needed only for software development.'), + description => gettext('Dump additional debugging information, required only for software development.'), default => 'n', type => 'confirm', }, @@ -153,7 +153,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # globals my $channels; @@ -201,7 +201,7 @@ sub init { sub communicator { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!' ); # read new line and report it @@ -259,7 +259,7 @@ sub communicator my $userMod = main::getModule('USER'); if(ref $userMod and $userMod->{active} eq 'y') { $console->{USER} = $userMod->check($handle, $data->{username}, $data->{password}); - $console->login(gettext('You have no permissions to this system!')) + $console->login(gettext('You are not authorized to use this system!')) unless(exists $console->{USER}->{Level}); } @@ -358,7 +358,7 @@ sub _readline { # ------------------ sub parseRequest { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $socket = shift || return error ('No Handle!' ); my $logout = shift || 0; @@ -419,7 +419,7 @@ sub parseRequest { # ------------------ sub handleInput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $cgi = shift || return error ('No CGI Object'); @@ -464,20 +464,20 @@ sub handleInput { # ------------------ sub usage { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return main::getModule('TELNET')->usage(@_); } # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift || return; my $lastReportTime = shift || 0; return { - message => sprintf(gettext('Traffic on HTTPD Socket since %s: send: %d kbytes - received: %d kbytes - connects: %d'), + message => sprintf(gettext('Traffic on HTTPD Socket since %s: sent: %d kbytes - received: %d kbytes - connections: %d'), $obj->{STATUS}->{'starttime'}, convert($obj->{STATUS}->{'sendbytes'}), convert($obj->{STATUS}->{'readbytes'}), $obj->{STATUS}->{'connects'} ), }; @@ -487,7 +487,7 @@ sub status { sub findskins # ------------------ { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $found; find({ wanted => sub{ if(-d $File::Find::name @@ -520,7 +520,7 @@ sub unzip { my $file = shift || return error ('No File'); my $gz = gzopen($file, "rb") - or return $obj->msg(undef, sprintf(gettext("can't open file '%s' : %s"), $file, &gzerror )); + or return $obj->msg(undef, sprintf(gettext("Could not open file '%s'! : %s"), $file, &gzerror )); my $text; while($gz->gzread(my $buffer) > 0) { @@ -543,7 +543,7 @@ sub unzip { # getip:localhost sub checkvalue { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || return error ('No Data!' ); diff --git a/lib/XXV/MODULES/INTERFACE.pm b/lib/XXV/MODULES/INTERFACE.pm index bd98fd6..0197239 100644 --- a/lib/XXV/MODULES/INTERFACE.pm +++ b/lib/XXV/MODULES/INTERFACE.pm @@ -11,7 +11,7 @@ use strict; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'INTERFACE', Prereq => { @@ -86,7 +86,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); if($obj->{active} eq 'y') { @@ -132,7 +132,7 @@ BEGIN { # Usage: my $data = $obj->getCommand($cmd, [$data, $params]); # ------------------ sub getCommand { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cmd = shift || return error ('No Command!' ); my $data = shift; @@ -143,7 +143,7 @@ BEGIN { # ------------------ sub handleInput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $ucmd = shift || return error ('No Command'); my $udata = shift; @@ -171,7 +171,7 @@ BEGIN { # ------------------ sub usage { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return main::getModule('TELNET')->usage(@_); } diff --git a/lib/XXV/MODULES/LOGREAD.pm b/lib/XXV/MODULES/LOGREAD.pm index 409c69b..086dfde 100644 --- a/lib/XXV/MODULES/LOGREAD.pm +++ b/lib/XXV/MODULES/LOGREAD.pm @@ -12,13 +12,13 @@ $|++; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'LOGREAD', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module read the xxv log file and show it on console.'), + Description => gettext('This module reads the xxv log file and displays it on the console.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -38,13 +38,13 @@ sub module { required => gettext('This is required!'), }, rows => { - description => gettext('How much lines to display?'), + description => gettext('Lines to display'), default => '100', type => 'integer', required => gettext('This is required!'), }, syslog => { - description => gettext('Path of syslog file?'), + description => sprintf(gettext("Path of file '%s'"),'syslog'), default => '/var/log/syslog', type => 'file', required => gettext('This is required!'), @@ -92,7 +92,7 @@ sub new { # ------------------ sub logger { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $logname = shift || 'standard'; @@ -142,7 +142,7 @@ sub logger { my $logfile = $obj->{logfiles}->{$logname}->{logfile}; my @out = $obj->tail($logfile); - return $console->msg(undef, sprintf(gettext("Can't read log file %s!"), $logfile)) + return $console->msg(undef, sprintf(gettext("Could not read log file %s!"), $logfile)) unless(scalar @out); my $output = $obj->parseLogOutput($obj->{logfiles}->{$logname}, \@out); @@ -166,7 +166,7 @@ sub logger { # ------------------ sub tail { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $logfile = shift || return error ('No Logfile!' ); my $rows = shift || $obj->{rows}; @@ -179,7 +179,7 @@ sub tail { # ------------------ sub parseLogOutput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $log = shift || return error ('No Prefs for logfile!' ); my $out = shift || return; @@ -203,7 +203,7 @@ sub parseLogOutput { # ------------------ sub parseData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $ret = shift || return error('No Referenced Array'); my $data = shift || 0; diff --git a/lib/XXV/MODULES/MEDIALIB.pm b/lib/XXV/MODULES/MEDIALIB.pm index c15cd84..e06da26 100644 --- a/lib/XXV/MODULES/MEDIALIB.pm +++ b/lib/XXV/MODULES/MEDIALIB.pm @@ -11,7 +11,7 @@ use File::Path; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'MEDIALIB', @@ -191,7 +191,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -282,7 +282,7 @@ sub _init { # Usage: my $report = $obj->status([$watcher, $console]); # ------------------ sub status { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -303,7 +303,7 @@ FROM # ------------------ sub researchMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -334,7 +334,7 @@ sub researchMedia { # ------------------ sub createMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -346,7 +346,7 @@ sub createMedia { # ------------------ sub copyMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -373,7 +373,7 @@ WHERE # ------------------ sub importMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -456,7 +456,7 @@ sub importMedia { # ------------------ sub searchMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -543,7 +543,7 @@ ORDER BY title # ------------------ sub editMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -591,7 +591,7 @@ WHERE # ------------------ sub listMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || ""; @@ -651,7 +651,7 @@ ORDER BY title # ------------------ sub displayMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || ""; @@ -697,7 +697,7 @@ WHERE id = ? # ------------------ sub saveMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || ""; @@ -741,7 +741,7 @@ sub saveMedia { # ------------------ sub deleteMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || ""; @@ -781,7 +781,7 @@ sub deleteMedia { # ------------------ sub _saveActors { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $input = shift || ''; @@ -847,7 +847,7 @@ sub _saveActors { # ------------------ sub _saveGenres { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $videoid = shift || 0; my $genres = shift || []; #print Dumper( $videoid,$genres); @@ -875,7 +875,7 @@ sub _saveGenres { # ------------------ sub _saveMedia { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to Save!' ); if(ref $data eq 'HASH') { @@ -902,7 +902,7 @@ sub _saveMedia { # ------------------ sub _get_actors { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $input = shift || return ''; $input =~ s/\r\n/\n/g; @@ -946,7 +946,7 @@ WHERE # ------------------ sub _get_actors_as_hash_by_name { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $input = shift || return ''; $input =~ s/\r\n/\n/g; @@ -968,7 +968,7 @@ WHERE } sub _nocover { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $HTTPD = main::getModule('HTTPD'); my $nocover = sprintf('%s/%s/images/nocover', $HTTPD->{paths}->{HTMLDIR}, $HTTPD->{HtmlRoot}); @@ -992,7 +992,7 @@ sub _nocover { # ------------------ sub mediacache { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -1032,7 +1032,7 @@ sub mediacache { # ------------------ sub _get_mediatype_as_array { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return [ [1,'DVD'], @@ -1056,7 +1056,7 @@ sub _get_mediatype_as_array { # ------------------ sub _get_mediatype_as_hash { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $types = $obj->_get_mediatype_as_array; @@ -1073,7 +1073,7 @@ sub _get_mediatype_as_hash { # ------------------ sub _get_mediatype_namebyid { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return error ('No Mediatype ID given'); my $types = $obj->_get_mediatype_as_array; @@ -1087,7 +1087,7 @@ sub _get_mediatype_namebyid { # ------------------ sub _get_mediatype_idbyname { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return error ('No Mediatype Name given'); my $types = $obj->_get_mediatype_as_array; @@ -1101,7 +1101,7 @@ sub _get_mediatype_idbyname { # ------------------ sub _get_videogenres_byvideoid { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || 0; return [] unless $id; @@ -1128,7 +1128,7 @@ WHERE # ------------------ sub _get_videogenres_as_hash_by_id { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $genres = $obj->_get_videogenres_as_array; @@ -1145,7 +1145,7 @@ sub _get_videogenres_as_hash_by_id { # ------------------ sub _get_videogenres_as_hash_by_name { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $genres = $obj->_get_videogenres_as_array; @@ -1162,7 +1162,7 @@ sub _get_videogenres_as_hash_by_name { # ------------------ sub _get_videogenres_as_hash { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return { gettext('Action') => { @@ -1253,7 +1253,7 @@ sub _get_videogenres_as_hash { 'id' => 22, 'name' => 'Biography', }, - gettext('MLHistory') => { + gettext('History') => { 'id' => 23, 'name' => 'History', }, @@ -1272,7 +1272,7 @@ sub _get_videogenres_as_hash { # ------------------ sub _get_videogenres_as_array { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $hashref = $obj->_get_videogenres_as_hash; @@ -1286,7 +1286,7 @@ sub _get_videogenres_as_array { # ------------------ sub _getsearchsfields_as_array { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return [ [ 'title', gettext('Title') ], @@ -1306,7 +1306,7 @@ sub _getsearchsfields_as_array { # ------------------ sub _get_ranges_as_array { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return [ [ 'NUM', gettext('#') ], diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm index e624486..031cfa6 100644 --- a/lib/XXV/MODULES/MUSIC.pm +++ b/lib/XXV/MODULES/MUSIC.pm @@ -13,7 +13,7 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'MUSIC', Prereq => { @@ -86,7 +86,7 @@ sub module { }, }, mugglei => { - description => gettext('Path to the binary from mugglei.'), + description => sprintf(gettext("Path of command '%s'"),'mugglei'), default => 'mugglei', type => 'file', }, @@ -189,7 +189,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 1 if($obj->{active} eq 'n'); @@ -318,7 +318,7 @@ sub _init { # ------------------ sub refresh { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -437,7 +437,7 @@ sub refresh { # ------------------ sub play { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || return error ('No data'); @@ -452,7 +452,7 @@ sub play { # ------------------ sub playlist { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || return error ('No data'); @@ -508,7 +508,7 @@ sub playlist { # ------------------ sub search { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $text = shift || return $console->err(gettext("No Text to search! Please use msearch 'text'")); @@ -519,7 +519,7 @@ sub search { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; @@ -685,7 +685,7 @@ sub list { # ------------------ sub handleInput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Request!' ); my $cgi = CGI->new( $data->{Query} ); @@ -705,7 +705,7 @@ sub handleInput { # ------------------ sub field2path { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return error ('No Field!' ); my $data = shift || return error ('No ids!' ); my $pathfield; @@ -736,7 +736,7 @@ sub field2path { # ------------------ sub insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return 0; my @setdata; @@ -755,7 +755,7 @@ sub insert { # ------------------ sub stream { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $files = shift || return error ('No Files!' ); my $client = shift || return error ('No Client!' ); @@ -784,7 +784,7 @@ sub stream { # ------------------ sub parseRequest { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $hdl = shift || return error ('No Request!' ); my ($Req, $size) = getFromSocket($hdl); @@ -833,7 +833,7 @@ Unknown Request : # ------------------ sub GroupArray { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $field = shift || return undef; my $table = shift; my $idfield = shift; @@ -863,7 +863,7 @@ sub GroupArray { # ------------------ sub GenreArray { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $dbh = ($obj->{mdbh} ? $obj->{mdbh} : $obj->{dbh}); @@ -882,7 +882,7 @@ sub GenreArray { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift || 0; @@ -915,7 +915,7 @@ sub status { # ------------------ sub getcovers { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $force = shift; @@ -1047,7 +1047,7 @@ sub getcovers { # ------------------ sub _findcoverfromcache { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $album = shift || return error ('No Album!' ); my $artist = shift || 0; my $typ = shift || 'absolute'; @@ -1074,7 +1074,7 @@ sub _findcoverfromcache { # ------------------ sub unique { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $text = shift || return ''; $text =~ s/[^0-9a-z]//sig; @@ -1084,7 +1084,7 @@ sub unique { # ------------------ sub ConnectToMuggleDB { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $dsn = shift || return 0; $dsn =~ s/^\s+//; @@ -1103,10 +1103,10 @@ sub ConnectToMuggleDB { if($mdbh) { $mdbh->{InactiveDestroy} = 1; $mdbh->{mysql_auto_reconnect} = 1; - debug('Successfully connect to: %s', $dsn); + debug('Connect to database: %s successful.', $dsn); return $mdbh; } else { - debug('No GiantDisc data base. Use standard music data base!'); + debug('GiantDisc database not found! Use standard music database!'); return 0; } } else { @@ -1117,7 +1117,7 @@ sub ConnectToMuggleDB { # ------------------ sub _findcover { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $file = shift || return error ('No file!' ); my $artist = shift; my $album = shift; @@ -1217,7 +1217,7 @@ sub _findcover { # ------------------ sub coverimage { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || return error ('No data'); @@ -1288,7 +1288,7 @@ sub coverimage { # ------------------ sub getfile { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || return error ('No data'); @@ -1326,7 +1326,7 @@ sub getfile { # ------------------ sub suggest {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm index 809ccd7..977723d 100644 --- a/lib/XXV/MODULES/RECORDS.pm +++ b/lib/XXV/MODULES/RECORDS.pm @@ -16,14 +16,14 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'RECORDS', Prereq => { 'Time::Local' => 'efficiently compute time from local and GMT time ', }, - Description => gettext('This module managed recordings.'), + Description => gettext('This module manages recordings.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -31,7 +31,7 @@ sub module { Status => sub{ $obj->status(@_) }, Preferences => { commandfile => { - description => gettext('Location of reccmds.conf on your system.'), + description => sprintf(gettext("Path of file '%s'"),'reccmds.conf'), default => '/var/lib/vdr/reccmds.conf', type => 'file', required => gettext("This is required!"), @@ -49,22 +49,22 @@ sub module { required => gettext("This is required!"), }, videodir => { - description => gettext('Directory, where vdr recordings are stored.'), + description => gettext('Directory where recordings are stored'), default => '/var/lib/video', type => 'dir', required => gettext("This is required!"), }, previewbinary => { - description => gettext('Location of used program to produce preview images on your system.'), + description => gettext('Location of used program to produce thumbnails on your system.'), default => '/usr/bin/mplayer', type => 'file', required => gettext("This is required!"), }, previewcommand => { - description => gettext('Please choose the used program to produce preview images.'), + description => gettext('The program used to create thumbnails'), type => 'list', choices => [ - [gettext('Nothing'), 'Nothing'], + [gettext('None'), 'Nothing'], ['MPlayer1.0pre5', 'MPlayer1.0pre5'], ['MPlayer1.0pre6', 'MPlayer1.0pre6'], ['vdr2jpeg', 'vdr2jpeg'], @@ -73,12 +73,12 @@ sub module { required => gettext("This is required!"), }, previewcount => { - description => gettext('How many preview images produce?'), + description => gettext('Produce how many thumbnails'), default => 3, type => 'integer', }, previewlistthumbs => { - description => gettext('Display list records with thumbnails?'), + description => gettext('Display recording list with thumbnails?'), default => 'n', type => 'confirm', }, @@ -89,7 +89,7 @@ sub module { required => gettext('This is required!'), }, vfat => { - description => gettext('Set this if your filename encoded for vfat filesystems'), + description => gettext('VDR compiled for VFAT system (VFAT=1)'), default => 'y', type => 'confirm', }, @@ -102,7 +102,7 @@ sub module { DenyClass => 'rlist', }, rlist => { - description => gettext('List recordings'), + description => gettext('List of recordings'), short => 'rl', callback => sub{ $obj->list(@_) }, DenyClass => 'rlist', @@ -142,7 +142,7 @@ sub module { DenyClass => 'redit', }, rplay => { - description => gettext("Play recording 'rid' in vdr"), + description => gettext("Play recording 'rid' in the VDR."), short => 'rpv', callback => sub{ $obj->play(@_) }, Level => 'user', @@ -163,7 +163,7 @@ sub module { }, RegEvent => { 'deleteRecord' => { - Descr => gettext('Create event entries, if a record deleted.'), + Descr => gettext('Create event entries if a recording has been deleted.'), # You have this choices (harmless is default): # 'harmless', 'interesting', 'veryinteresting', 'important', 'veryimportant' @@ -249,7 +249,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); unless($obj->{dbh}) { panic("Session to database is'nt connected"); @@ -301,7 +301,7 @@ sub _init { $obj->readData(); $obj->{countReading} += 1; return 1; - }, "RECORDS: Store records in database ...", 20); + }, "RECORDS: Store recordings in database ...", 20); 1; } @@ -317,8 +317,8 @@ sub dot1000 { # ------------------ sub parseData { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $vdata = shift || return error('Problem to read Data!'); + my $obj = shift || return error('No object defined!'); + my $vdata = shift || return error('Problem to read data!'); my ($event, $hash, $id, $date, $hour, $minute, $state, $duration, $title, $day, $month, $year); my $dataHash = {}; @@ -381,7 +381,7 @@ sub scandirectory {# ------------------ # ------------------ sub readData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $waiter = shift; @@ -605,9 +605,9 @@ sub readData { if(ref $console) { $console->start() if(ref $waiter); if(scalar @{$err} == 0) { - $console->message(sprintf(gettext("Write %d recordings in database."), scalar @merkIds)); + $console->message(sprintf(gettext("Write %d recordings to the database."), scalar @merkIds)); } else { - unshift(@{$err}, sprintf(gettext("Write only %d recordings in database. Can\'t assign %d recordings."), scalar @merkIds , scalar @{$err})); + unshift(@{$err}, sprintf(gettext("Write %d recordings to the database. Cannot assign %d recordings."), scalar @merkIds , scalar @{$err})); lg join("\n", @$err); $console->err($err); } @@ -623,7 +623,7 @@ sub readData { # ------------------ sub updated { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cb = shift || 0; my $log = shift || 0; @@ -643,16 +643,16 @@ sub updated { # ------------------ sub refresh { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $waiter; if(ref $console) { if($console->typ eq 'HTML') { - $waiter = $console->wait(gettext("Get informations from recordings ..."),0,1000,'no'); + $waiter = $console->wait(gettext("Get information on recordings ..."),0,1000,'no'); } else { - $console->msg(gettext("Get informations from recordings ...")); + $console->msg(gettext("Get information on recordings ...")); } } @@ -662,7 +662,7 @@ sub refresh { # ------------------ sub insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $attr = shift || return 0; my $sth = $obj->{dbh}->prepare( @@ -691,7 +691,7 @@ sub insert { # ------------------ sub _updateEvent { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $event = shift || return undef; my $sth = $obj->{dbh}->prepare('UPDATE OLDEPG SET duration=?, starttime=FROM_UNIXTIME(?), addtime=FROM_UNIXTIME(?) where eventid=?'); @@ -715,10 +715,10 @@ sub _updateState {# ------------------ # ------------------ sub analyze { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $recattr = shift || return error ('No data to analyze!'); - lg sprintf('Analyze record "%s" from system', + lg sprintf('Analyze recording "%s"', $recattr->{title}, ); @@ -785,11 +785,11 @@ sub analyze { # ------------------ sub videoInfo { # ------------------ - my $obj = shift || return error ('No object!' ); + my $obj = shift || return error('No object defined!'); my $title = shift || return error ('No title!' ); my $starttime = shift || return error ('No title!' ); - lg sprintf('Get videoInfo from record "%s"', $title ); + lg sprintf('Get information from recording "%s"', $title ); my $month=sprintf("%02d",(localtime($starttime))[4]+1); my $day=sprintf("%02d",(localtime($starttime))[3]); @@ -899,7 +899,7 @@ sub videoInfo { # ------------------ sub videoPreview { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eventid = shift || return error ('No eventid!'); my $info = shift || return error ('No InfoHash!'); my $rebuild = shift || 0; @@ -1026,10 +1026,10 @@ sub _mark2frames{ # ------------------ sub SearchEpgId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $start = shift || return error ('No Start!' ); my $dur = shift || return; - my $title = shift || return error ('No Title!' ); + my $title = shift || return error ('No title!' ); my $subtitle = shift; my $channel = shift; @@ -1078,11 +1078,11 @@ qq|SELECT * FROM OLDEPG WHERE # ------------------ sub createOldEventId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return error ('No Id!' ); my $start = shift || return error ('No Starttime!' ); my $duration = shift || 0; - my $title = shift || return error ('No Title!' ); + my $title = shift || return error ('No title!' ); my $subtitle = shift; my $info = shift; @@ -1130,10 +1130,10 @@ sub createOldEventId { # ------------------ sub display { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $recordid = shift || return $console->err(gettext("No RecordID to display the recording! Please use rdisplay 'rid'")); + my $recordid = shift || return $console->err(gettext("No recording defined for display! Please use rdisplay 'rid'")); my $start = "e.starttime"; my $stopp = "FROM_UNIXTIME(UNIX_TIMESTAMP(e.starttime) + e.duration)"; @@ -1188,17 +1188,17 @@ where # ------------------ sub play { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $recordid = shift || return $console->err(gettext("No RecordID to play the recording! Please use rplay 'rid'")); + my $recordid = shift || return $console->err(gettext("No recording defined for playback! Please use rplay 'rid'.")); my $sql = qq|SELECT RecordID FROM RECORDS WHERE RecordMD5 = ?|; my $sth = $obj->{dbh}->prepare($sql); my $rec; if(!$sth->execute($recordid) || !($rec = $sth->fetchrow_hashref())) { - return $console->err(sprintf(gettext("RecordID '%s' does not exist in the database!"),$recordid)); + return $console->err(sprintf(gettext("Recording '%s' does not exist in the database!"),$recordid)); } my $cmd = sprintf('PLAY %d begin', $rec->{RecordID}); @@ -1208,17 +1208,17 @@ sub play { # ------------------ sub cut { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $recordid = shift || return $console->err(gettext("No RecordID to play the recording! Please use rplay 'rid'")); + my $recordid = shift || return $console->err(gettext("No recording defined for playback! Please use rplay 'rid'.")); my $sql = qq|SELECT RecordID FROM RECORDS WHERE RecordMD5 = ?|; my $sth = $obj->{dbh}->prepare($sql); my $rec; if(!$sth->execute($recordid) || !($rec = $sth->fetchrow_hashref())) { - return $console->err(sprintf(gettext("RecordID '%s' does not exist in the database!"),$recordid)); + return $console->err(sprintf(gettext("Recording '%s' does not exist in the database!"),$recordid)); } my $cmd = sprintf('EDIT %d', $rec->{RecordID}); @@ -1228,7 +1228,7 @@ sub cut { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $text = shift || ""; @@ -1320,7 +1320,7 @@ GROUP BY # ------------------ sub search { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $text = shift || return $obj->list($watcher,$console); @@ -1389,10 +1389,10 @@ WHERE # ------------------ sub delete { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $record = shift || return $console->err(gettext("No Recording ID to delete! Please use rdelete 'id'")); + my $record = shift || return $console->err(gettext("No recording defined for deletion! Please use rdelete 'id'.")); my $answer = shift || 0; my @rcs = split(/_/, $record); @@ -1444,7 +1444,7 @@ sub delete { $obj->{svdrp}->queue_cmds(sprintf("delr %s",$r->{Id})); push(@todelete,$r->{Title}); # Remember title - # Remove recordings from request, if found in database + # Delete recordings from request, if found in database my $i = 0; for my $x (@recordings) { if ( $x eq $recording->[2] ) { # Remove known MD5 from user request @@ -1455,7 +1455,7 @@ sub delete { } } - $console->err(sprintf(gettext("Recording with number '%s' does not exist in the database!"), + $console->err(sprintf(gettext("Recording '%s' does not exist in the database!"), join('\',\'',@recordings))) if(ref $console and scalar @recordings); if($obj->{svdrp}->queue_cmds('COUNT')) { @@ -1504,10 +1504,10 @@ sub is_empty_dir { # ------------------ sub redit { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $recordid = shift || return $console->err(gettext("No RecordID to edit!")); + my $recordid = shift || return $console->err(gettext("No recording defined for editing!")); my $data = shift || 0; my $rec; @@ -1528,7 +1528,7 @@ WHERE |; my $sth = $obj->{dbh}->prepare($sql); $sth->execute($recordid) - or return $console->err(sprintf(gettext("RecordID '%s' does not exist in the database!"),$recordid)); + or return $console->err(sprintf(gettext("Recording '%s' does not exist in the database!"),$recordid)); $rec = $sth->fetchrow_hashref(); } @@ -1541,7 +1541,7 @@ WHERE if(-r $file) { my $text = load_file($file) - or $console->err(sprintf(gettext("Can't open file '%s' : %s"),$file,$!)); + or $console->err(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$!)); foreach my $zeile (split(/[\r\n]/, $text)) { if($zeile =~ /^D\s+(.+)/s) { @@ -1580,28 +1580,28 @@ WHERE }, 'lifetime' => { typ => 'integer', - msg => gettext('Lifetime (0 .. 99)'), + msg => sprintf(gettext('Lifetime (%d ... %d)'),0,99), def => int($rec->{Lifetime}), check => sub{ my $value = shift || 0; if($value >= 0 and $value < 100) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, req => gettext("This is required!"), }, 'priority' => { typ => 'integer', - msg => gettext('Priority (0 .. 99)'), + msg => sprintf(gettext('Priority (%d ... %d)'),0,99), def => int($rec->{Prio}), check => sub{ my $value = shift || 0; if($value >= 0 and $value < 100) { return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, req => gettext("This is required!"), @@ -1641,7 +1641,7 @@ WHERE }, 'marks' => { param => {type => 'text'}, - msg => gettext("Marks"), + msg => gettext("Cut marks"), def => $marks || '', }, ]; @@ -1653,7 +1653,7 @@ WHERE my $dropEPGEntry = 0; my $ChangeRecordingData = 0; - debug sprintf('Record "%s" is changed%s', + debug sprintf('Recording "%s" has changed%s', $rec->{title}, ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) ); @@ -1669,7 +1669,7 @@ WHERE $data->{summary} =~ s/\s+$//; # no trailing white space if(-r $file) { my $text = load_file($file) - or $console->err(sprintf(gettext("Can't open file '%s' : %s"),$file,$!)); + or $console->err(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$!)); foreach my $zeile (split(/[\r\n]/, $text)) { $zeile =~ s/^\s+//; $zeile =~ s/\s+$//; @@ -1814,9 +1814,9 @@ WHERE my $waiter; if(ref $console) { if($console->typ eq 'HTML') { - $waiter = $console->wait(gettext('Recording is edited!'),0,1000,'no'); + $waiter = $console->wait(gettext('Recording edited!'),0,1000,'no'); }else { - $console->msg(gettext('Recording is edited!')); + $console->msg(gettext('Recording edited!')); } } $obj->readData($watcher,$console,$waiter); @@ -1832,7 +1832,7 @@ WHERE # Load Reccmds's sub _loadreccmds { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); unless($obj->{reccmds}) { $obj->{reccmds} = []; @@ -1849,7 +1849,7 @@ sub _loadreccmds { # ------------------ sub conv { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $data = shift || 0; @@ -1857,7 +1857,7 @@ sub conv { $obj->_loadreccmds; unless(scalar @{$obj->{reccmds}}) { - $console->err(gettext('No reccmds.conf on your System!')); + $console->err(gettext('No reccmds.conf on your system!')); return 1; } @@ -1869,10 +1869,10 @@ sub conv { } my ($cmdid, $recid) = split(/[\s_]/, $data); - my $cmd = (split(':', $obj->{reccmds}->[$cmdid-1]))[-1] || return $console->err(gettext("I can't find this CommandID")); - my $path = $obj->IdToPath($recid) || return $console->err(gettext("I can't find this RecordID")); + my $cmd = (split(':', $obj->{reccmds}->[$cmdid-1]))[-1] || return $console->err(gettext("Cannot find this command ID!")); + my $path = $obj->IdToPath($recid) || return $console->err(sprintf(gettext("Recording '%s' does not exist in the database!"),$recid)); - debug sprintf('Call command "%s" on record "%s"%s', + debug sprintf('Call command "%s" on recording "%s"%s', $cmd, $path, ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) @@ -1881,12 +1881,12 @@ sub conv { my $call = "$cmd \"$path\""; my $output = `$call`; if( $? >> 8 > 0) { - $console->message(sprintf(gettext("Sorry! Call %s %s Error output: %s"), $cmd, $path, $output)); + $console->message(sprintf(gettext("Sorry! Call %s %s with error output: %s"), $cmd, $path, $output)); } else { - $console->message(sprintf(gettext("Call %s %s With output: %s"), $cmd, $path, $output)); + $console->message(sprintf(gettext("Call %s %s with output: %s"), $cmd, $path, $output)); } $console->link({ - text => gettext("Back to recordings list"), + text => gettext("Back to recording list"), url => "?cmd=rlist", }) if($console->typ eq 'HTML'); return 1; @@ -1895,7 +1895,7 @@ sub conv { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift; @@ -1934,7 +1934,7 @@ ORDER BY # ------------------ sub IdToPath { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return undef; my $sth = $obj->{dbh}->prepare('select Path from RECORDS where RecordMD5 = ?'); @@ -1947,7 +1947,7 @@ sub IdToPath { # ------------------ sub getPreviewFiles { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $id = shift || return error ('No EventID!' ); # look for pictures @@ -1967,12 +1967,12 @@ sub getPreviewFiles { # ------------------ sub getGroupIds { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $recid = shift || return error ('No Record ID!' ); + my $obj = shift || return error('No object defined!'); + my $recid = shift || return error ('No recording defined!' ); my $epgid = getDataById($recid, 'RECORDS', 'RecordMD5'); if(!$epgid) { - error sprintf("Can't find Record for id %s!", $recid); + error sprintf("Can't find recording '%s'!", $recid); return; } my $epgdata = main::getModule('EPG')->getId($epgid->{eventid}); @@ -2025,8 +2025,8 @@ GROUP BY # ------------------ sub translate { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $title = shift || return error ('No Title in translate!'); + my $obj = shift || return error('No object defined!'); + my $title = shift || return error ('No title in translate!'); my $vfat = shift || $obj->{vfat}; if($vfat eq 'y') @@ -2051,7 +2051,7 @@ sub translate { # return value as integer sub _recordinglength { # ------------------ - my $obj = shift || return 0, error ('No Object!' ); + my $obj = shift || return 0, error('No object defined!'); my $path = shift || return 0, error ('Missing path from recording!' ); my $f = sprintf("%s/index.vdr", $path); @@ -2072,8 +2072,8 @@ sub _recordinglength { # ------------------ sub converttitle { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $title = shift || return error ('No Title in translate!'); + my $obj = shift || return error('No object defined!'); + my $title = shift || return error ('No title in translate!'); my $vfat = shift || $obj->{vfat}; if($vfat eq 'y') { @@ -2092,7 +2092,7 @@ sub converttitle { # ------------------ sub suggest {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; diff --git a/lib/XXV/MODULES/REMOTE.pm b/lib/XXV/MODULES/REMOTE.pm index 3980e68..4eaba23 100644 --- a/lib/XXV/MODULES/REMOTE.pm +++ b/lib/XXV/MODULES/REMOTE.pm @@ -8,7 +8,7 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'REMOTE', Prereq => { @@ -34,7 +34,7 @@ sub module { required => gettext('This is required!'), }, commands => { - description => gettext('The path to the commands.conf'), + description => sprintf(gettext("Path of file '%s'"),'commands.conf'), default => '/var/lib/vdr/commands.conf', type => 'file', required => gettext('This is required!'), @@ -103,7 +103,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); @@ -122,13 +122,13 @@ sub init { # ------------------ sub parse { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0 unless (exists $obj->{commands}); if(! -r $obj->{commands}) { - error (sprintf("can't open file '%s' : %s",$obj->{commands},$!)); + error (sprintf("Could not open file '%s'! : %s",$obj->{commands},$!)); return 0; } @@ -151,7 +151,7 @@ sub parse { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $cmds = $obj->parse(); @@ -167,7 +167,7 @@ sub list { # ------------------ sub command { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $command = shift || return error ('No Command!'); @@ -199,7 +199,7 @@ sub command { # ------------------ sub remote { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $command = shift; @@ -249,7 +249,7 @@ sub remote { # ------------------ sub switch { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $channel = shift || ''; diff --git a/lib/XXV/MODULES/REPORT.pm b/lib/XXV/MODULES/REPORT.pm index 6ab335c..55e57fa 100644 --- a/lib/XXV/MODULES/REPORT.pm +++ b/lib/XXV/MODULES/REPORT.pm @@ -10,7 +10,7 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'REPORT', Prereq => { @@ -114,7 +114,7 @@ sub new { 'important', ); return 1; - }, "Send restart Message to News channel ..."); + }, "Send restart message to news modules ..."); return $self; } @@ -122,7 +122,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # Load the NEWS Plugins ... my @mods = glob($obj->{paths}->{NEWSMODS}.'/*.pm'); @@ -164,7 +164,7 @@ sub init { # ------------------ sub report { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $modulename = shift || ''; @@ -192,8 +192,8 @@ sub report { # ------------------ sub news { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $title = shift || return error ('No Title!' ); + my $obj = shift || return error('No object defined!'); + my $title = shift || return error ('No title!' ); my $text = shift || ''; my $cmd = shift || ''; my $id = shift || ''; @@ -237,7 +237,7 @@ sub news { # ------------------ sub request { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!' ); my $console = shift || return error ('No Console!' ); # To this time you can set on @@ -267,7 +267,7 @@ sub request { # ------------------ sub scala { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $typ = shift || return 10; $obj->{SCALA} = { diff --git a/lib/XXV/MODULES/ROBOT.pm b/lib/XXV/MODULES/ROBOT.pm index adfc295..733b1aa 100644 --- a/lib/XXV/MODULES/ROBOT.pm +++ b/lib/XXV/MODULES/ROBOT.pm @@ -10,7 +10,7 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'ROBOT', Prereq => { @@ -74,7 +74,7 @@ sub new { # ------------------ sub saveRobot { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rname = shift || return error ('No robot Name!' ); my $rsub = shift || return error ('No Robot sub!' ); @@ -89,7 +89,7 @@ sub saveRobot { # ------------------ sub register { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rname = shift || return error ('No robot Name!' ); my @args = @_; @@ -102,7 +102,7 @@ sub register { # ------------------ sub start { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rname = shift || return error ('No Robot Name to start!'); my $watcher = shift; my $console = shift; @@ -143,7 +143,7 @@ sub start { # ------------------ sub clean { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rname = shift || return error ('No Robot Name to clean!'); delete $obj->{jobs}->{$rname}; } @@ -152,7 +152,7 @@ sub clean { # ------------------ sub result { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rname = shift || return error ('No robot Name!' ); return $obj->{result}->{$rname}; @@ -162,7 +162,7 @@ sub result { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $rname = shift; diff --git a/lib/XXV/MODULES/SHARE.pm b/lib/XXV/MODULES/SHARE.pm index 8ed918e..a052135 100644 --- a/lib/XXV/MODULES/SHARE.pm +++ b/lib/XXV/MODULES/SHARE.pm @@ -11,7 +11,7 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cmd = (split('::', $AUTOLOAD))[-1]; return if($cmd eq 'DESTROY'); @@ -33,7 +33,7 @@ sub AUTOLOAD { # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'SHARE', Prereq => { @@ -118,7 +118,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{SessionId} = $obj->generateUniqueId unless($obj->{SessionId}); @@ -147,7 +147,7 @@ sub _init { # ------------------ sub getSoapData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return unless($obj->{SOAP} and $obj->{active} eq 'y'); lg 'Start interval share to get for Levels!'; $obj->{EventLevels} = $obj->getEventLevels(); @@ -159,7 +159,7 @@ sub getSoapData { # ------------------ sub generateUniqueId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sessionId; for(my $i=0 ; $i< 16 ;) @@ -178,7 +178,7 @@ sub generateUniqueId { # ------------------ sub ConnectToSOAP { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sid = shift || $obj->{SessionId} || return error ('No SesionID!' ); my $uri = shift || $obj->{uri}; my $prx = shift || $obj->{proxy}; @@ -206,7 +206,7 @@ sub ConnectToSOAP { # ------------------ sub getEventLevel { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $eid = shift || return; return unless($obj->{EventLevels}); @@ -218,7 +218,7 @@ sub getEventLevel { # ------------------ sub TopTen { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $anzahl = shift || 10; @@ -259,7 +259,7 @@ sub TopTen { # ------------------ sub CmdToSoap { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $soap = shift || return error ('No SOAP!' ); my $cmd = shift || return error ('No Command!' ); my @arg = @_; diff --git a/lib/XXV/MODULES/STATUS.pm b/lib/XXV/MODULES/STATUS.pm index 9f2af34..a658059 100644 --- a/lib/XXV/MODULES/STATUS.pm +++ b/lib/XXV/MODULES/STATUS.pm @@ -12,13 +12,13 @@ use File::Find; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'STATUS', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module analyze your system and print the result.'), + Description => gettext('This module analyzes your system and displays the result.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -50,17 +50,17 @@ sub module { type => "file", }, interval => { - description => gettext('Interval in seconds to remember data'), + description => gettext('Interval in seconds to save data'), default => 60, type => "integer", }, history => { - description => gettext('How long to remember the historical data in hours'), + description => gettext('Save historical data, in hours'), default => 3, type => "integer", }, font => { - description => gettext('True type font to draw image text.'), + description => gettext('TrueType font to draw overlay text'), default => 'Vera.ttf', type => 'list', choices => $obj->findttf, @@ -99,17 +99,17 @@ sub module { callback => sub{ $obj->vitals(@_) }, }, network => { - description => gettext('Display the network informations'), + description => gettext('Displays network information'), short => 'sn', callback => sub{ $obj->network(@_) }, }, hardware => { - description => gettext('Display the hardware informations'), + description => gettext('Displays hardware information'), short => 'sh', callback => sub{ $obj->hardware(@_) }, }, memory => { - description => gettext('Display the memory informations'), + description => gettext('Displays memory information'), short => 'sm', callback => sub{ $obj->memory(@_) }, }, @@ -165,7 +165,7 @@ sub new { # ------------------ sub remember { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $longsteps = int(($obj->{history} * 60 * 60) / $obj->{interval}); @@ -192,7 +192,7 @@ sub remember { # ------------------ sub vitals { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -219,7 +219,7 @@ sub vitals { # ------------------ sub network { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -237,7 +237,7 @@ sub network { # ------------------ sub hardware { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -265,7 +265,7 @@ sub hardware { # ------------------ sub memory { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -283,7 +283,7 @@ sub memory { # ------------------ sub filesys { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -306,7 +306,7 @@ sub filesys { # Takes Celcius temperatures and converts to Farenheit sub tempConvert { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $celcius = $_[0]; my $result = (( $celcius * 9) / 5 ) + 32; @@ -322,7 +322,7 @@ sub tempConvert { # Get the system's name sub name { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $result = hostname(); return $result; @@ -332,7 +332,7 @@ sub name { # Get the system's IP address sub IP { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $result = inet_ntoa(scalar(gethostbyname($obj->name())) || scalar(gethostbyname('localhost'))); return $result; @@ -342,7 +342,7 @@ sub IP { # Get the system's kernel version sub kernel { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $result = load_file("/proc/sys/kernel/osrelease"); $result =~ s/\n//sig; @@ -353,7 +353,7 @@ sub kernel { # Get the system's uptime sub uptime { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $buffer = load_file('/proc/uptime'); @@ -414,7 +414,7 @@ sub uptime { # Get information on network devices in the system sub netDevs { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $clr = shift || 0; my $buffer = load_file('/proc/net/dev'); @@ -436,7 +436,7 @@ sub netDevs { # Get the current memory info sub meminfo { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $clr = shift || 0; my $ret = {}; @@ -457,7 +457,7 @@ sub meminfo { # Get current cpu info sub CPU { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $buffer = load_file('/proc/cpuinfo'); @@ -492,7 +492,7 @@ sub CPU { # Get CPU usage info and return a percentage sub util { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); open(STAT, "/proc/stat") or return error "Can't open /proc/stat\n"; my $buffer = <STAT>; @@ -532,7 +532,7 @@ sub util { # Get the number of current users logged in sub users { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $result = `$obj->{whoBinary} | $obj->{wcBinary} -l` or return error "Can't execute $obj->{whoBinary} or $obj->{wcBinary}\n"; @@ -544,7 +544,7 @@ sub users { # Get the list of PCI devices sub pci { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0 if(! -r "/proc/pci"); @@ -562,7 +562,7 @@ sub pci { # Get the list of IDE devices sub ide { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my @ideModelList; my @ideCapacityList; @@ -598,7 +598,7 @@ sub ide { # Get the list of SCSI devices sub scsi { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $ret = [[qw/Device Vendor Model Type/]]; my $file = "/proc/scsi/scsi"; @@ -658,7 +658,7 @@ sub scsi { # Get the current load averages sub load { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $clr = shift || 0; my $buffer = load_file("/proc/loadavg"); @@ -679,7 +679,7 @@ sub load { # Get the status of currently mounted filesystems sub mounts{ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $clr = shift || 0; my $df = `$obj->{dfBinary} -TP -x cdfs -x iso9660 -x udf` @@ -705,7 +705,7 @@ sub mounts{ # ------------------ sub videoMounts { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $videodir = shift || return error ('No Video dir!'); my $mounts = $obj->mounts; @@ -725,7 +725,7 @@ sub videoMounts { sub findttf # ------------------ { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $found; find({ wanted => sub{ if($File::Find::name =~ /\.ttf$/sig) { @@ -746,7 +746,7 @@ sub findttf # ------------------ sub watchDog { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $mou = shift || return error ('No Data!' ); # Not all 15 seconds a panic message ;) diff --git a/lib/XXV/MODULES/STREAM.pm b/lib/XXV/MODULES/STREAM.pm index 5242a26..84b72d6 100644 --- a/lib/XXV/MODULES/STREAM.pm +++ b/lib/XXV/MODULES/STREAM.pm @@ -13,7 +13,7 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'STREAM', Prereq => { @@ -37,14 +37,14 @@ sub module { type => 'string', }, mimetyp => { - description => gettext('Used mime-typ to deliver video streams.'), + description => gettext('Used mime type to deliver video streams'), default => 'video/x-mpegurl', type => 'string', }, }, Commands => { playrecord => { - description => gettext("Play the record over samba or nfs."), + description => gettext("Play recordings via samba or NFS."), short => 'pre', callback => sub{ $obj->play_record(@_) }, DenyClass => 'stream', @@ -94,7 +94,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); 1; } @@ -103,7 +103,7 @@ sub init { # ------------------ sub live_stream { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $channel = shift || return $console->err(gettext("No ChannelID to Stream! Please use livestream 'cid'")); @@ -129,14 +129,14 @@ sub live_stream { $console->out($data, $obj->{mimetyp}, %{$arg} ); } else { - $console->err(gettext("Sorry, stream is'nt supported")); + $console->err(gettext("Sorry, this stream is not supported!")); } } # ------------------ sub play_record { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $recid = shift || return $console->err(gettext("No RecordID to Play! Please use rplay 'rid'")); @@ -174,7 +174,7 @@ sub play_record { $console->out($data, $obj->{mimetyp}, %{$arg} ); } else { - $console->err(gettext("Sorry, stream is'nt supported")); + $console->err(gettext("Sorry, this stream is not supported!")); } } 1; diff --git a/lib/XXV/MODULES/SVDRP.pm b/lib/XXV/MODULES/SVDRP.pm index 632d1bd..493583a 100644 --- a/lib/XXV/MODULES/SVDRP.pm +++ b/lib/XXV/MODULES/SVDRP.pm @@ -11,26 +11,26 @@ $|++; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'SVDRP', Prereq => { 'Net::Telnet' => 'Net::Telnet allows you to make client connections to a TCP port and do network I/O', }, - Description => gettext('This module a telnet client for sdvrp.'), + Description => gettext('This module serves as telnet client for sdvrp.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', LastAuthor => (split(/ /, '$Author$'))[1], Preferences => { VdrHost => { - description => gettext('Name of the host that runs vdr'), + description => gettext('Name of host that runs the VDR.'), default => 'localhost', type => 'host', required => gettext('This is required!'), }, VdrPort => { - description => gettext('SVDRP-port of the running vdr client'), + description => gettext('SVDRP port on the running VDR'), default => 2001, type => 'integer', required => gettext('This is required!'), @@ -98,7 +98,7 @@ sub new { # ------------------ sub queue_cmds { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cmd = shift || 'CALL'; if($cmd eq 'CALL') { @@ -115,7 +115,7 @@ sub queue_cmds { # ------------------ sub command { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cmd = shift; my $host = $obj->{VdrHost}; @@ -199,7 +199,7 @@ sub command { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return; @@ -211,10 +211,10 @@ sub status { # ------------------ sub scommand { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $text = shift || return $console->err(gettext("No Command! Please use scommand 'cmd'")); + my $text = shift || return $console->err(gettext("No command defined! Please use scommand 'cmd'.")); my $erg = $obj->command($text); $console->msg($erg, $obj->err); @@ -224,7 +224,7 @@ sub scommand { # ------------------ sub err { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{ERROR}; } diff --git a/lib/XXV/MODULES/TELNET.pm b/lib/XXV/MODULES/TELNET.pm index 8377634..7974109 100644 --- a/lib/XXV/MODULES/TELNET.pm +++ b/lib/XXV/MODULES/TELNET.pm @@ -10,7 +10,7 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'TELNET', Prereq => { @@ -30,7 +30,7 @@ sub module { required => gettext('This is required!'), }, Clients => { - description => gettext('Maximum number from simultaneous connections to the same time'), + description => gettext('Maximum number of simultaneous connections'), default => 5, type => 'integer', required => gettext('This is required!'), @@ -50,7 +50,7 @@ sub module { }, Commands => { help => { - description => gettext("This will display all commands or the helptext from the 'module name'"), + description => gettext("This will display all commands or description of module 'name'."), short => 'h', callback => sub{ return $obj->usage(@_); @@ -89,13 +89,13 @@ sub module { Level => 'admin' }, reload => { - description => gettext("This will reload all Modules."), + description => gettext("Restart all modules."), short => 'rel', callback => sub{ my ($w, $c, $l) = @_; $Module::Reload::Debug = 2; Module::Reload->check; - $c->message(gettext("Modules reloaded.")); + $c->message(gettext("Modules loaded.")); }, Level => 'admin' }, @@ -142,7 +142,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # globals my $channels; @@ -249,7 +249,7 @@ sub init { # ------------------ sub usage { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $modulename = shift || 0; @@ -303,7 +303,7 @@ sub usage { # ------------------ sub handleInput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $line = shift || return; diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index 1cd7db1..f3e59b8 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -9,13 +9,13 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'TIMERS', Prereq => { # 'Perl::Module' => 'Description', }, - Description => gettext('This module parse the timers.conf and save this in the database.'), + Description => gettext('This module reads timers and saves it to the database.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -29,17 +29,17 @@ sub module { required => gettext("This is required!"), }, prevminutes => { - description => gettext('Buffer time in minutes before the scheduled end of the recorded program.'), + description => gettext('Buffer time in minutes before the scheduled start of a recording'), default => 5, type => 'integer', }, afterminutes => { - description => gettext('Buffer time in minutes after the scheduled end of the recorded program.'), + description => gettext('Buffer time in minutes past the scheduled end of a recording'), default => 5, type => 'integer', }, Priority => { - description => gettext('Defining the priority of this timer and of recordings created by this timer.'), + description => gettext('Priority of a timer for recordings when creating a new timer'), default => 50, type => 'integer', }, @@ -49,22 +49,22 @@ sub module { type => 'integer', }, DVBCards => { - description => gettext('How much DVB cards in your system?'), + description => gettext('How much DVB cards exist on this system'), default => 1, type => 'integer', }, deactive => { - description => gettext('Delete inactive timers after his end time?'), + description => gettext('Delete inactive timers after end time'), default => 'n', type => 'confirm', }, usevpstime => { - description => gettext('Use VPS start time?'), + description => gettext('Use VPS start time'), default => 'n', type => 'confirm', }, adjust => { - description => gettext('Timers adjust, if EPG entry were changed?'), + description => gettext('Change timers if EPG entries change'), default => 'y', type => 'confirm', }, @@ -83,7 +83,7 @@ sub module { DenyClass => 'tlist', }, tupdate => { - description => gettext("Read timers and write into database"), + description => gettext("Read timers and write them to the database"), short => 'tu', callback => sub{ $obj->readData(@_)}, Level => 'user', @@ -125,7 +125,7 @@ sub module { }, RegEvent => { 'newTimerfromUser' => { - Descr => gettext('Create event entries, if a new timer created by user.'), + Descr => gettext('Create event entries if the user has created a new timer.'), # You have this choices (harmless is default): # 'harmless', 'interesting', 'veryinteresting', 'important', 'veryimportant' @@ -152,7 +152,7 @@ sub module { return if($timer->{AutotimerId}); my $desc = getDataById($timer->{eventid}, 'EPG', 'eventid') if($timer->{eventid}); my $title = sprintf(gettext("New timer found: %s"),$timer->{File}); - my $description = sprintf(gettext("At: %s to %s\nDescription: %s"), + my $description = sprintf(gettext("On: %s to %s\nDescription: %s"), $timer->{NextStartTime}, fmttime($timer->{Stop}), $desc && $desc->{description} ? $desc->{description} : '' @@ -181,7 +181,7 @@ sub module { }, 'deleteTimer' => { - Descr => gettext('Create event entries, if timer deleted by user.'), + Descr => gettext('Create event entries if the user has deleted a timer.'), Level => 'interesting', SearchForEvent => { Msg => 'delt', @@ -195,7 +195,7 @@ sub module { my $timer = getDataById($args->{TimerId}, 'TIMERS', 'Id'); my $title = sprintf(gettext("Timer deleted: %s"),$timer->{File}); my $desc = getDataById($timer->{eventid}, 'EPG', 'eventid') if($timer->{eventid}); - my $description = sprintf(gettext("At: %s to %s\nDescription: %s"), + my $description = sprintf(gettext("On: %s to %s\nDescription: %s"), $timer->{NextStartTime}, fmttime($timer->{Stop}), $desc && $desc->{description} ? $desc->{description} : '' @@ -218,7 +218,7 @@ sub module { ], }, 'toggleTimer' => { - Descr => gettext('Create event entries, if timer toggled by user.'), + Descr => gettext('Create event entries if the user has toggled a timer.'), Level => 'interesting', SearchForEvent => { Msg => 'modt', @@ -232,7 +232,7 @@ sub module { my $event = shift; my $timer = getDataById($args->{TimerId}, 'TIMERS', 'Id'); my $title = sprintf(gettext("Timer toggled: %s to %s"),$timer->{File},$args->{Type}); - my $description = sprintf(gettext("Description: %s\nAt: %s to %s"), + my $description = sprintf(gettext("Description: %s\nOn: %s to %s"), $timer->{Summary}, $timer->{NextStartTime}, fmttime($timer->{Stop}) @@ -260,7 +260,7 @@ sub module { ], }, 'updateTimer' => { - Descr => gettext('Create event entries, if timer updated.'), + Descr => gettext('Create event entries if a timer has been updated.'), Level => 'harmless', SearchForEvent => { Msg => 'Reread', @@ -299,7 +299,7 @@ sub module { # ------------------ sub status { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; my $lastReportTime = shift || 0; @@ -317,7 +317,7 @@ sub status { } return { - message => sprintf(gettext('%d Timers exists.'), $total), + message => sprintf(gettext('%d timer exists.'), $total), }; } @@ -358,7 +358,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -423,7 +423,7 @@ sub _init { # ------------------ sub saveTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error('No Data to Save!'); my $timerid = shift || 0; @@ -473,7 +473,7 @@ sub saveTimer { # ------------------ sub newTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $epgid = shift || 0; @@ -499,7 +499,7 @@ WHERE eventid = ? |); $sth->execute($obj->{prevminutes} * 60, $obj->{prevminutes} * 60, $obj->{afterminutes} * 60, $epgid) - or return $console->err(sprintf(gettext("Event ID '%s' does not exist in the database!"),$epgid)); + or return $console->err(sprintf(gettext("Event '%s' does not exist in the database!"),$epgid)); $epg = $sth->fetchrow_hashref(); } if(not ref $epg) { @@ -536,7 +536,7 @@ WHERE # ------------------ sub editTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $timerid = shift || 0; # If timerid the edittimer @@ -563,7 +563,7 @@ WHERE Id = ? |); $sth->execute($timerid) - or return $console->err(sprintf(gettext("Timer ID '%s' does not exist in the database!"),$timerid)); + or return $console->err(sprintf(gettext("Timer '%s' does not exist in the database!"),$timerid)); $timerData = $sth->fetchrow_hashref(); } elsif (ref $data eq 'HASH') { $timerData = $data; @@ -583,18 +583,18 @@ WHERE 'Activ' => { typ => 'confirm', def => (defined $timerData->{Status} and ($timerData->{Status} & 1) ? 'y' : 'n'), - msg => gettext('Switch this timer on?'), + msg => gettext('Enable this timer'), }, 'VPS' => { typ => 'confirm', def => (defined $timerData->{Status} and ($timerData->{Status} & 4) ? 'y' : 'n'), - msg => gettext('VPS for this timer on?'), + msg => gettext('Enable VPS for this timer'), }, 'ChannelID' => { typ => 'list', def => $con ? $mod->ChannelToPos($timerData->{channel_id}) : $timerData->{channel_id}, choices => $con ? $mod->ChannelArray('Name') : $mod->ChannelIDArray('Name'), - msg => gettext('Which channel should recorded?'), + msg => gettext('Which channel should recorded'), req => gettext("This is required!"), check => sub{ my $value = shift || return; @@ -615,7 +615,7 @@ WHERE 'Day' => { typ => $con ? 'string' : 'date', def => $timerData->{Day}, - msg => gettext("Please enter a day (1 to 31) or the weekday in format 'MDMDFSS'."), + msg => gettext("Enter a day (1 to 31) or weekday in format 'MTWTFSS'"), req => gettext("This is required!"), check => sub{ my $value = shift || return; @@ -626,7 +626,7 @@ WHERE or $value =~ /^\S{7}$/) { # MTWTFSS return $value; } else { - return undef, gettext('No right day or corrupt format!'); + return undef, gettext('The day is incorrect or was in a wrong format!'); } }, }, @@ -635,17 +635,17 @@ WHERE def => sub{ return fmttime($timerData->{Start}); }, - msg => gettext("Starttime in format 'HH:MM'"), + msg => gettext("Start time in format 'HH:MM'"), check => sub{ my $value = shift; $value = fmttime($value) if($value =~ /^\d+$/sig); - return undef, gettext('No right time!') if($value !~ /^\d+:\d+$/sig); + return undef, gettext('The time is incorrect!') if($value !~ /^\d+:\d+$/sig); my @v = split(':', $value); $value = sprintf('%02d%02d',$v[0],$v[1]); if(int($value) < 2400 and int($value) >= 0) { return sprintf('%04d',$value); } else { - return undef, gettext('No right time!'); + return undef, gettext('The time is incorrect!'); } }, }, @@ -654,49 +654,49 @@ WHERE def => sub{ return fmttime($timerData->{Stop} || 0 ); }, - msg => gettext("Endtime in format 'HH:MM'"), + msg => gettext("End time in format 'HH:MM'"), check => sub{ my $value = shift; $value = fmttime($value) if($value =~ /^\d+$/sig); - return undef, gettext('No right time!') if($value !~ /^\d+:\d+$/sig); + return undef, gettext('The time is incorrect!') if($value !~ /^\d+:\d+$/sig); my @v = split(':', $value); $value = sprintf('%02d%02d',$v[0],$v[1]); if(int($value) < 2400 and int($value) >= 0) { return sprintf('%04d',$value); } else { - return undef, gettext('No right time!'); + return undef, gettext('The time is incorrect!'); } }, }, 'Priority' => { typ => 'integer', - msg => sprintf(gettext('Priority (0 .. %d)'),$console->{USER}->{MaxPriority} ? $console->{USER}->{MaxPriority} : 99 ), + msg => sprintf(gettext('Priority (%d ... %d)'),0,$console->{USER}->{MaxPriority} ? $console->{USER}->{MaxPriority} : 99 ), def => int($timerData->{Priority}), check => sub{ my $value = shift || 0; if($value =~ /^\d+$/sig and $value >= 0 and $value < 100) { if($console->{USER}->{MaxPriority} and $value > $console->{USER}->{MaxPriority}) { - return undef, sprintf(gettext('Sorry, but maximum priority is limited on %d!'), $console->{USER}->{MaxPriority}); + return undef, sprintf(gettext('Sorry, but the maximum priority is limited to %d!'), $console->{USER}->{MaxPriority}); } return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, 'Lifetime' => { typ => 'integer', - msg => sprintf(gettext('Lifetime (0 .. %d)'),$console->{USER}->{MaxLifeTime} ? $console->{USER}->{MaxLifeTime} : 99 ), + msg => sprintf(gettext('Lifetime (%d ... %d)'),0,$console->{USER}->{MaxLifeTime} ? $console->{USER}->{MaxLifeTime} : 99 ), def => int($timerData->{Lifetime}), check => sub{ my $value = shift || 0; if($value =~ /^\d+$/sig and $value >= 0 and $value < 100) { if($console->{USER}->{MaxLifeTime} and $value > $console->{USER}->{MaxLifeTime}) { - return undef, sprintf(gettext('Sorry, but maximum lifetime is limited on %d!'), $console->{USER}->{MaxLifeTime}); + return undef, sprintf(gettext('Sorry, but the maximum life time is limited to %d!'), $console->{USER}->{MaxLifeTime}); } return int($value); } else { - return undef, gettext('No right Value!'); + return undef, gettext('Value incorrect!'); } }, }, @@ -779,10 +779,10 @@ WHERE # ------------------ sub deleteTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; - my $timerid = shift || return $console->err(gettext("No Timer ID to delete! Please use tdelete 'tid'")); # If timerid the edittimer + my $timerid = shift || return $console->err(gettext("No timer defined for deletion! Please use tdelete 'tid'.")); # If timerid the edittimer my $answer = shift || 0; my @timers = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid); @@ -796,7 +796,7 @@ sub deleteTimer { my $mod = main::getModule('CHANNELS') or return; foreach my $tid (@timers) { unless(exists $data->{$tid}) { - $console->err(sprintf(gettext("Timer with number '%s' does not exist in the database!"), $tid)); + $console->err(sprintf(gettext("Timer '%s' does not exist in the database!"), $tid)); next; } @@ -843,10 +843,10 @@ sub deleteTimer { # ------------------ sub toggleTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $timerid = shift || return $console->err(gettext("No Timer ID to toggle! Please use ttoggle 'id'")); # If timerid the edittimer + my $timerid = shift || return $console->err(gettext("No timer defined to toggle! Please use ttoggle 'id'.")); # If timerid the edittimer my @timers = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid); @@ -860,7 +860,7 @@ sub toggleTimer { for my $timer (@timers) { unless(exists $data->{$timer}) { - $console->err(sprintf(gettext("Timer with number '%s' does not exist in the database!"), $timer)); + $console->err(sprintf(gettext("Timer '%s' does not exist in the database!"), $timer)); next; } @@ -914,7 +914,7 @@ sub toggleTimer { # ------------------ sub insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return; my $pos = shift || return; my $checked = shift || 0; @@ -971,7 +971,7 @@ sub insert { # ------------------ sub readData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift; my $console = shift; @@ -1025,7 +1025,7 @@ sub readData { event(sprintf('Reread %d timers and written to DB!', $c)); } - $console->message(sprintf(gettext("Write %d timers in database."), $c), {overlapping => $overlapping}) + $console->message(sprintf(gettext("%d timer written to database."), $c), {overlapping => $overlapping}) if(ref $console and $console->typ ne 'AJAX'); $console->redirect({url => $console->{browser}->{Referer}, wait => 1}) @@ -1039,7 +1039,7 @@ sub readData { # ------------------ sub updated { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cb = shift || 0; my $log = shift || 0; @@ -1058,7 +1058,7 @@ sub updated { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $text = shift || ''; @@ -1073,11 +1073,11 @@ sub list { my %f = ( 'Id' => umlaute(gettext('Sv')), 'Status' => umlaute(gettext('Status')), - 'Prg' => umlaute(gettext('Prg')), + 'Day' => umlaute(gettext('Day')), 'Channel' => umlaute(gettext('Channel')), 'Start' => umlaute(gettext('Start')), 'Stop' => umlaute(gettext('Stop')), - 'File' => umlaute(gettext('File')), + 'Title' => umlaute(gettext('Title')), 'Priority' => umlaute(gettext('Priority')), ); @@ -1087,10 +1087,10 @@ SELECT t.Status as $f{'Status'}, c.Name as $f{'Channel'}, c.Pos as __Pos, - t.Day as $f{'Prg'}, + t.Day as $f{'Day'}, DATE_FORMAT(t.NextStartTime, '%H:%i') as $f{'Start'}, DATE_FORMAT(t.NextStopTime, '%H:%i') as $f{'Stop'}, - t.File as $f{'File'}, + t.File as $f{'Title'}, t.Priority as $f{'Priority'}, UNIX_TIMESTAMP(t.NextStartTime) as __Day, t.Collision as __Collision, @@ -1114,10 +1114,10 @@ SELECT t.Status as $f{'Status'}, c.Name as $f{'Channel'}, c.Pos as __Pos, - t.Day as $f{'Prg'}, + t.Day as $f{'Day'}, DATE_FORMAT(t.NextStartTime, '%H:%i') as $f{'Start'}, DATE_FORMAT(t.NextStopTime, '%H:%i') as $f{'Stop'}, - t.File as $f{'File'}, + t.File as $f{'Title'}, t.Priority as $f{'Priority'}, UNIX_TIMESTAMP(t.NextStartTime) as __Day, t.Collision as __Collision, @@ -1151,7 +1151,7 @@ ORDER BY # ------------------ sub getTimerById { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $tid = shift || return error ('No TimerId!' ); my $sql = qq| @@ -1179,7 +1179,7 @@ WHERE my $sth = $obj->{dbh}->prepare($sql); $sth->execute($tid) - or return error(sprintf("Timer ID '%s' does not exist in the database!",$tid)); + or return error(sprintf("Timer '%s' does not exist in the database!",$tid)); return $sth->fetchrow_hashref(); } @@ -1187,7 +1187,7 @@ WHERE # ------------------ sub getRunningTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $rowname = shift || 'Id'; my $sql = "select $rowname from TIMERS where NOW() between NextStartTime and NextStopTime AND (Status & 1)"; my $erg = $obj->{dbh}->selectall_hashref($sql, $rowname); @@ -1197,7 +1197,7 @@ sub getRunningTimer { # ------------------ sub getNewTimers { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $oldTimers = shift || return; my $ret = []; @@ -1212,7 +1212,7 @@ sub getNewTimers { # ------------------ sub getOldDeactivTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sql = "select Id from TIMERS where not (Status & 1) and UNIX_TIMESTAMP(NextStopTime) > UNIX_TIMESTAMP() + (60*60*24*28)"; my $erg = $obj->{dbh}->selectall_hashref($sql, 'Id'); @@ -1227,7 +1227,7 @@ sub getOldDeactivTimer { # ------------------ sub getCheckTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sql = qq| SELECT t.Id as Id, t.Status as Status,t.ChannelID as ChannelID, t.Priority as Priority, t.Lifetime as Lifetime, @@ -1301,7 +1301,7 @@ SELECT t.Id as Id, t.Status as Status,t.ChannelID as ChannelID, # ------------------ sub getEpgIds { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sql = "select Id, Status & 1 as Status, eventid from TIMERS where eventid > 0"; my $erg = $obj->{dbh}->selectall_hashref($sql, 'eventid'); return $erg; @@ -1310,7 +1310,7 @@ sub getEpgIds { # ------------------ sub getEpgDesc { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $tid = shift || return error ('No TimerId!' ); my $sql = qq| @@ -1324,7 +1324,7 @@ where my $sth = $obj->{dbh}->prepare($sql); $sth->execute($tid) - or return error(sprintf("Timer ID '%s' does not exist in the database!",$tid)); + or return error(sprintf("Timer '%s' does not exist in the database!",$tid)); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{description} : ''; } @@ -1332,7 +1332,7 @@ where # ------------------ sub getOverlappingTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $sql = qq| select @@ -1366,7 +1366,7 @@ where TIMERS.ChannelID = CHANNELS.Id # ------------------ sub checkOverlapping { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $NextStartTime = $data->{NextStartTime}; @@ -1449,7 +1449,7 @@ ORDER BY # ------------------ sub getNextTimer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $erg = $obj->{svdrp}->command('NEXT abs'); my @eerg = grep(/^250/, @$erg); @@ -1475,8 +1475,8 @@ sub getNextTimer { my $reportmod = main::getModule('REPORT'); $reportmod->news( - sprintf(gettext("Timer %d with title '%s' is start to recording!"), $data->{Id}, $data->{File}), - sprintf(gettext("on channel: %s until %s"), $data->{Channel}, fmttime($data->{Stop})), + sprintf(gettext("Timer %d with title '%s' has started the recording!"), $data->{Id}, $data->{File}), + sprintf(gettext("on channel: %s to %s"), $data->{Channel}, fmttime($data->{Stop})), 'tedit', $data->{Id}, 'harmless' @@ -1491,7 +1491,7 @@ sub getNextTimer { # ------------------ sub _getNextEpgId { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $timer = shift || return error ('No Hash!' ); my $e; @@ -1549,7 +1549,7 @@ sub _getNextEpgId { # ------------------ sub getNextTime { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $dor = shift || return error ('No Day!' ); my $start = shift || return error ('No Starttime!' ); my $stop = shift || return error ('No Stoptime!' ); @@ -1631,7 +1631,7 @@ sub getNextTime { # Usage: $hash = $obj->getTimersByAutotimer([$aid, $aid, $aid, ...]); # ------------------ sub getTimersByAutotimer { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $aids = shift || return $obj->{AIDS}; $obj->{AIDS} = {}; @@ -1657,7 +1657,7 @@ sub getTimersByAutotimer { # Usage: $hash = $obj->getRootDirs([$count]); # ------------------ sub getRootDirs { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $count = shift || 1; my $sql = "select distinct SUBSTRING_INDEX(File,'~',$count) from TIMERS;"; my $erg = $obj->{dbh}->selectall_arrayref($sql); @@ -1687,7 +1687,7 @@ sub my_strftime { # ------------------ sub suggest {# ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $search = shift; diff --git a/lib/XXV/MODULES/USER.pm b/lib/XXV/MODULES/USER.pm index 8e51a33..8ab2f0a 100644 --- a/lib/XXV/MODULES/USER.pm +++ b/lib/XXV/MODULES/USER.pm @@ -11,7 +11,7 @@ use File::Path; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'USER', Prereq => { @@ -19,17 +19,17 @@ sub module { => 'Efficiently match IPv4 addresses against IPv4 ranges via regexp ', }, Description => -gettext("This module managed a Useradministration Interface. -for use you can set a Level to the hole Modul with -a parameter 'Level' in the main root or you can set -the same parameter in a function."), +gettext("This module manages the User administration. +You may set a level for the whole module with +the 'Level' parameter in the main module +or the same parameter is set for each function."), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', LastAuthor => (split(/ /, '$Author$'))[1], Preferences => { active => { - description => gettext('Switch the Userauthentification on or off'), + description => gettext('Enable user authentication'), default => 'y', type => 'confirm', }, @@ -41,7 +41,7 @@ the same parameter in a function."), my $value = shift || return; my @ips = split(/\s*,\s*/, $value); for (@ips) { - return undef, sprintf(gettext('Your IP number (%s) is wrong! You need a IP with range (xxx.xxx.xxx.xxx/xx)'), $_) + return undef, sprintf(gettext('Your IP number (%s) is wrong! You need an IP in range (xxx.xxx.xxx.xxx/xx)'), $_) unless ($_ =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d+/); } return $value; @@ -55,7 +55,7 @@ the same parameter in a function."), my $value = shift || return; my @ips = split(/\s*,\s*/, $value); for (@ips) { - return undef, sprintf(gettext('Your IP number (%s) is wrong! You need a IP with range (xxx.xxx.xxx.xxx/xx)'), $_) + return undef, sprintf(gettext('Your IP number (%s) is wrong! You need an IP in range (xxx.xxx.xxx.xxx/xx)'), $_) unless ($_ =~ /\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\/\d+/); } return $value; @@ -70,25 +70,25 @@ the same parameter in a function."), }, Commands => { unew => { - description => gettext('Create a new account for user'), + description => gettext('Create new user account'), short => 'un', callback => sub{ $obj->create(@_) }, Level => 'admin', }, udelete => { - description => gettext("Delete a account of user 'uid'"), + description => gettext("Delete user account 'uid'"), short => 'ud', callback => sub{ $obj->delete(@_) }, Level => 'admin', }, uedit => { - description => gettext("Edit a account of user 'uid'"), + description => gettext("Edit user account 'uid'"), short => 'ue', callback => sub{ $obj->edit(@_) }, Level => 'admin', }, uprefs => { - description => gettext("Change the own preferences"), + description => gettext("Change preferences"), short => 'up', callback => sub{ $obj->userprefs(@_) }, Level => 'user', @@ -100,7 +100,7 @@ the same parameter in a function."), Level => 'admin', }, logout => { - description => gettext("Logout from the current Session"), + description => gettext("Log out from current session."), short => 'exit', callback => sub{ my $watcher = shift || return error ('No Watcher!'); @@ -184,7 +184,7 @@ sub new { # ------------------ sub _init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return 0, panic("Session to database is'nt connected") unless($obj->{dbh}); @@ -226,7 +226,7 @@ sub _init { # Usage: my $ok = $obj->create($watcher, $console, 0, {name => 'user', ...}); # ------------------ sub create { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -239,7 +239,7 @@ sub create { # ------------------ sub userprefs { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || $obj->{USER}->{Id}; @@ -249,7 +249,7 @@ sub userprefs { if($id and not ref $data) { my $sth = $obj->{dbh}->prepare('select * from USER where Id = ?'); $sth->execute($id) - or return $console->err(sprintf(gettext("Account for user with ID '%s' does not exist in the database!"),$id)); + or return $console->err(sprintf(gettext("User account '%s' does not exist in the database!"),$id)); $user = $sth->fetchrow_hashref(); } @@ -269,7 +269,7 @@ sub userprefs { # take the old password as default if($console->typ eq 'HTML') { if($value->[0] and $value->[0] ne $value->[1]) { - return undef, gettext("Field with 1st and 2nd password must be equal to confirm!"); + return undef, gettext("The fields with the 1st and the 2nd password must match!"); } else { return $value->[0]; } @@ -281,7 +281,7 @@ sub userprefs { }, 'UserPrefs' => { def => $user->{UserPrefs} || '', - msg => gettext("Personality preferences for this User: ModName::Param=value, "), + msg => gettext("Personal preferences for this user: ModName::Param=value, "), typ => 'string', check => sub{ my $value = shift || return; @@ -289,7 +289,7 @@ sub userprefs { my ($modname, $parameter, $value) = $pref =~ /(\S+)::(\S+)\=(.+)/sg; if(my $mod = main::getModule($modname)) { unless(exists $mod->{$parameter}) { - return undef, sprintf(gettext("The Parameter '%s' in Module '%s' doesn't exist!"),$parameter, $mod); + return undef, sprintf(gettext("The parameter '%s' in module '%s' does not exist!"),$parameter, $mod); } } } @@ -299,17 +299,17 @@ sub userprefs { ]; # Ask Questions - $data = $console->question(sprintf(gettext('Edit preferences of user: %s'), $obj->{USER}->{Name}), $questions, $data); + $data = $console->question(sprintf(gettext('Edit preferences: %s'), $obj->{USER}->{Name}), $questions, $data); if(ref $data eq 'HASH') { $obj->_insert($data); $obj->refreshUserSettings($data->{UserPrefs}, $user->{UserPrefs}); - $console->message(gettext('Account for user saved!')); + $console->message(gettext('User account saved!')); if($console->typ eq 'HTML') { $console->redirect({url => '?', parent => 'top', wait => 2}); - $console->message(gettext('Please wait ... refresh the interface!')); + $console->message(gettext('Please wait ... refreshing interface!')); } } return 1; @@ -322,7 +322,7 @@ sub userprefs { # Usage: my $ok = $obj->edit($watcher, $console, $id, [$data]); # ------------------ sub edit { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $id = shift || 0; @@ -332,7 +332,7 @@ sub edit { if($id and not ref $data) { my $sth = $obj->{dbh}->prepare('select * from USER where Id = ?'); $sth->execute($id) - or return $console->err(sprintf(gettext("Account for user with ID '%s' does not exist in the database!"),$id)); + or return $console->err(sprintf(gettext("User account '%s' does not exist in the database!"),$id)); $user = $sth->fetchrow_hashref(); # question erwartet ein Array @@ -352,7 +352,7 @@ sub edit { def => $user->{Id} || 0, }, 'Name' => { - msg => gettext("Name from this account"), + msg => gettext("Name of user account"), req => gettext('This is required!'), def => $user->{Name} || '', }, @@ -367,7 +367,7 @@ sub edit { # take the old password as default if($console->typ eq 'HTML') { if($value->[0] and $value->[0] ne $value->[1]) { - return undef, gettext("Field with 1st and 2nd password must be equal to confirm!"); + return undef, gettext("The fields with the 1st and the 2nd password must match!"); } else { return $value->[0]; } @@ -430,7 +430,7 @@ sub edit { my ($modname, $parameter, $value) = $pref =~ /(\S+)::(\S+)\=(.+)/sg; if(my $mod = main::getModule($modname)) { unless(exists $mod->{$parameter}) { - return undef, sprintf(gettext("The Parameter '%s' in Module '%s' doesn't exist!"),$parameter, $mod); + return undef, sprintf(gettext("The parameter '%s' in module '%s' does not exist!"),$parameter, $mod); } } } @@ -438,25 +438,25 @@ sub edit { }, }, 'MaxLifeTime' => { - msg => gettext("Maximally permitted value for lifetime on timers"), + msg => gettext("Maximum permitted value for lifetime with timers"), def => $user->{MaxLifeTime} || '0', type => 'integer', check => sub{ my $value = shift || return 0; unless(int($value) and int($value) > 0 and int($value) < 100) { - return undef, gettext("This value is not a integer or not between 0 and 100"); + return undef, gettext("This value is not an integer or not between 0 and 100"); } return $value; }, }, 'MaxPriority' => { - msg => gettext("Maximally permitted value for priority on timers"), + msg => gettext("Maximum permitted value for priority with timers"), def => $user->{MaxPriority} || '0', type => 'integer', check => sub{ my $value = shift || return 0; unless(int($value) and int($value) > 0 and int($value) < 100) { - return undef, gettext("This value is not a integer or not between 0 and 100"); + return undef, gettext("This value is not an integer or not between 0 and 100"); } return $value; }, @@ -464,8 +464,8 @@ sub edit { ]; # Ask Questions - $data = $console->question(($id ? gettext('Edit account of user') - : gettext('Create a new account for user')), $questions, $data); + $data = $console->question(($id ? gettext('Edit user account') + : gettext('Create new user account')), $questions, $data); if(ref $data eq 'HASH') { $obj->_insert($data); @@ -476,7 +476,7 @@ sub edit { ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) ); - $console->message(gettext('Account for user saved!')); + $console->message(gettext('User account saved!')); $console->redirect({url => $console->{browser}->{Referer}, wait => 2}) if($console->typ eq 'HTML'); } @@ -489,15 +489,15 @@ sub edit { # Usage: my $ok = $obj->delete($watcher, $console, $id); # ------------------ sub delete { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); - my $id = shift || return $console->err(gettext("No ID for Account of user to delete! Please use udelete 'uid'")); + my $id = shift || return $console->err(gettext("No user account defined to delete! Please use udelete 'uid'.")); my $sth = $obj->{dbh}->prepare('delete from USER where Id = ?'); $sth->execute($id) - or return $console->err(sprintf(gettext("Account for user with ID '%s' does not exist in the database!"),$id)); - $console->message(sprintf gettext("Account of user %s is deleted."), $id); + or return $console->err(sprintf(gettext("User account '%s' does not exist in the database!"),$id)); + $console->message(sprintf gettext("User account %s deleted."), $id); debug sprintf('Delete user account "%s"%s', $id, @@ -513,7 +513,7 @@ sub delete { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); @@ -550,7 +550,7 @@ from # Usage: my $ok = $obj->logout(); # ------------------ sub logout { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); lg sprintf('Logout called%s', $obj->{USER}->{Name} ? sprintf(" by user %s", $obj->{USER}->{Name}) : "" @@ -572,7 +572,7 @@ sub logout { # ------------------ sub _checkIp { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $handle = shift || return; my $ip = getip($handle); @@ -601,7 +601,7 @@ sub _checkIp { # Usage: my $userHash = $obj->check($handle); # ------------------ sub check { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $handle = shift || return; if($obj->_checkIp($handle)) { @@ -646,7 +646,7 @@ sub check { # ------------------ sub refreshUserSettings { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $newprefs = shift || ''; my $oldprefs = shift || ''; @@ -667,7 +667,7 @@ sub refreshUserSettings { # ------------------ sub setUserSettings { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $prefs = shift || return error ('No Settings??'); my $mode = shift || 'set'; @@ -690,7 +690,7 @@ sub setUserSettings { # ------------------ sub allowCommand { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $modCfg = shift || return error('No Moduleinformation'); my $cmdName = shift || return error('No Command name'); my $user = shift || return error('No User'); @@ -733,7 +733,7 @@ sub t_checkCommand { } # ------------------ sub checkCommand { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $console = shift || return error ('No Console' ); my $ucmd = shift || return error ('No Command' ); my $DontdumpViolation = shift || ''; @@ -759,7 +759,7 @@ sub checkCommand { $cmdname = $cmdName; # Check on active Modul if(exists $mods->{$modName}->{active} and $cfg->{$modCfg->{Name}}->{active} eq 'n') { - $err = sprintf(gettext("Sorry but the module %s is inactive! Switch this active in %s:Preferences:active = y"), + $err = sprintf(gettext("Sorry, but the module %s is inactive! Enable it with %s:Preferences:active = y"), $modCfg->{Name}, $modCfg->{Name}); $shorterr = 'noactive'; } @@ -767,7 +767,7 @@ sub checkCommand { if($obj->{active} eq 'y') { # Check Userlevel and Permissions unless($obj->allowCommand($modCfg, $cmdName, $console->{USER},$DontdumpViolation)) { - $err = gettext('You have no permissions on this command!'); + $err = gettext('You are not authorized for this function!'); $shorterr = 'noperm'; } } @@ -775,7 +775,7 @@ sub checkCommand { } } unless($ok) { - $err = sprintf(gettext("I don't understand the command '%s' \n"), $ucmd); + $err = sprintf(gettext("I do not understand the command '%s' \n"), $ucmd); $shorterr = 'noexists'; } @@ -796,7 +796,7 @@ sub t_checkCmdSyntax { } # ------------------ sub checkCmdSyntax { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $mods = main::getModules(); my $shorts = {}; @@ -826,7 +826,7 @@ sub t_getLevel { } # ------------------ sub getLevel { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return; # Level Table @@ -847,7 +847,7 @@ sub getLevel { # ------------------ sub _insert { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return; if(ref $data eq 'HASH') { @@ -900,7 +900,7 @@ sub _insert { # Usage: my $tmpdir = $obj->userTmp([username]); # ------------------ sub userTmp { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $user = ($obj->{active} eq 'y' ? ( shift || ($obj->{USER}->{Name}?$obj->{USER}->{Name}:"nobody") ) : "nobody" ); # /var/cache/xxv/temp/xpix/$PID diff --git a/lib/XXV/MODULES/VTX.pm b/lib/XXV/MODULES/VTX.pm index 6828126..fbf214a 100644 --- a/lib/XXV/MODULES/VTX.pm +++ b/lib/XXV/MODULES/VTX.pm @@ -9,7 +9,7 @@ use Locale::gettext; ################################################################################ # This module method must exist for XXV sub module { - my $self = shift || return error ('No Object!' ); + my $self = shift || return error('No object defined!'); my $args = { Name => 'VTX', Prereq => { diff --git a/lib/XXV/MODULES/WAPD.pm b/lib/XXV/MODULES/WAPD.pm index 3e139d5..95ca6bf 100644 --- a/lib/XXV/MODULES/WAPD.pm +++ b/lib/XXV/MODULES/WAPD.pm @@ -21,7 +21,7 @@ my $mime = { # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'WAPD', Prereq => { @@ -43,7 +43,7 @@ sub module { required => gettext('This is required!'), }, Clients => { - description => gettext('Maximum number from simultaneous connections to the same time'), + description => gettext('Maximum number of simultaneous connections'), default => 5, type => 'integer', required => gettext('This is required!'), @@ -61,14 +61,14 @@ sub module { required => gettext('This is required!'), }, WMLRoot => { - description => gettext('Used Skin'), + description => gettext('Skin used'), default => 'wml', type => 'list', required => gettext('This is required!'), choices => $obj->findskins, }, # StartPage => { -# description => gettext('First page, which is to be seen when logon'), +# description => gettext('Startup screen'), # default => 'now', # type => 'list', # required => gettext('This is required!'), @@ -127,7 +127,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); # globals my $channels; @@ -193,7 +193,7 @@ sub init { my $userMod = main::getModule('USER'); if(ref $userMod and $userMod->{active} eq 'y') { $console->{USER} = $userMod->check($handle, $data->{username}, $data->{password}); - $console->login(gettext('You have no permissions to this system!')) + $console->login(gettext('You are not authorized to use this system!')) unless(exists $console->{USER}->{Level}); } @@ -244,7 +244,7 @@ sub init { # ------------------ sub parseRequest { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $hdl = shift || return error ('No Handle!' ); my $logout = shift || 0; @@ -282,7 +282,7 @@ sub parseRequest { # ------------------ sub handleInput { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $watcher = shift || return error ('No Watcher!'); my $console = shift || return error ('No Console'); my $cgi = shift || return error ('No CGI Object'); @@ -326,7 +326,7 @@ sub handleInput { # ------------------ sub usage { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return main::getModule('TELNET')->usage(@_); } @@ -334,7 +334,7 @@ sub usage { sub findskins # ------------------ { - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $found; find({ wanted => sub{ if(-d $File::Find::name and -e $File::Find::name.'/wapd.tmpl' ) { diff --git a/lib/XXV/OUTPUT/Ajax.pm b/lib/XXV/OUTPUT/Ajax.pm index a3e96dc..772ca54 100644 --- a/lib/XXV/OUTPUT/Ajax.pm +++ b/lib/XXV/OUTPUT/Ajax.pm @@ -13,7 +13,7 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'Ajax', Prereq => { @@ -32,7 +32,7 @@ sub module { # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || {}; my $params = shift || 0; @@ -99,7 +99,7 @@ sub new { # ------------------ sub out { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || 0; my $para = shift || 0; my $name = shift || 'noName'; @@ -127,7 +127,7 @@ sub out { # ------------------ sub printout { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $nopack = shift || $obj->{nopack} || 0; @@ -153,7 +153,7 @@ sub printout { # ------------------ sub header { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $typ = shift || return error ('No Type!' ); my $arg = shift || {}; @@ -175,7 +175,7 @@ sub header { # ------------------ sub headerNoAuth { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $typ = shift || 'text/html'; $obj->{header} = 401; @@ -188,7 +188,7 @@ sub headerNoAuth { # ------------------ sub msg { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || 0; my $err = shift || 0; @@ -208,14 +208,14 @@ sub msg { # ------------------ sub typ { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{TYP}; } # ------------------ sub setCall { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return error ('No Name!' ); $obj->{call} = $name; @@ -225,7 +225,7 @@ sub setCall { # ------------------ sub browser { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{browser}; } diff --git a/lib/XXV/OUTPUT/Console.pm b/lib/XXV/OUTPUT/Console.pm index 0f59cc5..7d46545 100644 --- a/lib/XXV/OUTPUT/Console.pm +++ b/lib/XXV/OUTPUT/Console.pm @@ -17,7 +17,7 @@ use vars qw($AUTOLOAD); # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'Telnet', Prereq => { @@ -25,7 +25,7 @@ sub module { 'Text::ASCIITable' => 'Create a nice formatted table using ASCII characters.', 'Term::ReadLine::Perl' => 'a quick implementation of the minimal interface to Readline', }, - Description => gettext('This receive and send ASCII messages'), + Description => gettext('This receives and sends ASCII messages'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -37,14 +37,14 @@ sub module { # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || {}; my $params = shift || 0; my $name = (split('::', $AUTOLOAD))[-1]; return if($name eq 'DESTROY'); - $obj->message(gettext("Sorry, but this command is not available in this Interface!")); + $obj->message(gettext("Sorry, but this command is not available in this interface!")); } # ------------------ @@ -93,7 +93,7 @@ sub new { # ------------------ sub printout { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); $data =~ s/[^\r]\n/\r\n/sig; @@ -105,7 +105,7 @@ sub printout { # ------------------ sub message { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $t = Text::ASCIITable->new(); @@ -123,7 +123,7 @@ sub message { # ------------------ sub push { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); $obj->printout($data); @@ -131,7 +131,7 @@ sub push { # ------------------ sub msg { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $err = shift || return $obj->message($data); @@ -141,7 +141,7 @@ sub msg { # ------------------ sub err { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $t = Text::ASCIITable->new; @@ -159,13 +159,13 @@ sub err { # ------------------ sub menu { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $t = Text::ASCIITable->new; $t->setOptions( $obj->{TableDefaults} ); $t->setCols(gettext('Module'), - gettext('Short cut'), + gettext("Abbreviation"), gettext('Name'), gettext('Description')); @@ -183,11 +183,11 @@ sub menu { # ------------------ sub littlemenu { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $text = $data->{title}."\n"; - $text .= gettext("Please use command and one of the following sectors:\n"); + $text .= gettext("Please use the command and one of the following sectors:\n"); $text .= join(', ', sort keys %{$data->{links}}); $obj->message($text); @@ -196,7 +196,7 @@ sub littlemenu { # ------------------ sub login { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $questions = [ @@ -218,7 +218,7 @@ sub login { # ------------------ sub table { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); my $param = shift || {}; my $noPrint = shift || 0; @@ -279,7 +279,7 @@ sub table { # ------------------ sub question { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $title = shift || 0; my $questions = shift || return error ('No Data!' ); my $erg = shift || {}; @@ -302,16 +302,16 @@ sub question { # Check on directory if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name})); } # Check on file if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name})); } if($error) { - $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error)); + $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error)); last; } } @@ -339,7 +339,7 @@ sub question { # ------------------ sub list { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -389,7 +389,7 @@ sub list { # ------------------ sub string { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -430,35 +430,35 @@ sub string { # ------------------ sub file { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->string(@_); } # ------------------ sub dir { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->string(@_); } # ------------------ sub password { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->string(@_); } # ------------------ sub date { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->string(@_); } # ------------------ sub integer { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -495,7 +495,7 @@ sub integer { # ------------------ sub confirm { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -509,7 +509,7 @@ sub confirm { if($data->{def} and ! $answer); # Only yes or no ... - $error = gettext("Please answer with 'y'es or 'n'o: ") + $error = gettext("Please answer 'y'es or 'n'o: ") if($answer !~ /^[y|n]$/); # Required value ... @@ -533,7 +533,7 @@ sub confirm { # ------------------ sub hidden { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); return error('No <def> in hidden Variable!') @@ -544,16 +544,16 @@ sub hidden { # ------------------ sub image { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data to display'); - return $obj->message(gettext("Sorry, but i cannot display an image on this Interface.")); + return $obj->message(gettext("Sorry, cannot display images in this interface.")); } # ------------------ sub checkbox { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -586,7 +586,7 @@ sub checkbox { # ------------------ sub radio { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || return error ('No Data!' ); my $t = $obj->{term}; my $error; @@ -603,7 +603,7 @@ sub radio { if($data->{req} and not $answer); # only one of all ... - $error = sprintf(gettext("You can only use one of this items: %s"), join(',', @{$data->{choices}})) + $error = sprintf(gettext("You can only use one of these elements: %s"), join(',', @{$data->{choices}})) unless(grep( $answer eq $_, @{$data->{choices}})); @@ -624,7 +624,7 @@ sub radio { # ------------------ sub pod { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $modname = uc(shift) || return error ('No Modname!' ); $modname = ucfirst($modname) if($modname eq 'GENERAL'); @@ -651,7 +651,7 @@ sub pod { # ------------------ sub txtfile { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $filename = shift || return error ('No TxtFile to diplay!' ); my $param = shift || {}; @@ -668,7 +668,7 @@ sub txtfile { # ------------------ sub remote { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $text = qq! .-----------------------. @@ -699,7 +699,7 @@ sub remote { # ------------------ sub _myallowansi_cb { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $_ = shift; s/\33\[(\d+(;\d+)?)?[musfwhojBCDHRJK]//g; return length($_); @@ -708,7 +708,7 @@ sub _myallowansi_cb { # ------------------ sub _parseData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $fields = shift || return error ('No Fields!' ); my $data = shift || return error ('No Data!' ); diff --git a/lib/XXV/OUTPUT/Dump.pm b/lib/XXV/OUTPUT/Dump.pm index f82e86e..c7c4d35 100644 --- a/lib/XXV/OUTPUT/Dump.pm +++ b/lib/XXV/OUTPUT/Dump.pm @@ -9,12 +9,12 @@ use Tools; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'Dump', Prereq => { }, - Description => gettext('This receive and send Dump messages.'), + Description => gettext('This receives and sends dump messages.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -25,7 +25,7 @@ sub module { # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return if($AUTOLOAD =~ /DESTROY$/); dumper(\@_); @@ -56,7 +56,7 @@ sub new { # ------------------ sub typ { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{TYP}; } diff --git a/lib/XXV/OUTPUT/HTML/PUSH.pm b/lib/XXV/OUTPUT/HTML/PUSH.pm index 7c7d7df..79b05c7 100644 --- a/lib/XXV/OUTPUT/HTML/PUSH.pm +++ b/lib/XXV/OUTPUT/HTML/PUSH.pm @@ -49,7 +49,7 @@ sub new { # ------------------ sub start { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $out = shift || 0; $obj->{handle}->print($obj->{cgi}->multipart_init(-boundary=>'----here we go!')); $obj->print($out) if($out); @@ -58,7 +58,7 @@ sub start { # ------------------ sub print { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $msg = shift || return; my $type = shift || 'text/html'; @@ -70,7 +70,7 @@ sub print { # ------------------ sub follow_print { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $msg = shift || return; my $type = shift || 'text/html'; @@ -84,7 +84,7 @@ sub follow_print { # ------------------ sub stop { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{handle}->print($obj->{cgi}->multipart_end); $obj->{handle}->print($obj->{cgi}->header( -type => 'text/html', diff --git a/lib/XXV/OUTPUT/HTML/WAIT.pm b/lib/XXV/OUTPUT/HTML/WAIT.pm index 8ebd430..8987e38 100644 --- a/lib/XXV/OUTPUT/HTML/WAIT.pm +++ b/lib/XXV/OUTPUT/HTML/WAIT.pm @@ -75,7 +75,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{STEP} = 0; $obj->{pusher}->start(); @@ -85,7 +85,7 @@ sub init { # ------------------ sub next { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cur = shift || $obj->{MAX}; my $end = shift || 0; my $msg = shift || 0; @@ -130,7 +130,7 @@ sub next { # ------------------ sub end { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $msg = shift || 0; return $obj->next(undef, $obj->{MAX}, 1, $msg); @@ -140,28 +140,28 @@ sub end { # ------------------ sub endcallback { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{endcallback} = shift || return $obj->{endcallback}; } # ------------------ sub max { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{MAX} = shift || return $obj->{MAX}; } # ------------------ sub min { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{MIN} = shift || return $obj->{MIN}; } # ------------------ sub screen { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{SCREEN} = shift || return $obj->{SCREEN}; } diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm index af2c6c4..efd36c7 100644 --- a/lib/XXV/OUTPUT/Html.pm +++ b/lib/XXV/OUTPUT/Html.pm @@ -19,13 +19,13 @@ $SIG{CHLD} = 'IGNORE'; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'Html', Prereq => { 'HTML::TextToHTML' => 'convert plain text file to HTML. ', }, - Description => gettext('This receive and send HTML messages.'), + Description => gettext('This receives and sends HTML messages.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -37,7 +37,7 @@ sub module { # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || {}; my $params = shift || 0; @@ -131,9 +131,9 @@ sub new { # ------------------ sub parseTemplate { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $name = shift || return error ('No Name!' ); - my $data = shift || return error ('No Data!' ); + my $obj = shift || return error('No object defined!'); + my $name = shift || return error('No name defined!'); + my $data = shift || return error('No data defined!'); my $params = shift || {}; my $output; @@ -147,7 +147,7 @@ sub parseTemplate { # ------------------ sub index { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{nopack} = 1; $obj->{call} = 'index'; my $params = {}; @@ -159,10 +159,10 @@ sub index { # ------------------ sub parseTemplateFile { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $name = shift || return error ('No Name!' ); - my $data = shift || return error ('No Data!' ); - my $params = shift || return error ('No params!' ); + my $obj = shift || return error('No object defined!'); + my $name = shift || return error ('No name defined!' ); + my $data = shift || return error ('No data defined!' ); + my $params = shift || return error ('No paramters defined!' ); my $call = shift || 'nothing'; $obj->parseData($data) @@ -273,8 +273,8 @@ sub parseTemplateFile { version => sub{ return main::getVersion }, loadfile => sub{ return load_file(@_) }, writefile => sub{ - my $filename = shift || return error('No Filename to write'); - my $data = shift || return error('Nothing data to write'); + my $filename = shift || return error('No filename defined!'); + my $data = shift || return error('No data defined!'); my $dir = $u->userTmp; @@ -308,7 +308,7 @@ sub parseTemplateFile { # ------------------ sub out { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $text = shift || 'no Text for Output'; my $type = shift || 'text/html'; my %args = @_; @@ -325,7 +325,7 @@ sub out { # ------------------ sub printout { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $nopack = shift || $obj->{nopack} || 0; if($obj->{output} && $obj->{handle}) { @@ -347,24 +347,10 @@ sub printout { } # ------------------ -sub getType { -# ------------------ - my $obj = shift || return error ('No Object!' ); - my $typ = shift || 'text/html'; - - my $typefile = sprintf('%s/%s', $obj->{htmdir}, 'GENERICTYP'); - if(-e $typefile and -r $typefile) { - $typ = load_file($typefile); - $typ =~ s/[\r|\n]//sig; - } - return $typ; -} - -# ------------------ sub header { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $typ = $obj->getType(shift) || return error ('No Type!' ); + my $obj = shift || return error('No object defined!'); + my $typ = shift || 'text/html'; my $arg = shift || {}; $arg->{'Content-encoding'} = 'gzip' @@ -387,10 +373,11 @@ sub header { # ------------------ sub statusmsg { # ------------------ - my $obj = shift || return error ('No Object!'); - my $state = shift || return error ('No Status!'); + my $obj = shift || return error('No object defined!'); + my $state = shift || return error('No state defined!'); my $msg = shift; my $title = shift; + my $typ = shift || 'text/html'; unless(defined $obj->{header}) { $obj->{nopack} = 1; @@ -421,12 +408,11 @@ sub statusmsg { $arg->{'WWW-Authenticate'} = "Basic realm=\"xxvd\"" if($state == 401); - $arg->{'expires'} = "now" - if($state != 304); + $arg->{'expires'} = (($state != 304) || (defined $obj->{nocache} && $obj->{nocache})) ? "now" : "+7d"; $obj->{header} = $state; $obj->{output_header} = $obj->{cgi}->header( - -type => 'text/html', + -type => $typ, -status => $status, %{$arg}, ); @@ -445,7 +431,7 @@ sub statusmsg { # Send HTTP Status 401 (Authorization Required) sub login { # ------------------ - my $obj = shift || return error ('No Object!'); + my $obj = shift || return error('No object defined!'); my $msg = shift || ''; $obj->statusmsg(401,$msg,gettext("Authorization required")); @@ -455,7 +441,7 @@ sub login { # Send HTTP Status 403 (Access Forbidden) sub status403 { # ------------------ - my $obj = shift || return error ('No Object!'); + my $obj = shift || return error('No object defined!'); my $msg = shift || ''; $obj->statusmsg(403,$msg,gettext("Forbidden")); @@ -466,22 +452,22 @@ sub status403 { # Send HTTP Status 404 (File not found) sub status404 { # ------------------ - my $obj = shift || return error ('No Object!'); - my $file = shift || return error ('No File!'); + my $obj = shift || return error('No object defined!'); + my $file = shift || return error('No file defined!'); my $why = shift || ""; $file =~ s/$obj->{htmdir}\///g; # Don't post html root, avoid spy out - $obj->statusmsg(404,sprintf(gettext("Can't open file '%s' : %s"),$file,$why), + $obj->statusmsg(404,sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why), gettext("Not found")); } # ------------------ sub question { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $titel = shift || 'undef'; - my $questions = shift || return error ('No Data!' ); + my $questions = shift || return error ('No data defined!'); my $erg = shift || 0; my $q = $obj->{cgi}; @@ -507,12 +493,12 @@ sub question { # Check on directory if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name})); } # Check on file if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name})); } # Check on password (is not set the take the old password) @@ -521,7 +507,7 @@ sub question { } if($error) { - $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error)); + $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error)); last; } } @@ -558,7 +544,7 @@ sub question { # ------------------ sub wait { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $msg = shift || gettext("Please wait ..."); my $min = shift || 0; my $max = shift || 0; @@ -610,8 +596,8 @@ sub wait { # ------------------ sub datei { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $file = shift || return error ('No File!'); + my $obj = shift || return error('No object defined!'); + my $file = shift || return error('No file defined!'); my $typ = shift; my %args = (); @@ -624,12 +610,6 @@ sub datei { return $obj->status404($file,$!) if(!$blocks); - # header only if caching - $args{'ETag'} = sprintf('%x-%x-%x',$ino, $size, $mtime); - return $obj->statusmsg(304) - if($obj->{browser}->{'Match'} - && $args{'ETag'} eq $obj->{browser}->{'Match'}); - $typ = $obj->{mime}->{lc((split('\.', $file))[-1])} if(!$typ); $typ = "application/octet-stream" @@ -638,6 +618,12 @@ sub datei { $obj->{nopack} = 1 if($typ =~ /image\// || $typ =~ /video\//); + # header only if caching + $args{'ETag'} = sprintf('%x-%x-%x',$ino, $size, $mtime); + return $obj->statusmsg(304,undef,undef,$typ) + if($obj->{browser}->{'Match'} + && $args{'ETag'} eq $obj->{browser}->{'Match'}); + my(@MON)=qw/Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec/; my(@WDAY) = qw/Sun Mon Tue Wed Thu Fri Sat/; my($sec,$min,$hour,$mday,$mon,$year,$wday) = gmtime($mtime); @@ -684,7 +670,7 @@ sub datei { } while $r && $bytes > 0; close(FH); } else { - error sprintf("I can't open file '%s' : %s", $file,$!); + error sprintf("Could not open file '%s'! : %s", $file,$!); } $handle->close(); }; @@ -706,8 +692,8 @@ sub datei { # ------------------ sub image { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $file = shift || return error ('No File!'); + my $obj = shift || return error('No object defined!'); + my $file = shift || return error('No file defined!'); my $typ = shift; return $obj->datei($file,$typ); } @@ -715,8 +701,8 @@ sub image { # ------------------ sub pod { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $modname = uc(shift) || return error ('No Modname!' ); + my $obj = shift || return error('No object defined!'); + my $modname = uc(shift) || return error ('No modul defined!'); $modname = ucfirst($modname) if($modname eq 'GENERAL'); my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname); @@ -738,7 +724,7 @@ sub pod { my $html = load_file($outfile); $html = $1 if($html =~ /\<body.*?\>(.+?)\<\/body\>/si); $obj->link({ - text => gettext("Back to configuration screen"), + text => gettext("Back to configuration page."), url => $obj->{browser}->{Referer}, }); @@ -748,8 +734,8 @@ sub pod { # ------------------ sub txtfile { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $filename = shift || return error ('No TxtFile to display!' ); + my $obj = shift || return error('No object defined!'); + my $filename = shift || return error ('No file defined!'); my $param = shift || {}; my $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename); @@ -782,15 +768,15 @@ sub txtfile { # ------------------ sub typ { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{TYP}; } # ------------------ sub setCall { # ------------------ - my $obj = shift || return error ('No Object!' ); - my $name = shift || return error ('No Name!' ); + my $obj = shift || return error('No object defined!'); + my $name = shift || return error ('No name defined!'); $obj->{call} = $name; return $obj->{call}; @@ -799,7 +785,7 @@ sub setCall { # ------------------ sub browser { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{browser}; } @@ -807,7 +793,7 @@ sub browser { # ------------------ sub msg { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || 0; my $err = shift || 0; @@ -822,7 +808,7 @@ sub msg { # ------------------ sub parseData { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $dta = shift || return ''; if(ref $dta eq 'HASH') { diff --git a/lib/XXV/OUTPUT/NEWS/JABBER.pm b/lib/XXV/OUTPUT/NEWS/JABBER.pm index 7a6206e..18e5602 100644 --- a/lib/XXV/OUTPUT/NEWS/JABBER.pm +++ b/lib/XXV/OUTPUT/NEWS/JABBER.pm @@ -14,7 +14,7 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'NEWS::JABBER', Prereq => { @@ -77,7 +77,7 @@ Then you must receive a message in your running jabber client. }, }, level => { - description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'), + description => gettext('Minimum level of messages which can be displayed (1 ... 100)'), default => 1, type => 'integer', required => gettext('This is required!'), @@ -90,19 +90,19 @@ Then you must receive a message in your running jabber client. }, }, receiveUser => { - description => gettext('User to advise (as Jabberaccount to@jabber.server.org)'), + description => gettext('User to be notified (as Jabber account to@jabber.server.org)'), default => '', type => 'string', required => gettext('This is required!'), }, user => { - description => gettext('Jabberaccount to send message (from@jabber.server.org)'), + description => gettext('Jabber account to send message (from@jabber.server.org)'), default => '', type => 'string', required => gettext('This is required!'), }, passwd => { - description => gettext('Password from Jabberaccount'), + description => gettext('Password for Jabber account'), default => '', type => 'password', required => gettext('This is required!'), @@ -113,7 +113,7 @@ Then you must receive a message in your running jabber client. # If no password given the take the old password as default if($value->[0] and $value->[0] ne $value->[1]) { - return undef, gettext("Field with 1st and 2nd password must be equal to confirm!"); + return undef, gettext("The fields with the 1st and the 2nd password must match!"); } else { return $value->[0]; } @@ -167,7 +167,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port}); 1; @@ -176,7 +176,7 @@ sub init { # ------------------ sub jconnect { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $jcon = Net::XMPP::Client->new( debuglevel => 0, @@ -208,7 +208,7 @@ sub jconnect { # ------------------ sub jdisconnect { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $cnx = shift || 0; $cnx->Disconnect() @@ -221,7 +221,7 @@ sub jdisconnect { # ------------------ sub send { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No Vars!' ); return undef, lg('This function is deactivated!') @@ -244,7 +244,7 @@ sub send { # ------------------ sub read { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No News!' ); return $obj->send($vars); @@ -255,9 +255,9 @@ sub read { # ------------------ sub req { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); - return gettext('The Module NEWS::JABBER is not active!') + return gettext('The module NEWS::JABBER is not active!') if($obj->{active} ne 'y'); my $vars = { @@ -277,7 +277,7 @@ sub req { # ------------------ sub xmpp_check_result { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my ($txt,$res,$cnx)=@_; return error("Error '$txt': result undefined") diff --git a/lib/XXV/OUTPUT/NEWS/MAIL.pm b/lib/XXV/OUTPUT/NEWS/MAIL.pm index 93bd187..8ef872b 100644 --- a/lib/XXV/OUTPUT/NEWS/MAIL.pm +++ b/lib/XXV/OUTPUT/NEWS/MAIL.pm @@ -15,7 +15,7 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'NEWS::MAIL', Prereq => { @@ -41,7 +41,7 @@ sub module { }, }, level => { - description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'), + description => gettext('Minimum level of messages which can be displayed (1 ... 100)'), default => 1, type => 'integer', required => gettext('This is required!'), @@ -68,24 +68,24 @@ sub module { }, }, address => { - description => gettext('One or more mail addresses for sending the news'), + description => gettext('One or more mail addresses for sending the messages'), default => 'unknown@example.com, everybody@example.com', type => 'string', required => gettext('This is required!'), }, from_address => { - description => gettext('Mail address to senders describe.'), + description => gettext('Mail address to describe the sender.'), default => 'xxv@vdr.de', type => 'string', }, smtp => { - description => gettext('Hostname from SMTP mail server'), + description => gettext('SMTP mail server host name'), default => main::getModule('STATUS')->name, type => 'host', required => gettext('This is required!'), }, susr => { - description => gettext('Username for mail server access'), + description => gettext('User name for mail server access'), default => 'xxv', type => 'string', }, @@ -100,7 +100,7 @@ sub module { # If no password given the take the old password as default if($value->[0] and $value->[0] ne $value->[1]) { - return undef, gettext("Field with 1st and 2nd password must be equal to confirm!"); + return undef, gettext("The fields with the 1st and the 2nd password must match!"); } else { return $value->[0]; } @@ -172,7 +172,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{INITE} = 1; $obj->{LastReportTime} = time; @@ -194,7 +194,7 @@ sub init { # ------------------ sub send { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return error('This function is deactivated!') if($obj->{active} ne 'y'); @@ -230,7 +230,7 @@ sub send { # ------------------ sub parseHeader { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $output = ''; my $vars = { @@ -249,7 +249,7 @@ sub parseHeader { # ------------------ sub parseFooter { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $output = ''; @@ -270,7 +270,7 @@ sub parseFooter { # ------------------ sub read { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No News!' ); my $output = ''; @@ -290,16 +290,16 @@ sub read { # ------------------ sub req { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $test = shift || 0; - return gettext('The Module NEWS::Mail is not active!') + return gettext('The module NEWS::Mail is not active!') if($obj->{active} ne 'y'); my $content = ''; if($test) { $obj->send; - $content .= gettext('A mail with the following content is send to your Mailaccount!'); + $content .= gettext('A mail with the following content has been sent to your mail account!'); $content .= "\n\n"; } diff --git a/lib/XXV/OUTPUT/NEWS/RSS.pm b/lib/XXV/OUTPUT/NEWS/RSS.pm index 43178d4..129452b 100644 --- a/lib/XXV/OUTPUT/NEWS/RSS.pm +++ b/lib/XXV/OUTPUT/NEWS/RSS.pm @@ -14,13 +14,13 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'NEWS::RSS', Prereq => { 'XML::RSS' => 'SMTP Protocol module to connect and send emails', }, - Description => gettext('This NEWS module generate an RSS Newsfeed for your rss reader.'), + Description => gettext('This NEWS module generates an RSS news feed for your RSS reader.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -40,7 +40,7 @@ sub module { }, }, level => { - description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'), + description => gettext('Minimum level of messages which can be displayed (1 ... 100)'), default => 1, type => 'integer', required => gettext('This is required!'), @@ -102,7 +102,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); $obj->{INITE} = 1; 1; @@ -111,7 +111,7 @@ sub init { # ------------------ sub createRSS { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $ver = shift || 1; my $account = sprintf("%s@%s", $ENV{USER}, main::getModule('STATUS')->name); my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port}); @@ -126,10 +126,10 @@ sub createRSS { $rss->channel( title => gettext("XXV RSS 1.0"), 'link' => $url, - description => gettext("Important messages from your vdr/xxv"), + description => gettext("Important messages from your VDR/XXV"), dc => { date => datum(time,'int'), - subject => gettext("XXV Messages"), + subject => gettext("XXV messages"), creator => $account, language => setlocale(POSIX::LC_MESSAGES), }, @@ -150,7 +150,7 @@ sub createRSS { $rss->channel( title => gettext("XXV RSS 2.0"), 'link' => $url, - description => gettext("Important messages from your vdr/xxv"), + description => gettext("Important messages from your VDR/XXV"), language => setlocale(POSIX::LC_MESSAGES), pubDate => datum(time, 'rss'), lastBuildDate => datum($lastbuild, 'rss'), @@ -166,7 +166,7 @@ sub createRSS { # ------------------ sub send { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No Vars!' ); ++$obj->{COUNT}; @@ -186,7 +186,7 @@ sub send { # ------------------ sub read { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No News!' ); return undef, lg('This function is deactivated!') @@ -205,10 +205,10 @@ sub read { # ------------------ sub req { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $params = shift || {}; - return gettext('The Module NEWS::RSS is not active!') + return gettext('The module NEWS::RSS is not active!') if($obj->{active} ne 'y'); my $rss = $obj->createRSS($params->{version}) diff --git a/lib/XXV/OUTPUT/NEWS/VDR.pm b/lib/XXV/OUTPUT/NEWS/VDR.pm index 9568e15..38ad12a 100644 --- a/lib/XXV/OUTPUT/NEWS/VDR.pm +++ b/lib/XXV/OUTPUT/NEWS/VDR.pm @@ -14,10 +14,10 @@ use Locale::gettext; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'NEWS::VDR', - Description => gettext('This NEWS module generate a messages for vdr interface.'), + Description => gettext('This NEWS module generates messages for the VDR interface.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -37,7 +37,7 @@ sub module { }, }, level => { - description => gettext('Minimum level of the messages which can be displayed (1 ... 100)'), + description => gettext('Minimum level of messages which can be displayed (1 ... 100)'), default => 1, type => 'integer', required => gettext('This is required!'), @@ -97,7 +97,7 @@ sub new { # ------------------ sub init { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port}); $obj->{INITE} = 1; @@ -109,7 +109,7 @@ sub init { # ------------------ sub send { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No Vars!' ); return undef, lg('This function is deactivated!') @@ -130,7 +130,7 @@ sub send { # ------------------ sub read { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $vars = shift || return error ('No News!' ); return $obj->send($vars); @@ -141,10 +141,10 @@ sub read { # ------------------ sub req { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $test = shift || 0; - return gettext('The Module NEWS::VDR is not active!') + return gettext('The module NEWS::VDR is not active!') if($obj->{active} ne 'y'); my $vars = { @@ -158,7 +158,7 @@ sub req { }; $obj->read($vars); - return gettext('A message is send to your SVDRPServer!'); + return gettext('A message has been sent to your VDR!'); } diff --git a/lib/XXV/OUTPUT/Wml.pm b/lib/XXV/OUTPUT/Wml.pm index f3bda9f..2d2ff59 100644 --- a/lib/XXV/OUTPUT/Wml.pm +++ b/lib/XXV/OUTPUT/Wml.pm @@ -12,13 +12,13 @@ use Pod::Html; # ------------------ sub module { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $args = { Name => 'Wml', Prereq => { 'Template' => 'Front-end module to the Template Toolkit ', }, - Description => gettext('This receive and send Wap messages.'), + Description => gettext('This receives and sends WAP messages.'), Version => (split(/ /, '$Revision$'))[1], Date => (split(/ /, '$Date$'))[1], Author => 'xpix', @@ -30,7 +30,7 @@ sub module { # ------------------ sub AUTOLOAD { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || {}; my $params = shift || 0; @@ -106,7 +106,7 @@ sub new { # ------------------ sub parseTemplate { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return error ('No Name!' ); my $data = shift || return error ('No Data!' ); my $params = shift || {}; @@ -175,7 +175,7 @@ sub parseTemplate { # ------------------ sub out { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $text = shift || 'no Text for Output'; my $type = shift || 'text/vnd.wap.wml'; my %args = @_; @@ -194,7 +194,7 @@ sub out { # ------------------ sub header { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $typ = shift || return error ('No Type!' ); my $arg = shift || {}; @@ -264,13 +264,13 @@ sub status404 { $file =~ s/$obj->{wmldir}\///g; # Don't post wml root, avoid spy out - $obj->statusmsg(sprintf(gettext("Can't open file '%s' : %s"),$file,$why),"404 File not found"); + $obj->statusmsg(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why),"404 File not found"); } # ------------------ sub question { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $titel = shift || 'undef'; my $questions = shift || return error ('No Data!' ); my $erg = shift || 0; @@ -294,16 +294,16 @@ sub question { # Check on directory if($data->{typ} eq 'dir' and $data->{required} and not -d $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("Directory '%s' does not exist!"), $erg->{$name})); } # Check on file if($data->{typ} eq 'file' and $data->{required} and not -e $erg->{$name}) { - ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' is doesn't exist!"), $erg->{$name})); + ($erg->{$name}, $error) = (undef, sprintf(gettext("File '%s' does not exist!"), $erg->{$name})); } if($error) { - $obj->err(sprintf(gettext("Error at field '%s' (%s) : %s"), $data->{msg}, $name, $error)); + $obj->err(sprintf(gettext("Error '%s' (%s) : %s!"), $data->{msg}, $name, $error)); last; } } @@ -337,7 +337,7 @@ sub question { # ------------------ sub image { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $file = shift || return error ('No File!' ); my $typ = shift || $obj->{mime}->{lc((split('\.', $file))[-1])} or return error("No Type in Mimehash or File: $file"); @@ -351,7 +351,7 @@ sub image { # ------------------ sub datei { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $file = shift || return error ('No File!' ); my $data = load_file($file) @@ -363,7 +363,7 @@ sub datei { # ------------------ sub pod { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $modname = shift || return error ('No Modname!' ); $modname = ucfirst($modname) if($modname eq 'GENERAL'); @@ -382,7 +382,7 @@ sub pod { my $html = load_file($outfile); $html = $1 if($html =~ /\<body.*?\>(.+?)\<\/body\>/si); $obj->link({ - text => gettext("Back to configuration screen"), + text => gettext("Back to configuration page."), url => $obj->{browser}->{Referer}, }); $obj->message($html); @@ -391,14 +391,14 @@ sub pod { # ------------------ sub typ { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{TYP}; } # ------------------ sub setCall { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $name = shift || return error ('No Name!' ); $obj->{call} = $name; @@ -408,7 +408,7 @@ sub setCall { # ------------------ sub browser { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); return $obj->{browser}; } @@ -416,7 +416,7 @@ sub browser { # ------------------ sub msg { # ------------------ - my $obj = shift || return error ('No Object!' ); + my $obj = shift || return error('No object defined!'); my $data = shift || {}; my $err = shift; |