diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-09-15 12:44:26 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-09-15 12:44:26 +0000 |
| commit | d37dd0897cb0968eea008e9700ded68d15a7fd93 (patch) | |
| tree | 3fe2e0212710ffe453d838aa9237c385cc0d7e0e /lib | |
| parent | b3afe1bf2625101e8db9400d15f272c2e454b1b5 (diff) | |
| download | xxv-d37dd0897cb0968eea008e9700ded68d15a7fd93.tar.gz xxv-d37dd0897cb0968eea008e9700ded68d15a7fd93.tar.bz2 | |
* RECORDS: generation of previews if recording name contain some special character
CHANNELS: Store full frequency
Fix some typo
Diffstat (limited to 'lib')
35 files changed, 679 insertions, 666 deletions
diff --git a/lib/Tools.pm b/lib/Tools.pm index 30998d7..1e55df2 100644 --- a/lib/Tools.pm +++ b/lib/Tools.pm @@ -213,8 +213,8 @@ sub dumper { # ------------------ sub fields { # ------------------ - my $dbh = shift || return error ('No DBH!' ); - my $str = shift || return error ('No SQL!'); + my $dbh = shift || return error('No database handle defined!'); + my $str = shift || return error('No sql query defined!'); $str =~ s/order\s+by.+//sig; my $sql = sprintf('%s %s 0 = 1', $str, ($str =~ /where/i ? 'AND' : 'WHERE')); @@ -227,8 +227,8 @@ sub fields { # ------------------ sub tableExists { # ------------------ - my $dbh = shift || return error ('No DBH!' ); - my $name = shift || return error ('No Table!'); + my $dbh = shift || return error('No database handle defined!'); + my $name = shift || return error('No table defined!'); my $erg = $dbh->selectall_arrayref('show tables'); for(@$erg) { @@ -240,9 +240,9 @@ sub tableExists { # ------------------ sub tableUpdated { # ------------------ - my $dbh = shift || return error ('No DBH!'); - my $table = shift || return error ('No Table!'); - my $rows = shift || return error ('No Rows!'); + my $dbh = shift || return error('No database handle defined!'); + my $table = shift || return error('No table defined!'); + my $rows = shift || return error('No rows defined!'); my $drop = shift || 0; # remove old Version, if updated
@@ -252,7 +252,7 @@ sub tableUpdated { if($drop) { lg sprintf('Remove old version from database table %s',$table);
$dbh->do(sprintf('drop table %s',$table)) - or return panic sprintf("Can't drop table %s - %s",$table, $DBI::errstr); + or return panic sprintf("Couldn't drop table %s - %s",$table, $DBI::errstr); } else { panic sprintf( q|------- !PROBLEM! ---------- @@ -274,14 +274,14 @@ or use the script contrib/upgrade-xxv.sh to upgrade the database! #-------------------------------------------------------- sub load_file { #-------------------------------------------------------- - my $file = shift || die "Kein File bei Loader $!"; + my $file = shift || return error('No file defined!'); lg sprintf('Load file "%s"', $file, ); my $fh = IO::File->new("< $file") - or return error(sprintf("Can't open %s : %s!",$file,$!)); + or return error(sprintf("Couldn't open %s : %s!",$file,$!)); my $data; while ( defined (my $l = <$fh>) ) { $data .= $l; @@ -304,7 +304,7 @@ sub save_file { ); my $fhi = new IO::File("> $file") - or return error(sprintf("Can't write %s : %s!",$file,$!)); + or return error(sprintf("Couldn't write %s : %s!",$file,$!)); print $fhi $data; $fhi->close; @@ -416,7 +416,7 @@ sub deleteDir { # ------------------ sub getip { # ------------------ - my $handle = shift || return error ('No Handle!' ); + my $handle = shift || return error('No handle defined!'); my $p = getpeername($handle) or return; my($port, $iaddr) = unpack_sockaddr_in($p); @@ -431,17 +431,17 @@ sub getip { # Usage: my $hash = $obj->getDataByTable('TABLE', ['ID']); # ------------------ sub getDataByTable { - my $table = shift || return error ('No Table!' ); + my $table = shift || return error('No table defined!'); my $key = shift; unless($key) { my $erg = &fields($DBH, 'select * from '.$table) - or return error sprintf("Can't execute query: %s.",$DBI::errstr); + or return error sprintf("Couldn't execute query: %s.",$DBI::errstr); $key = $erg->[0]; } my $sth = $DBH->prepare(sprintf('select * from %s',$table)); $sth->execute() - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); return $sth->fetchall_hashref($key); } @@ -452,30 +452,30 @@ sub getDataByTable { # Usage: my $hashrow = $obj->getDataById(123, 'TABLE', ['ID']); # ------------------ sub getDataById { - my $id = shift || return error ('No Object!' ); - my $table = shift || return error ('No Table!' ); + my $id = shift || return error('No id defined!'); + my $table = shift || return error('No table defined!'); my $key = shift || &fields($DBH, 'select * from '.$table)->[0]; my $sth = $DBH->prepare(sprintf('select * from %s where %s = ?',$table, $key)); $sth->execute($id) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); return $sth->fetchrow_hashref(); } # ------------------ # Name: getDataBySearch # Descr: universal routine to get data by search from table -# Usage: my $arref = $obj->getDataBySearch('TABLE', 'ID = 123'); +# Usage: my $arref = $obj->getDataBySearch('TABLE', 'ID = ?', 'ID'); # ------------------ sub getDataBySearch { - my $table = shift || return error ('No Table!' ); - my $search = shift || return error ('No Searchtxt!' ); + my $table = shift || return error('No table defined!'); + my $search = shift || return error('No sql query defined!'); + my $data = shift || return error('No sql data defined!'); - my $sql = sprintf('select * from %s where %s', - $table, $search); - - my $erg = $DBH->selectall_arrayref($sql); - return $erg; + my $sth = $DBH->prepare(sprintf('select * from %s where %s',$table, $search)); + $sth->execute($data) + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); + return $sth->fetchall_arrayref(); } # ------------------ @@ -484,7 +484,7 @@ sub getDataBySearch { # Usage: my $arref = $obj->getDataBySearch('TABLE', 'ID', ['WHERE']); # ------------------ sub getDataByFields { - my $table = shift || return error ('No Table!' ); + my $table = shift || return error('No table defined!'); my $field = shift || '*'; my $where = shift || ''; diff --git a/lib/XXV/MODULES/AUTOTIMER.pm b/lib/XXV/MODULES/AUTOTIMER.pm index 2aa3171..200095f 100644 --- a/lib/XXV/MODULES/AUTOTIMER.pm +++ b/lib/XXV/MODULES/AUTOTIMER.pm @@ -192,7 +192,7 @@ ORDER BY my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($lastReportTime) - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; my $erg = $sth->fetchall_arrayref(); for(@$erg) { $_->[6] = fmttime($_->[6]); @@ -230,7 +230,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle @@ -316,11 +316,11 @@ sub autotimer { if($autotimerid) { $sth = $obj->{dbh}->prepare('select * from AUTOTIMER where Activ = "y" AND Id = ? order by Id'); $sth->execute($autotimerid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { $sth = $obj->{dbh}->prepare('select * from AUTOTIMER where Activ = "y" order by Id'); $sth->execute() - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } my $att = $sth->fetchall_hashref('Id'); @@ -387,7 +387,7 @@ sub autotimer { } my $nexttime = $timermod->getNextTime( $events->{$Id}->{Day} , $events->{$Id}->{Start},$events->{$Id}->{Stop} ) - or error(sprintf("Can't get the nexttime for this autotimer: %d", $events->{$Id}->{eventid})); + or error(sprintf("Couldn't get next time for this autotimer: %d", $events->{$Id}->{eventid})); # Add anchor for reidentify timer my $aidcomment = sprintf('#~AT[%d]', $id); @@ -503,8 +503,8 @@ sub autotimer { # ------------------ sub autotimerCreate { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $timerid = shift || 0; my $data = shift || 0; @@ -518,8 +518,8 @@ sub autotimerCreate { # ------------------ sub autotimerEdit { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $timerid = shift || 0; my $data = shift || 0; @@ -882,16 +882,16 @@ You can also fine tune your search : # ------------------ sub autotimerDelete { 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 autotimer defined to delete! Please use adelete 'aid'!")); # If timerid the edittimer + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $timerid = shift || return $console->err(gettext("No autotimer defined for deletion! Please use adelete 'aid'!")); # If timerid the edittimer my @timers = reverse sort{ $a <=> $b } split(/[^0-9]/, $timerid); my $sql = sprintf('DELETE FROM AUTOTIMER where Id in (%s)', join(',' => ('?') x @timers)); my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@timers)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); $console->err(sprintf gettext("The autotimer '%s' does not exist in the database."), join(',', @timers)); return 0; } @@ -912,8 +912,8 @@ sub autotimerDelete { # ------------------ sub autotimerToggle { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); 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); @@ -921,7 +921,7 @@ sub autotimerToggle { my $sql = sprintf('SELECT Id,Activ FROM AUTOTIMER where Id in (%s)', join(',' => ('?') x @timers)); my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@timers)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); $console->err(sprintf(gettext("The autotimer '%s' does not exist in the database."),$timerid)); return 0; } @@ -940,12 +940,12 @@ sub autotimerToggle { my $sql = "UPDATE AUTOTIMER set Activ = ? where Id = ?"; my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute($status,$timer)) { - error sprintf("Can't execute query: %s.",$sth->errstr); - $console->err(sprintf(gettext("Can't toggle autotimer with ID '%s'!"),$timer)); + error sprintf("Couldn't execute query: %s.",$sth->errstr); + $console->err(sprintf(gettext("Couldn't toggle autotimer with ID '%s'!"),$timer)); next; } - debug sprintf('autotimer with id "%s" is %s%s', + debug sprintf('Autotimer with id "%s" is %s%s', $timer, ($status eq 'n' ? 'disabled' : 'activated'), ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) @@ -979,8 +979,8 @@ sub autotimerToggle { # ------------------ sub list { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || ''; my $params = shift; @@ -1050,8 +1050,8 @@ sub list { sub _eventsearch { # ------------------ 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!"); + my $a = shift || return error('No data defined!'); + my $timermod = shift || main::getModule('TIMERS') || return error ("Couldn't access modul TIMERS!"); # Searchstrings to Paragraphs Changed $a->{Search} =~ s/\:/\:\.\*/ @@ -1140,7 +1140,7 @@ WHERE sub _timerexists { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventdata = shift || return error ('No Data from Autotimer!' ); + my $eventdata = shift || return error('No data defined!'); my ($nexttime, $aidcomment) = @_; # Avoid Timer already defined (the timer with the same data again do not put on) @@ -1160,7 +1160,7 @@ sub _timerexists { $sth->execute($eventdata->{ChannelID},$nexttime->{start},$nexttime->{stop}, $eventdata->{Priority},$eventdata->{Lifetime}, $eventdata->{File},$eventdata->{Summary},"%".$aidcomment) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg->{cc} if($erg); @@ -1172,7 +1172,7 @@ sub _timerexists { sub _timerexistsfuzzy { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventdata = shift || return error ('No Data from Autotimer!' ); + my $eventdata = shift || return error('No data defined!'); my ($nexttime, $aidcomment) = @_; # Adjust timers set by the autotimer @@ -1187,7 +1187,7 @@ sub _timerexistsfuzzy { my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eventdata->{ChannelID},$nexttime->{start},$nexttime->{stop}, "%".$aidcomment) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg->{ID} if($erg); @@ -1198,7 +1198,7 @@ sub _timerexistsfuzzy { sub _recordexists { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventdata = shift || return error ('No Data from Autotimer!' ); + my $eventdata = shift || return error('No data defined!'); my ($nexttime, $aidcomment) = @_; # Ignore timer if it already with same title recorded @@ -1209,7 +1209,7 @@ sub _recordexists { my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eventdata->{File}) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg->{cc} if($erg); @@ -1220,17 +1220,17 @@ sub _recordexists { sub _chronicleexists { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventdata = shift || return error ('No Data from Autotimer!' ); + my $eventdata = shift || return error('No data defined!'); my ($nexttime, $aidcomment) = @_; - my $chroniclemod = main::getModule('CHRONICLE') || return error ("Can't access modul CHRONICLE!"); + my $chroniclemod = main::getModule('CHRONICLE') || return error ("Couldn't access modul CHRONICLE!"); return 0 if(not $chroniclemod or $chroniclemod->{active} ne 'y'); my $sql = "select count(*) as cc from CHRONICLE where title = ?"; my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eventdata->{File}) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg->{cc} if($erg); @@ -1241,14 +1241,14 @@ sub _chronicleexists { sub _timerexiststitle { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventdata = shift || return error ('No Data from Autotimer!' ); + my $eventdata = shift || return error('No data defined!'); my ($nexttime, $aidcomment) = @_; my $sql = "select count(*) as cc from TIMERS where File = ?"; my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eventdata->{File}) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg->{cc} if($erg); @@ -1289,8 +1289,8 @@ sub _insert { # ------------------ sub _placeholder { my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); - my $at = shift || return error ('No AtData!' ); + my $data = shift || return error('No data defined!'); + my $at = shift || return error('No attribute defined!'); my $file; @@ -1330,10 +1330,11 @@ sub _placeholder { } # ------------------ -sub suggest {# ------------------ +sub suggest { +# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $params = shift; @@ -1353,7 +1354,7 @@ sub suggest {# ------------------ |; my $sth = $obj->{dbh}->prepare($sql); $sth->execute('%'.$search.'%') - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; my $result = $sth->fetchall_arrayref(); $console->table($result) if(ref $console && $result); diff --git a/lib/XXV/MODULES/CHANNELS.pm b/lib/XXV/MODULES/CHANNELS.pm index 5adeaa6..6337231 100644 --- a/lib/XXV/MODULES/CHANNELS.pm +++ b/lib/XXV/MODULES/CHANNELS.pm @@ -161,7 +161,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle @@ -233,13 +233,13 @@ sub _init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } my $erg = $obj->readData(); return 1; - }, "CHANNELS: Read and register Channels ...", 5); + }, "CHANNELS: Read and register channels ...", 5); return 1; } @@ -289,10 +289,12 @@ sub insert { $data->[0] = $ch if($ch); } + # ID + my $freqID = $data->[1]; if ( $data->[3] eq 'C' or $data->[3] eq 'T') { - while(length($data->[1]) > 3) { - $data->[1] = substr($data->[1], 0, length($data->[1])-3); + while(length($freqID) > 3) { + $freqID = substr($freqID, 0, length($freqID)-3); } } @@ -302,9 +304,9 @@ sub insert { # By DVB-C gabs Probleme weil die Zahl grösser 100 war # Siehe auch http://www.vdr-portal.de/board/thread.php?sid=&postid=364373 if($data->[12] && $data->[12] > 0) { - $id = sprintf('%s-%u-%u-%u-%u', $data->[3], $data->[10], ($data->[10] || $data->[11]) ? $data->[11] : $data->[1], $data->[9],$data->[12]); + $id = sprintf('%s-%u-%u-%u-%u', $data->[3], $data->[10], ($data->[10] || $data->[11]) ? $data->[11] : $freqID, $data->[9],$data->[12]); } else { - $id = sprintf('%s-%u-%u-%u', $data->[3], $data->[10], ($data->[10] || $data->[11]) ? $data->[11] : $data->[1], $data->[9]); + $id = sprintf('%s-%u-%u-%u', $data->[3], $data->[10], ($data->[10] || $data->[11]) ? $data->[11] : $freqID, $data->[9]); } unshift(@$data, $id); @@ -316,7 +318,7 @@ sub insert { my $sth = $obj->{dbh}->prepare('REPLACE INTO CHANNELS VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)'); $sth->execute( @$data ); - lg sprintf('Add new Channel "%s" with Id "%s" in ChannelsDB!', $data->[1], $id); + lg sprintf('Add new channel "%s" with id "%s".', $data->[1], $id); return 1; } @@ -327,10 +329,10 @@ sub insertGrp { my $pos = shift || return; my $name = shift || 0; - lg sprintf('Add new ChannelGroup "%s" in ChannelsGroup!', $name); + lg sprintf('Add new group of channels "%s".', $name); my $sth = $obj->{dbh}->prepare('INSERT INTO CHANNELGROUPS SET Name=?, Counter=?'); $sth->execute($name, $pos) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); return $sth->{mysql_insertid}; } @@ -342,7 +344,7 @@ sub readData { my $console = shift; my $file = $obj->{file} || return 1, error ('No Channels File'); - return 1, panic ('No Channels File found') if( ! -e $file); + return 1, panic ("Couldn't find channels.conf as file $file!") if( ! -e $file); # only if file modification from last read time my $mtime = (stat($file)->mtime); @@ -352,7 +354,7 @@ sub readData { $obj->{dbh}->do('DELETE FROM CHANNELS'); $obj->{dbh}->do('DELETE FROM CHANNELGROUPS'); - my $fh = IO::File->new("< $file") or return error("Can't open File $file $! "); + my $fh = IO::File->new("< $file") or return error("Couldn't open file $file $!"); my $c = 0; my $nPos = 1; my $grp = 0; @@ -424,8 +426,8 @@ sub is_numeric { defined getnum($_[0]) } sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || ''; my $params = shift; @@ -453,7 +455,7 @@ where my $sth = $obj->{dbh}->prepare($sql); $sth->execute('%'.$id.'%') - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); @@ -469,7 +471,7 @@ sub NameToChannel { my $sth = $obj->{dbh}->prepare('select Id from CHANNELS where UPPER(Name) = UPPER( ? )'); $sth->execute($name) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{Id} : undef; } @@ -482,7 +484,7 @@ sub PosToName { my $sth = $obj->{dbh}->prepare('select Name from CHANNELS where POS = ?'); $sth->execute($pos) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{Name} : undef; } @@ -495,7 +497,7 @@ sub PosToChannel { my $sth = $obj->{dbh}->prepare('select Id from CHANNELS where POS = ?'); $sth->execute($pos) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{Id} : undef; } @@ -560,7 +562,7 @@ sub ChannelToName { my $sth = $obj->{dbh}->prepare('select Name from CHANNELS where Id = ?'); $sth->execute($id) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{Name} : undef; } @@ -573,7 +575,7 @@ sub ChannelToPos { my $sth = $obj->{dbh}->prepare('select POS from CHANNELS where Id = ?'); $sth->execute($id) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{POS} : undef; } @@ -597,7 +599,7 @@ sub getChannelType { } } } - error("Unknown channel! Can't identify type of channel with id: %s", $id); + error("Unknown channel! Couldn't identify type of channel with id: %s", $id); return 'UNKNOWN'; } @@ -614,8 +616,8 @@ sub _LastChannel { sub newChannel { # ------------------ my $self = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $defaultData = shift || 0; @@ -626,8 +628,8 @@ sub newChannel { sub editChannel { # ------------------ my $self = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $cid = shift || 0; # If channelid then edit channel my $data = shift || 0; # Data for defaults @@ -882,7 +884,7 @@ sub editChannel { sub saveChannel { # ------------------ my $self = shift || return error('No object defined!'); - my $data = shift || return error('No Data to Save!'); + my $data = shift || return error('No data defined!'); my $pos = shift || 0; my $erg; @@ -934,7 +936,7 @@ sub deleteChannel { my $sql = sprintf('select Id,POS,Name from CHANNELS where POS in (%s)', join(',' => ('?') x @channels)); my $sth = $self->{dbh}->prepare($sql); $sth->execute(@channels) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $data = $sth->fetchall_hashref('POS'); foreach my $pos (@channels) { @@ -988,7 +990,7 @@ sub _brandNewChannels { my $sql = 'select * from CHANNELS where POS > ?'; my $sth = $obj->{dbh}->prepare($sql); $sth->execute($oldmaximumpos) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_hashref('POS'); my $text; diff --git a/lib/XXV/MODULES/CHRONICLE.pm b/lib/XXV/MODULES/CHRONICLE.pm index b5fb209..2ac4e8f 100644 --- a/lib/XXV/MODULES/CHRONICLE.pm +++ b/lib/XXV/MODULES/CHRONICLE.pm @@ -74,14 +74,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -153,8 +153,8 @@ INSERT IGNORE INTO CHRONICLE sub list { # ------------------ my $self = shift; - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my %f = ( 'id' => umlaute(gettext('Service')), @@ -189,8 +189,8 @@ ORDER BY CHRONICLE.starttime sub search { # ------------------ my $self = shift; - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $quest = shift || return $console->err(gettext("No 'string' to search for! Please use chrsearch 'text'.")); $quest =~ s/\'/\./sg; @@ -221,7 +221,7 @@ ORDER BY CHRONICLE.starttime my $fields = fields($self->{dbh}, $sql); my $sth = $self->{dbh}->prepare($sql); $sth->execute($quest) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); $console->table($erg); @@ -233,8 +233,8 @@ ORDER BY CHRONICLE.starttime sub delete { # ------------------ my $self = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $items = shift || return $console->err(gettext("No ID to delete! Please use chrdelete 'id'")); my @ids = reverse sort{ $a <=> $b } split(/[^0-9]/, $items); @@ -242,7 +242,7 @@ sub delete { my $sql = sprintf('DELETE FROM CHRONICLE WHERE id in (%s)', join(',' => ('?') x @ids)); my $sth = $self->{dbh}->prepare($sql); $sth->execute(@ids) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); return 1; } diff --git a/lib/XXV/MODULES/CONFIG.pm b/lib/XXV/MODULES/CONFIG.pm index f7f48b6..3a59e4f 100644 --- a/lib/XXV/MODULES/CONFIG.pm +++ b/lib/XXV/MODULES/CONFIG.pm @@ -42,6 +42,24 @@ sub module { short => 'cr', callback => sub{ $obj->reconfigure(@_) }, }, + help => { + description => gettext("This will display all commands or description of module 'name'."), + short => 'h', + callback => sub{ + return $obj->usage(@_); + }, + }, + reload => { + description => gettext("Restart all modules."), + short => 'rel', + callback => sub{ + my ($w, $c, $l) = @_; + $Module::Reload::Debug = 2; + Module::Reload->check; + $c->message(gettext("Modules loaded.")); + }, + Level => 'admin' + }, }, }; return $args; @@ -63,7 +81,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the Configdata @@ -76,8 +94,8 @@ sub new { sub menu { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $sector = shift || 0; my $ret = {}; @@ -110,8 +128,8 @@ sub menu { sub edit { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $sector = shift || 0; my $data = shift || 0; @@ -180,7 +198,7 @@ sub write { my $configfile = main::getUsrConfigFile; $obj->{config}->write( $configfile ) - or return error( sprintf ("Can't written '%s': %s", $configfile , $! )); + or return error( sprintf ("Couldn't write '%s': %s", $configfile , $! )); $console->message(sprintf gettext("Configuration written to '%s'."), $configfile) if(ref $console); @@ -249,7 +267,7 @@ sub reconfigure { } } else { - $console->err(sprintf(gettext("Cannot find %s in %s!"), $parameter, $moduleName)) + $console->err(sprintf(gettext("Couldn't find %s in %s!"), $parameter, $moduleName)) if(ref $console); } } @@ -280,5 +298,58 @@ sub realModNames { return sort @realModName; } +# ------------------ +sub usage { +# ------------------ + my $obj = shift || return error('No object defined!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $modulename = shift || 0; + my $hint = shift || ''; + my $user = shift || $console->{USER}; + + my $u = main::getModule('USER'); + unless($user) { + my $loginObj = $obj; + $loginObj = main::getModule('HTTPD') + if ($console->{TYP} eq 'HTML') ; + $loginObj = main::getModule('WAPD') + if ($console->{TYP} eq 'WML') ; + $user = $loginObj->{USER}; + } + + my $ret; + push(@$ret, sprintf(gettext("%sThis is the xxv %s server.\nPlease use the following commands:\n"), + ($hint ? "$hint\n\n" : ''), $console->typ)); + + my $mods = main::getModules(); + my @realModName; + + # Search for command and display the Description + foreach my $modName (sort keys %{$mods}) { + my $modCfg = $mods->{$modName}->{MOD}; + push(@realModName, $mods->{$modName}->{MOD}->{Name}); + next if($modulename and uc($modulename) ne $modCfg->{Name}); + foreach my $cmdName (sort keys %{$modCfg->{Commands}}) { + push(@$ret, + [ + (split('::', $modName))[-1], + $modCfg->{Commands}->{$cmdName}->{short}, + $cmdName, + $modCfg->{Commands}->{$cmdName}->{description}, + ] + ) if(! $modCfg->{Commands}->{$cmdName}->{hidden} and ($u->{active} ne 'y') || $u->allowCommand($modCfg, $cmdName, $user, "1")); + } + } + + $console->menu( + $ret, + { + periods => $mods->{'XXV::MODULES::EPG'}->{periods}, + CHANNELS => $mods->{'XXV::MODULES::CHANNELS'}->ChannelArray('Name'), + CONFIGS => [ sort @realModName ], + }, + ); +} 1; diff --git a/lib/XXV/MODULES/EPG.pm b/lib/XXV/MODULES/EPG.pm index 5122577..e39b974 100644 --- a/lib/XXV/MODULES/EPG.pm +++ b/lib/XXV/MODULES/EPG.pm @@ -83,8 +83,8 @@ sub module { description => gettext('Update EPG data.'), short => 'er', callback => sub{ - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); debug sprintf('Start reload EPG data%s', ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) @@ -134,7 +134,7 @@ sub status { my $sth = $obj->{dbh}->prepare("select count(*) as count from EPG"); if(!$sth->execute()) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { my $erg = $sth->fetchrow_hashref(); $total = $erg->{count} if($erg && $erg->{count}); @@ -145,7 +145,7 @@ sub status { my $sth = $obj->{dbh}->prepare("select count(*) as count from EPG where UNIX_TIMESTAMP(addtime) > ?"); if(!$sth->execute($lastReportTime)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { my $erg = $sth->fetchrow_hashref(); $newEntrys = $erg->{count} if($erg && $erg->{count}); @@ -180,14 +180,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - $self->_init or return error('Problem to initialize module'); + $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -236,7 +236,7 @@ sub _init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } @@ -330,7 +330,7 @@ sub updated { sub compareEpgData { # ------------------ my $obj = shift || return error('No object defined!'); - my $vdata = shift || return error('No data'); + my $vdata = shift || return error('No data defined!'); my $watcher = shift; my $console = shift; my $waiter = shift; @@ -356,7 +356,7 @@ sub compareEpgData { my $sql = qq|select eventid, title, subtitle, length(description) as ldescription, duration, UNIX_TIMESTAMP(starttime) as starttime, UNIX_TIMESTAMP(vpstime) as vpstime, video, audio from EPG where channel_id = ? |; my $sth = $obj->{dbh}->prepare($sql); $sth->execute($channel) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $db_data = $sth->fetchall_hashref('eventid'); lg sprintf( 'Compare EPG Database with data from vdr : %d / %d for channel %s', scalar keys %$db_data,scalar keys %$vdrData, $channel); @@ -394,7 +394,7 @@ sub compareEpgData { my $sth = $obj->{dbh}->prepare('DELETE FROM EPG WHERE eventid IN (?)'); foreach my $eventid (keys %$db_data) { if(!$sth->execute($eventid)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); } } } @@ -433,9 +433,9 @@ sub deleteDoubleEPGEntrys { # ------------------ sub replace { # ------------------ - my $obj = shift || return error ('No Object!'); - my $eventid = shift || return error ('No eventid to insert!');; - my $attr = shift || return error ('No data to insert!'); + my $obj = shift || return error('No object defined!'); + my $eventid = shift || return error('No eventid defined!'); + my $attr = shift || return error('No data defined!'); my $sth = $obj->{dbh}->prepare('REPLACE INTO EPG(eventid, title, subtitle, description, channel_id, duration, tableid, image, version, video, audio, starttime, addtime, vpstime) VALUES (?,?,?,?,?,?,?,?,?,?,?,FROM_UNIXTIME(?),FROM_UNIXTIME(?),FROM_UNIXTIME(?))'); $sth->execute( @@ -460,8 +460,8 @@ sub replace { sub encodeEpgId { # ------------------ my $obj = shift || return error('No object defined!'); - my $epgid = shift || return error('No EPG Id!'); - my $channel = shift || return error('No Channel!'); + my $epgid = shift || return error('No event defined!'); + my $channel = shift || return error('No channel defined!'); # look for NID-TID-SID for unique eventids (SID 0-30000 / TID 0 - 1000 / NID 0 - 10000 my @id = split('-', $channel); @@ -476,7 +476,7 @@ sub encodeEpgId { sub readEpgData { # ------------------ my $obj = shift || return error('No object defined!'); - my $vdata = shift || return error('Problem to read Data!'); + my $vdata = shift || return error('No data defined!'); my $count = shift || 0; my $dataHash = {}; @@ -575,8 +575,8 @@ sub readEpgData { sub search { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $data = shift; my $params = shift; @@ -665,8 +665,8 @@ sub search { sub program { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $channel = shift || $obj->{dbh}->selectrow_arrayref("select POS from CHANNELS limit 1")->[0]; my $mod = main::getModule('CHANNELS'); @@ -704,7 +704,7 @@ order by my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($cid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); @@ -721,8 +721,8 @@ order by sub display { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $eventid = shift || return $console->err(gettext("No ID defined to display this program! Please use display 'eid'!")); my %f = ( @@ -771,7 +771,7 @@ where $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eventid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); $erg = $sth->fetchall_arrayref(); last @@ -791,8 +791,8 @@ where sub runningNext { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $data = shift; my $param = shift || {}; my $cgroups = main::getModule('CHANNELS')->ChannelGroupsArray('Name'); @@ -822,7 +822,7 @@ GROUP BY c.Id |; my $sthtemp = $obj->{dbh}->prepare($sqltemp); $sthtemp->execute($cgrp) - or return error sprintf("Can't execute query: %s.",$sthtemp->errstr); + or return error sprintf("Couldn't execute query: %s.",$sthtemp->errstr); my %f = ( 'Service' => umlaute(gettext('Service')), @@ -858,7 +858,7 @@ ORDER BY my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($cgrp) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); @@ -879,8 +879,8 @@ ORDER BY sub runningNow { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $zeit = shift || time; my $param = shift || {}; my $cgroups = main::getModule('CHANNELS')->ChannelGroupsArray('Name'); @@ -934,7 +934,7 @@ ORDER BY my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($zeit, $cgrp) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); @@ -955,9 +955,9 @@ ORDER BY sub NowOnChannel { # ------------------ 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!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $channel = shift || $obj->_actualChannel || return error('No channel defined!'); my $zeit = time; my $sql = @@ -989,7 +989,7 @@ LIMIT 1 #dumper($sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($zeit, $channel) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); if(ref $console) { @@ -1013,8 +1013,8 @@ sub _actualChannel { sub schema { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $zeit = shift || time; my $param = shift || {}; @@ -1074,7 +1074,7 @@ ORDER BY my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($zeitvon,$zeitbis,$zeitvon,$zeitbis,$zeitvon,$zeitbis,$cgrp) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); my $data = {}; @@ -1101,9 +1101,9 @@ ORDER BY sub checkOnTimer { # ------------------ 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'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $eid = shift || return error('No id defined!'); my $tim = main::getModule('TIMERS'); my $sql = qq| @@ -1122,7 +1122,7 @@ WHERE my $sth = $obj->{dbh}->prepare($sql); $sth->execute($eid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $data = $sth->fetchrow_hashref(); my $erg = $tim->checkOverlapping($data) || ['ok']; my $tmod = main::getModule('TIMERS'); @@ -1138,10 +1138,11 @@ WHERE } # ------------------ -sub getDescription {# ------------------ +sub getDescription { +# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $eid = shift || 0; my $event = $obj->getId($eid,"description"); @@ -1154,7 +1155,7 @@ sub getDescription {# ------------------ sub toFullHour { # ------------------ my $obj = shift || return error('No object defined!'); - my $zeit = shift || return error ('No Time to convert!' ); + my $zeit = shift || return error ('No time to convert defined!'); my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime($zeit); @@ -1167,7 +1168,7 @@ sub toFullHour { sub getId { # ------------------ my $obj = shift || return error('No object defined!'); - my $id = shift || return error ('No Id!' ); + my $id = shift || return error('No id defined!'); my $fields = shift || '*'; foreach my $table (qw/EPG OLDEPG/) { @@ -1175,7 +1176,7 @@ sub getId { my $sql = sprintf('select %s from %s WHERE eventid = ?',$fields, $table); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($id) - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; my $erg = $sth->fetchrow_hashref(); return $erg @@ -1188,8 +1189,8 @@ sub getId { # ------------------ sub suggest {# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $params = shift; @@ -1230,10 +1231,10 @@ LIMIT 25 my $sth = $obj->{dbh}->prepare($sql); if($params->{channel}) { $sth->execute('%'.$search.'%',$params->{channel},'%'.$search.'%',$params->{channel}) - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; } else { $sth->execute('%'.$search.'%','%'.$search.'%') - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; } my $result = $sth->fetchall_arrayref(); $console->table($result) diff --git a/lib/XXV/MODULES/EVENTS.pm b/lib/XXV/MODULES/EVENTS.pm index 409592d..402774a 100644 --- a/lib/XXV/MODULES/EVENTS.pm +++ b/lib/XXV/MODULES/EVENTS.pm @@ -83,14 +83,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -136,7 +136,7 @@ sub searchForEvents { # ------------------ sub callEvent { # ------------------ - my $obj = shift || return error ('No Object in callEvent!' ); + my $obj = shift || return error('No object defined!'); my $args = { 'Mod' => shift, 'Sub' => shift, diff --git a/lib/XXV/MODULES/GRAB.pm b/lib/XXV/MODULES/GRAB.pm index bb97e36..0a07b63 100644 --- a/lib/XXV/MODULES/GRAB.pm +++ b/lib/XXV/MODULES/GRAB.pm @@ -109,7 +109,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # create Template object @@ -121,7 +121,7 @@ sub new { EVAL_PERL => 1, # evaluate Perl code blocks ); - $self->_init or return error('Problem to initialize module'); + $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -134,11 +134,11 @@ sub _init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } return 1; - }, "GRAB: Init module ..."); + }, "GRAB: init modul ..."); return 1; } @@ -169,7 +169,7 @@ sub grab { $erg = $data; } elsif(!open(F, ">$file")) { # Open failed - $erg = sprintf("Can't write to file %s : %s",$file,$!); + $erg = sprintf("Couldn't write file %s : %s",$file,$!); } else { # uudecode data to file binmode(F); @@ -179,7 +179,7 @@ sub grab { } else { if(-e $file) { - unlink($file) || error("Can't remove '%s' : %s",$file,$!); + unlink($file) || error("Couldn't remove '%s' : %s",$file,$!); } # the command my $cmd = sprintf('grab %s jpeg %d %d %d', @@ -204,15 +204,15 @@ sub grab { sub display { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $file = $obj->grab(); if(-s $file) { # Datei existiert und hat eine Grösse von mehr als 0 Bytes $console->{nocache} = 1; return $console->image($file); } else { - error("Can't locate file : $file, maybe grabbing was failed"); + error("Couldn't locate file : $file, maybe grabbing was failed"); return 0; } } @@ -221,16 +221,16 @@ sub display { sub makeImgText { # ------------------ 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'); - my $text = shift || $obj->{imgtext} || return error ('No Text to display'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $file = shift || $obj->{file} || return error ('No file to display defined!'); + my $text = shift || $obj->{imgtext} || return error ('No text to display defined!'); my $im; if(int(${GD::VERSION}) >= 2.0) { - $im = GD::Image->newFromJpeg($file, 1) || return error("Can't read $file $!"); + $im = GD::Image->newFromJpeg($file, 1) || return error("Couldn't read $file $!"); } else { - $im = GD::Image->newFromJpeg($file) || return error("Can't read $file $!"); + $im = GD::Image->newFromJpeg($file) || return error("Couldn't read $file $!"); } my $color = $im->colorClosest(255,255,255); my $shadow = $im->colorClosest(0,0,0); @@ -283,7 +283,7 @@ sub findttf }, $obj->{paths}->{FONTPATH} ); - error "Can't find useful font at : ", $obj->{paths}->{FONTPATH} + error "Couldn't find useful font at : ", $obj->{paths}->{FONTPATH} if(scalar $found == 0); return $found; } diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm index ee0652c..14a2a8b 100644 --- a/lib/XXV/MODULES/HTTPD.pm +++ b/lib/XXV/MODULES/HTTPD.pm @@ -107,24 +107,6 @@ sub module { }, }, Commands => { - help => { - description => gettext("This will display all commands or description of module 'name'."), - short => 'h', - callback => sub{ - return $obj->usage(@_); - }, - }, - reload => { - description => gettext("Restart all modules."), - short => 'rel', - callback => sub{ - my ($w, $c, $l) = @_; - $Module::Reload::Debug = 2; - Module::Reload->check; - $c->message(gettext("Modules loaded.")); - }, - Level => 'admin' - }, checkvalue => { hidden => 'yes', callback => sub{ $obj->checkvalue(@_) }, @@ -156,14 +138,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - $self->init or return error('Problem to initialize module'); + $self->init or return error('Problem to initialize modul!'); return $self; } @@ -184,7 +166,7 @@ sub init { LocalPort => $obj->{Port}, LocalAddr => $obj->{Interface}, Reuse => 1 - ) or return error("Can't create Socket: $!"); + ) or return error("Couldn't create socket: $!"); # install an initial watcher Event->io( @@ -193,7 +175,7 @@ sub init { cb => sub { # accept client my $client=$socket->accept; - panic "Can't connect http to new client." and return unless $client; + panic "Couldn't connect to new http client." and return unless $client; $client->autoflush; # make "channel" number @@ -487,54 +469,7 @@ sub handleInput { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error('No watcher defined!'); - my $console = shift || return error('No console defined!'); - my $modulename = shift || 0; - my $hint = shift || ''; - my $user = shift || $console->{USER}; - - my $u = main::getModule('USER'); - unless($user) { - my $loginObj = $obj; - $loginObj = main::getModule('HTTPD') - if ($console->{TYP} eq 'HTML') ; - $loginObj = main::getModule('WAPD') - if ($console->{TYP} eq 'WML') ; - $user = $loginObj->{USER}; - } - - my $ret; - push(@$ret, sprintf(gettext("%sThis is the xxv %s server.\nPlease use the following commands:\n"), - ($hint ? "$hint\n\n" : ''), $console->typ)); - - my $mods = main::getModules(); - my @realModName; - - # Search for command and display the Description - foreach my $modName (sort keys %{$mods}) { - my $modCfg = $mods->{$modName}->{MOD}; - push(@realModName, $mods->{$modName}->{MOD}->{Name}); - next if($modulename and uc($modulename) ne $modCfg->{Name}); - foreach my $cmdName (sort keys %{$modCfg->{Commands}}) { - push(@$ret, - [ - (split('::', $modName))[-1], - $modCfg->{Commands}->{$cmdName}->{short}, - $cmdName, - $modCfg->{Commands}->{$cmdName}->{description}, - ] - ) if(! $modCfg->{Commands}->{$cmdName}->{hidden} and ($u->{active} ne 'y') || $u->allowCommand($modCfg, $cmdName, $user, "1")); - } - } - - $console->menu( - $ret, - { - periods => $mods->{'XXV::MODULES::EPG'}->{periods}, - CHANNELS => $mods->{'XXV::MODULES::CHANNELS'}->ChannelArray('Name'), - CONFIGS => [ sort @realModName ], - }, - ); + return main::getModule('CONFIG')->usage(@_); } # ------------------ @@ -575,7 +510,7 @@ sub findskins }, $obj->{paths}->{HTMLDIR} ); - error "Can't find useful HTML Skin at : $obj->{paths}->{HTMLDIR}" + error "Couldn't find useful HTML Skin at : $obj->{paths}->{HTMLDIR}" if(scalar $found == 0); return sort { lc($a->[0]) cmp lc($b->[0]) } @{$found}; } diff --git a/lib/XXV/MODULES/INTERFACE.pm b/lib/XXV/MODULES/INTERFACE.pm index 0197239..febe9ed 100644 --- a/lib/XXV/MODULES/INTERFACE.pm +++ b/lib/XXV/MODULES/INTERFACE.pm @@ -71,14 +71,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - $self->init or return error('Problem to initialize module'); + $self->init or return error('Problem to initialize modul!'); return $self; } @@ -133,7 +133,7 @@ BEGIN { # ------------------ sub getCommand { my $obj = shift || return error('No object defined!'); - my $cmd = shift || return error ('No Command!' ); + my $cmd = shift || return error('No command defined!'); my $data = shift; my $ret = $obj->handleInput($cmd, $data); @@ -144,7 +144,7 @@ BEGIN { sub handleInput { # ------------------ my $obj = shift || return error('No object defined!'); - my $ucmd = shift || return error ('No Command'); + my $ucmd = shift || return error('No command defined!'); my $udata = shift; my $watcher = $obj; @@ -172,7 +172,7 @@ BEGIN { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - return main::getModule('TELNET')->usage(@_); + return main::getModule('CONFIG')->usage(@_); } } # End BEGIN diff --git a/lib/XXV/MODULES/LOGREAD.pm b/lib/XXV/MODULES/LOGREAD.pm index 086dfde..abd8629 100644 --- a/lib/XXV/MODULES/LOGREAD.pm +++ b/lib/XXV/MODULES/LOGREAD.pm @@ -83,7 +83,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; return $self; @@ -93,8 +93,8 @@ sub new { sub logger { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $logname = shift || 'standard'; my $params = shift || {}; @@ -167,7 +167,7 @@ sub logger { sub tail { # ------------------ my $obj = shift || return error('No object defined!'); - my $logfile = shift || return error ('No Logfile!' ); + my $logfile = shift || return error('No file defined!'); my $rows = shift || $obj->{rows}; my $cmd = sprintf('%s --lines=%d %s', $obj->{tail}, $rows, $logfile); @@ -180,7 +180,7 @@ sub tail { sub parseLogOutput { # ------------------ my $obj = shift || return error('No object defined!'); - my $log = shift || return error ('No Prefs for logfile!' ); + my $log = shift || return error('No data defined!'); my $out = shift || return; my $regex = $log->{regex}; @@ -204,7 +204,7 @@ sub parseLogOutput { sub parseData { # ------------------ my $obj = shift || return error('No object defined!'); - my $ret = shift || return error('No Referenced Array'); + my $ret = shift || return error('No data defined!'); my $data = shift || 0; diff --git a/lib/XXV/MODULES/MEDIALIB.pm b/lib/XXV/MODULES/MEDIALIB.pm index e06da26..ba42ec6 100644 --- a/lib/XXV/MODULES/MEDIALIB.pm +++ b/lib/XXV/MODULES/MEDIALIB.pm @@ -176,14 +176,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -267,7 +267,7 @@ sub _init { |); unless(-d $obj->{libraryimagedir}) { - mkpath($obj->{libraryimagedir}) or error "Can't mkpath $obj->{libraryimagedir} : $!"; + mkpath($obj->{libraryimagedir}) or error "Couldn't mkpath $obj->{libraryimagedir} : $!"; lg sprintf('mkdir path "%s" ', $obj->{coverimages}, ); @@ -304,8 +304,8 @@ FROM sub researchMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || {}; @@ -317,7 +317,7 @@ sub researchMedia { if ( $params->{source} eq 'dvdpalace' ) { eval "use MediaLibParser::DVDPalace"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); my $mlp = MediaLibParser::DVDPalace->new( 'lookup_result' => $params->{title}, @@ -335,8 +335,8 @@ sub researchMedia { sub createMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || 0; @@ -347,8 +347,8 @@ sub createMedia { sub copyMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || 0; @@ -374,8 +374,8 @@ WHERE sub importMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || {}; @@ -387,7 +387,7 @@ sub importMedia { if ( $params->{source} eq 'dvdpalace' ) { eval "use MediaLibParser::DVDPalace"; - return panic("\nCan not load Module: MediaLibParser::DVDPalace") if($@); + return panic("\nCouldn't load modul: MediaLibParser::DVDPalace") if($@); my $mlp = MediaLibParser::DVDPalace->new( 'url_media' => $params->{import}, @@ -457,8 +457,8 @@ sub importMedia { sub searchMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || {}; #print Dumper($params); @@ -544,8 +544,8 @@ ORDER BY title sub editMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || {}; #print Dumper($params); @@ -592,8 +592,8 @@ WHERE sub listMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || ""; my $params = shift; @@ -652,8 +652,8 @@ ORDER BY title sub displayMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || ""; my $params = shift; @@ -698,8 +698,8 @@ WHERE id = ? sub saveMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || ""; my $params = shift; @@ -742,8 +742,8 @@ sub saveMedia { sub deleteMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || ""; my $params = shift; @@ -753,7 +753,7 @@ sub deleteMedia { my $sql = sprintf('DELETE FROM MEDIALIB_VIDEODATA WHERE id IN (%s)', join(',' => ('?') x @media)); my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@media)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); $console->err(sprintf gettext("Media with ID '%s' does not exist in the database!"), join(',', @media)); return 0; } @@ -763,7 +763,7 @@ sub deleteMedia { my $sql = sprintf('DELETE FROM MEDIALIB_VIDEOGENRE WHERE video_id IN (%s)', join(',' => ('?') x @media)); my $sth = $obj->{dbh}->prepare($sql); if(!$sth->execute(@media)) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); $console->err(sprintf gettext("Genres for Media with ID '%s' does not exist in the database!"), join(',', @media)); return 0; } @@ -782,8 +782,8 @@ sub deleteMedia { sub _saveActors { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $input = shift || ''; $input =~ s/\r\n/\n/g; @@ -800,7 +800,7 @@ sub _saveActors { lg( sprintf("Looking for image of %s", $name )); eval "use MediaLibParser::IMDb"; - return panic("\nCan not load Module: MediaLibParser::DVDPalace") if($@); + return panic("\nCouldn't load modul: MediaLibParser::DVDPalace") if($@); my $mlp = MediaLibParser::IMDb->new( 'lookup_actor' => $name, @@ -876,7 +876,7 @@ sub _saveGenres { sub _saveMedia { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to Save!' ); + my $data = shift || return error('No data defined!'); if(ref $data eq 'HASH') { my ($names, $vals, $kenn); @@ -993,8 +993,8 @@ sub _nocover { sub mediacache { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $params = shift || ''; @@ -1074,7 +1074,7 @@ sub _get_mediatype_as_hash { sub _get_mediatype_namebyid { # ------------------ my $obj = shift || return error('No object defined!'); - my $id = shift || return error ('No Mediatype ID given'); + my $id = shift || return error ('No media type ID given!'); my $types = $obj->_get_mediatype_as_array; diff --git a/lib/XXV/MODULES/MUSIC.pm b/lib/XXV/MODULES/MUSIC.pm index 031cfa6..b07eebc 100644 --- a/lib/XXV/MODULES/MUSIC.pm +++ b/lib/XXV/MODULES/MUSIC.pm @@ -174,14 +174,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -213,7 +213,7 @@ sub _init { $obj->{ICE}->add_file($File::Find::name) if($File::Find::name =~ /\.mp3$/sig); # Lookup for *.mp3 } else { - lg "Permissions deny, can't read : $File::Find::name"; + lg "Permissions deny, couldn't read : $File::Find::name"; } }, follow => 1, @@ -239,7 +239,7 @@ sub _init { cb => sub { # accept client my $client = $obj->{SOCK}->accept; - panic "Can't connect to new icecast client." and return unless $client; + panic "Couldn't connect to new icecast client." and return unless $client; $client->autoflush; # make "channel" number @@ -438,9 +438,9 @@ sub refresh { sub play { # ------------------ 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'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $data = shift || return error('No data defined!'); debug sprintf('Call play%s', ( $console->{USER} && $console->{USER}->{Name} ? sprintf(' from user: %s', $console->{USER}->{Name}) : "" ) @@ -453,9 +453,9 @@ sub play { sub playlist { # ------------------ 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'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $data = shift || return error('No data defined!'); my $dbh = ($obj->{mdbh} ? $obj->{mdbh} : $obj->{dbh}); @@ -509,8 +509,8 @@ sub playlist { sub search { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || return $console->err(gettext("No Text to search! Please use msearch 'text'")); return $obj->list($watcher,$console,"search:".$text); @@ -520,8 +520,8 @@ sub search { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $dbh = ($obj->{mdbh} ? $obj->{mdbh} : $obj->{dbh}); @@ -686,7 +686,7 @@ sub list { sub handleInput { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Request!' ); + my $data = shift || return error('No request defined!'); my $cgi = CGI->new( $data->{Query} ); my $ucmd = $cgi->param('cmd') || 'play'; @@ -706,8 +706,8 @@ sub handleInput { sub field2path { # ------------------ my $obj = shift || return error('No object defined!'); - my $field = shift || return error ('No Field!' ); - my $data = shift || return error ('No ids!' ); + my $field = shift || return error('No field defined!'); + my $data = shift || return error('No data defined!'); my $pathfield; my $sql; @@ -756,13 +756,13 @@ sub insert { sub stream { # ------------------ my $obj = shift || return error('No object defined!'); - my $files = shift || return error ('No Files!' ); - my $client = shift || return error ('No Client!' ); + my $files = shift || return error('No file defined!'); + my $client = shift || return error('No client defined!'); my %seen = (); my @uniqu = grep { ! $seen{$_} ++ } @$files; - defined(my $child = fork()) or die "Can't fork: $!"; + defined(my $child = fork()) or die "Couldn't fork: $!"; if($child == 0) { $obj->{SOCK}->close; $obj->{dbh}->{InactiveDestroy} = 1; @@ -772,7 +772,7 @@ sub stream { $file = $obj->{path} . "/" . $file if($obj->{mdbh}); - debug('Stream file "%s" to Client: %s', + debug('Stream file "%s" to client: %s', $file,$client); my $erg = $obj->{ICE}->stream($file,0,$client) || last; @@ -785,7 +785,7 @@ sub stream { sub parseRequest { # ------------------ my $obj = shift || return error('No object defined!'); - my $hdl = shift || return error ('No Request!' ); + my $hdl = shift || return error('No request defined!'); my ($Req, $size) = getFromSocket($hdl); @@ -933,7 +933,7 @@ sub getcovers { if(ref $console); unless(-d $obj->{coverimages}) { - mkpath($obj->{coverimages}) or error "Can't mkpath $obj->{coverimages} : $!"; + mkpath($obj->{coverimages}) or error "Couldn't mkpath $obj->{coverimages} : $!"; lg sprintf('mkdir path "%s"', $obj->{coverimages} ); @@ -1048,7 +1048,7 @@ sub getcovers { sub _findcoverfromcache { # ------------------ my $obj = shift || return error('No object defined!'); - my $album = shift || return error ('No Album!' ); + my $album = shift || return error('No album defined!'); my $artist = shift || 0; my $typ = shift || 'absolute'; @@ -1118,7 +1118,7 @@ sub ConnectToMuggleDB { sub _findcover { # ------------------ my $obj = shift || return error('No object defined!'); - my $file = shift || return error ('No file!' ); + my $file = shift || return error('No file defined!'); my $artist = shift; my $album = shift; @@ -1141,7 +1141,7 @@ sub _findcover { push(@images,$File::Find::name) if($File::Find::name =~ /\.jpg$|\.jpeg$|\.gif$|\.png/sig); # Lookup for images } else { - lg "Permissions deny, can't read : $File::Find::name"; + lg "Permissions deny, couldn't read : $File::Find::name"; } }, follow => 1, @@ -1218,9 +1218,9 @@ sub _findcover { sub coverimage { # ------------------ 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'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $data = shift || return error('No data defined!'); my $dbh = ($obj->{mdbh} ? $obj->{mdbh} : $obj->{dbh}); @@ -1289,9 +1289,9 @@ sub coverimage { sub getfile { # ------------------ 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'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $data = shift || return error('No data defined!'); my $dbh = ($obj->{mdbh} ? $obj->{mdbh} : $obj->{dbh}); @@ -1320,15 +1320,16 @@ sub getfile { return 1; } } - $console->err(gettext("Sorry, can't get file.")); + $console->err(gettext("Sorry, couldn't get file.")); return 0; } # ------------------ -sub suggest {# ------------------ +sub suggest { +# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $params = shift; diff --git a/lib/XXV/MODULES/RECORDS.pm b/lib/XXV/MODULES/RECORDS.pm index 977723d..498d588 100644 --- a/lib/XXV/MODULES/RECORDS.pm +++ b/lib/XXV/MODULES/RECORDS.pm @@ -231,7 +231,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul!: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle @@ -241,7 +241,7 @@ sub new { $self->{framerate} = 25; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -285,7 +285,7 @@ sub _init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } @@ -318,7 +318,7 @@ sub dot1000 { sub parseData { # ------------------ my $obj = shift || return error('No object defined!'); - my $vdata = shift || return error('Problem to read data!'); + my $vdata = shift || return error('No data defined!'); my ($event, $hash, $id, $date, $hour, $minute, $state, $duration, $title, $day, $month, $year); my $dataHash = {}; @@ -334,7 +334,7 @@ sub parseData { } unless($id) { - error sprintf("Can't parse svdrp data : '%s'",$record); + error sprintf("Couldn't parse svdrp data : '%s'",$record); next; } @@ -358,8 +358,9 @@ sub parseData { } # ------------------ -sub scandirectory {# ------------------ - my $obj = shift || return error ('No Object!'); +sub scandirectory { +# ------------------ + my $obj = shift || return error('No object defined!'); find( { @@ -368,7 +369,7 @@ sub scandirectory {# ------------------ push(@{$obj->{FILES}},[$File::Find::name,$obj->converttitle($File::Find::name)]) if($File::Find::name =~ /\.rec\/\d{3}.vdr$/sig); # Lookup for *.rec/001.vdr } else { - lg "Permissions deny, can't read : $File::Find::name"; + lg "Permissions deny, Couldn't read : $File::Find::name"; } }, follow => 1, @@ -415,7 +416,7 @@ sub readData { $obj->{CapacityPercent} = int($percent); } else { - error("Can't get disc state : ".join("\n", @$stat)); + error("Couldn't get disc state : ".join("\n", @$stat)); $obj->{CapacityMessage} = gettext("Unknown disc capacity!"); $obj->{CapacityPercent} = 0; @@ -548,7 +549,7 @@ sub readData { my $sql = sprintf('DELETE FROM RECORDS WHERE RecordMD5 IN (%s)', join(',' => ('?') x @todel)); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@todel) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } debug sprintf 'Finish .. %d recordings inserted, %d recordings updated, %d recordings removed', @@ -566,7 +567,7 @@ sub readData { my @jobs = @{$obj->{JOBS}}; $obj->{JOBS} = []; - defined(my $child = fork()) or return error sprintf("Can't fork : %s",$!); + defined(my $child = fork()) or return error sprintf("Couldn't fork : %s",$!); if($child == 0) { $obj->{dbh}->{InactiveDestroy} = 1; @@ -594,7 +595,7 @@ sub readData { my $sql = sprintf('DELETE FROM OLDEPG where (UNIX_TIMESTAMP(starttime) + duration) < (UNIX_TIMESTAMP() - 86400) and eventid not in (%s)', join(',' => ('?') x @merkIds)); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@merkIds) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } $obj->updated() if($insertedData); @@ -607,7 +608,7 @@ sub readData { if(scalar @{$err} == 0) { $console->message(sprintf(gettext("Write %d recordings to the database."), scalar @merkIds)); } else { - unshift(@{$err}, sprintf(gettext("Write %d recordings to the database. Cannot assign %d recordings."), scalar @merkIds , scalar @{$err})); + unshift(@{$err}, sprintf(gettext("Write %d recordings to the database. Couldn't assign %d recordings."), scalar @merkIds , scalar @{$err})); lg join("\n", @$err); $console->err($err); } @@ -696,16 +697,17 @@ sub _updateEvent { my $sth = $obj->{dbh}->prepare('UPDATE OLDEPG SET duration=?, starttime=FROM_UNIXTIME(?), addtime=FROM_UNIXTIME(?) where eventid=?'); if(!$sth->execute($event->{duration},$event->{starttime},$event->{addtime},$event->{eventid})) { - error sprintf("Can't update Event!: '%s' !",$event->{eventid}); + error sprintf("Couldn't update event!: '%s' !",$event->{eventid}); return undef; } return $event; } # ------------------ -sub _updateState {# ------------------ - my $obj = shift || return error ('No Object!'); - my $oldattr = shift || return error ('Missing data'); +sub _updateState { +# ------------------ + my $obj = shift || return error('No object defined!'); + my $oldattr = shift || return error ('No data defined!'); my $attr = shift || return error ('No data to replace!'); my $sth = $obj->{dbh}->prepare('UPDATE RECORDS SET RecordId=?, State=?, addtime=FROM_UNIXTIME(?) where RecordMD5=?'); @@ -724,7 +726,7 @@ sub analyze { my $info = $obj->videoInfo($recattr->{title}, $recattr->{starttime}); unless($info && ref $info eq 'HASH') { - error sprintf("Can't find recording '%s' with id : '%s' !",$recattr->{title}, $recattr->{id}); + error sprintf("Couldn't find recording '%s' with id : '%s' !",$recattr->{title}, $recattr->{id}); return 0; } @@ -755,7 +757,7 @@ sub analyze { # erfunden werden ;) $event = $obj->createOldEventId($recattr->{id}, $recattr->{starttime}, $info->{duration}, $title, $subtitle, $info); unless($event) { - error sprintf("Can't create Event!: '%s' !",$recattr->{id}); + error sprintf("Couldn't create event!: '%s' !",$recattr->{id}); return 0; } } @@ -786,15 +788,16 @@ sub analyze { sub videoInfo { # ------------------ my $obj = shift || return error('No object defined!'); - my $title = shift || return error ('No title!' ); - my $starttime = shift || return error ('No title!' ); + my $title = shift || return error('No title defined!'); + my $starttime = shift || return error('No start time defined!'); lg sprintf('Get information from recording "%s"', $title ); - my $month=sprintf("%02d",(localtime($starttime))[4]+1); - my $day=sprintf("%02d",(localtime($starttime))[3]); - my $hour=sprintf("%02d",(localtime($starttime))[2]); - my $minute=sprintf("%02d",(localtime($starttime))[1]); + my @ltime = localtime($starttime); + my $month=sprintf("%02d",$ltime[4]+1); + my $day=sprintf("%02d",$ltime[3]); + my $hour=sprintf("%02d",$ltime[2]); + my $minute=sprintf("%02d",$ltime[1]); my @files; @@ -808,7 +811,7 @@ sub videoInfo { } unless(scalar @files) { - error sprintf("Can't assign recording with title: '%s' (%s/%s %s:%s)", $title,$month,$day,$hour,$minute); + error sprintf("Couldn't assign recording with title: '%s' (%s/%s %s:%s)", $title,$month,$day,$hour,$minute); return 0; } @@ -838,7 +841,7 @@ sub videoInfo { my $marks = sprintf("%s/marks.vdr", $path); if(-r $marks) { my $data = load_file($marks) - or error sprintf("I can't read file '%s'",$marks); + or error sprintf("Couldn't read file '%s'",$marks); if($data) { foreach my $zeile (split("\n", $data)) { # 0:35:07.09 moved from [0:35:13.24 Logo start] by checkBlackFrameOnMark @@ -900,8 +903,8 @@ sub videoInfo { sub videoPreview { # ------------------ my $obj = shift || return error('No object defined!'); - my $eventid = shift || return error ('No eventid!'); - my $info = shift || return error ('No InfoHash!'); + my $eventid = shift || return error('No eventid defined!'); + my $info = shift || return error ('No information defined!'); my $rebuild = shift || 0; if ($obj->{previewcommand} eq 'Nothing') { @@ -940,13 +943,13 @@ sub videoPreview { # Mplayer unless(-x $obj->{previewbinary}) { - error("I can't find executable file as usable preview command !"); + error("Couldn't find executable file as usable preview command!"); return 0; } unless(-d $outdir) { if(!mkpath($outdir)) { - error sprintf("Can't mkpath '%s' : %s",$outdir,$!); + error sprintf("Couldn't make path '%s' : %s",$outdir,$!); return 0; } } @@ -1000,15 +1003,15 @@ sub videoPreview { foreach (@files) { s/(\")/\\$1/g; } } - $vdir =~ s/(\")/\\$1/g; + $vdir =~ s/(\')/\\$1/g; my $scalex = 180; my $mversions = { - 'MPlayer1.0pre5' => sprintf("%s -noautosub -noconsolecontrols -nosound -nolirc -nojoystick -quiet -vo jpeg -jpeg outdir=\"%s\" -ni -ss %d -sstep %d -vf scale -zoom -xy %d -frames %d \"%s\" >> \"%s\" 2>&1", - $obj->{previewbinary}, $outdir, $startseconds / 5, $stepseconds / 5, $scalex, $count, join("\" \"",@files), $log), - 'MPlayer1.0pre6' => sprintf("%s -noautosub -noconsolecontrols -nosound -nolirc -nojoystick -quiet -vo jpeg:outdir=\"%s\" -ni -ss %d -sstep %d -vf scale -zoom -xy %d -frames %d \"%s\" >> \"%s\" 2>&1", - $obj->{previewbinary}, $outdir, $startseconds / 5, $stepseconds / 5, $scalex, $count, join("\" \"",@files), $log), - 'vdr2jpeg' => sprintf("%s -r \"%s\" -f %s -x %d -o \"%s\" >> \"%s\" 2>&1", + 'MPlayer1.0pre5' => sprintf("%s -noautosub -noconsolecontrols -nosound -nolirc -nojoystick -quiet -vo jpeg -jpeg outdir=\'%s\' -ni -ss %d -sstep %d -vf scale -zoom -xy %d -frames %d \'%s\' >> \'%s\' 2>&1", + $obj->{previewbinary}, $outdir, $startseconds / 5, $stepseconds / 5, $scalex, $count, join("\' \'",@files), $log), + 'MPlayer1.0pre6' => sprintf("%s -noautosub -noconsolecontrols -nosound -nolirc -nojoystick -quiet -vo jpeg:outdir=\'%s\' -ni -ss %d -sstep %d -vf scale -zoom -xy %d -frames %d \'%s\' >> \'%s\' 2>&1", + $obj->{previewbinary}, $outdir, $startseconds / 5, $stepseconds / 5, $scalex, $count, join("\' \'",@files), $log), + 'vdr2jpeg' => sprintf("%s -r \'%s\' -f %s -x %d -o \'%s\' >> \'%s\' 2>&1", $obj->{previewbinary}, $vdir, join(" -f ", @frames), $scalex, $outdir, $log), }; return $mversions->{$obj->{previewcommand}}; @@ -1027,9 +1030,9 @@ sub _mark2frames{ sub SearchEpgId { # ------------------ 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 $start = shift || return error('No start time defined!'); + my $dur = shift || return 0; + my $title = shift || return error('No title defined!'); my $subtitle = shift; my $channel = shift; @@ -1044,7 +1047,7 @@ qq|SELECT * FROM OLDEPG WHERE AND subtitle = ? AND channel_id = ?|); $sth->execute($start,$bis,$title,$subtitle,$channel) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } elsif($subtitle) { $sth = $obj->{dbh}->prepare( qq|SELECT * FROM OLDEPG WHERE @@ -1053,7 +1056,7 @@ qq|SELECT * FROM OLDEPG WHERE AND title = ? AND subtitle = ?|); $sth->execute($start,$bis,$title,$subtitle) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { $sth = $obj->{dbh}->prepare( qq|SELECT * FROM OLDEPG WHERE @@ -1061,7 +1064,7 @@ qq|SELECT * FROM OLDEPG WHERE AND UNIX_TIMESTAMP(starttime)+duration <= ? AND title = ?|); $sth->execute($start,$bis,$title) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } return 0 if(!$sth); @@ -1079,14 +1082,13 @@ qq|SELECT * FROM OLDEPG WHERE sub createOldEventId { # ------------------ my $obj = shift || return error('No object defined!'); - my $id = shift || return error ('No Id!' ); - my $start = shift || return error ('No Starttime!' ); + my $id = shift || return error('No eventid defined!'); + my $start = shift || return error('No start time defined!'); my $duration = shift || 0; - my $title = shift || return error ('No title!' ); + my $title = shift || return error('No title defined!'); my $subtitle = shift; my $info = shift; -#warn($title); my $attr = { title => $title, subtitle => $subtitle, @@ -1102,9 +1104,7 @@ sub createOldEventId { $attr->{eventid} = $obj->{dbh}->selectrow_arrayref('select max(eventid)+1 from OLDEPG')->[0]; $attr->{eventid} = 1000000000 if(not defined $attr->{eventid} or $attr->{eventid} < 1000000000 ); - # dumper($attr); - - lg sprintf('Create OldEventId from event "%s" - "%s"', + lg sprintf('Create event "%s" - "%s" into OLDEPG', $title, $subtitle ? $subtitle : '', ); @@ -1131,8 +1131,8 @@ sub createOldEventId { sub display { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $recordid = shift || return $console->err(gettext("No recording defined for display! Please use rdisplay 'rid'")); my $start = "e.starttime"; @@ -1167,7 +1167,7 @@ where my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($recordid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); $obj->_loadreccmds; @@ -1189,8 +1189,8 @@ where sub play { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); 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 = ?|; @@ -1209,8 +1209,8 @@ sub play { sub cut { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); 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 = ?|; @@ -1229,8 +1229,8 @@ sub cut { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || ""; my $params = shift; @@ -1321,8 +1321,8 @@ GROUP BY sub search { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || return $obj->list($watcher,$console); my $params = shift; @@ -1390,8 +1390,8 @@ WHERE sub delete { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $record = shift || return $console->err(gettext("No recording defined for deletion! Please use rdelete 'id'.")); my $answer = shift || 0; @@ -1414,7 +1414,7 @@ sub delete { my $sql = sprintf("SELECT r.RecordId,CONCAT_WS('~',e.title,e.subtitle),r.RecordMD5 FROM RECORDS as r,OLDEPG as e WHERE e.eventid = r.eventid and r.RecordMD5 IN (%s) ORDER BY r.RecordId desc", join(',' => ('?') x @recordings)); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@recordings) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $data = $sth->fetchall_arrayref(); # Query as array to hold ordering ! foreach my $recording (@$data) { @@ -1505,8 +1505,8 @@ sub is_empty_dir { sub redit { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $recordid = shift || return $console->err(gettext("No recording defined for editing!")); my $data = shift || 0; @@ -1541,7 +1541,7 @@ WHERE if(-r $file) { my $text = load_file($file) - or $console->err(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$!)); + or $console->err(sprintf(gettext("Couldn't open file '%s' : %s!"),$file,$!)); foreach my $zeile (split(/[\r\n]/, $text)) { if($zeile =~ /^D\s+(.+)/s) { @@ -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("Cannot open file '%s' : %s!"),$file,$!)); + or $console->err(sprintf(gettext("Couldn't open file '%s' : %s!"),$file,$!)); foreach my $zeile (split(/[\r\n]/, $text)) { $zeile =~ s/^\s+//; $zeile =~ s/\s+$//; @@ -1732,13 +1732,13 @@ WHERE } save_file($file, $out) - or return $console->err(sprintf(gettext("Can't write file '%s' : %s"),$file,$!)); + or return $console->err(sprintf(gettext("Couldn't write file '%s' : %s"),$file,$!)); $dropEPGEntry = 1; } if($data->{marks} ne $marks) { save_file($marksfile, $data->{marks}) - or return $console->err(sprintf(gettext("Can't write file '%s' : %s"),$marksfile,$!)); + or return $console->err(sprintf(gettext("Couldn't write file '%s' : %s"),$marksfile,$!)); $ChangeRecordingData = 1; } @@ -1757,7 +1757,7 @@ WHERE my $newPath = join('.', @options); move($rec->{Path}, $newPath) - or return $console->err(sprintf(gettext("Recording: '%s', can't move to '%s' : %s"),$rec->{title},$newPath,$!)); + or return $console->err(sprintf(gettext("Recording: '%s', couldn't move to '%s' : %s"),$rec->{title},$newPath,$!)); $rec->{Path} = $newPath; $touchVDR = 1; @@ -1776,18 +1776,18 @@ WHERE my $parentnew = dirname($newPath); unless( -d $parentnew) { mkpath($parentnew) - or return $console->err(sprintf(gettext("Recording: '%s', can't mkpath: '%s' : %s"),$rec->{title},$parentnew,$!)); + or return $console->err(sprintf(gettext("Recording: '%s', couldn't mkpath: '%s' : %s"),$rec->{title},$parentnew,$!)); } move($rec->{Path},$newPath) - or return $console->err(sprintf(gettext("Recording: '%s', can't move to '%s' : %s"),$rec->{title},$data->{title},$!)); + or return $console->err(sprintf(gettext("Recording: '%s', couldn't move to '%s' : %s"),$rec->{title},$data->{title},$!)); my $parentold = dirname($rec->{Path}); if($obj->{videodir} ne $parentold and -d $parentold and is_empty_dir($parentold)) { rmdir($parentold) - or return $console->err(sprintf(gettext("Recording: '%s', can't remove '%s' : %s"),$rec->{title},$parentold,$!)); + or return $console->err(sprintf(gettext("Recording: '%s', couldn't remove '%s' : %s"),$rec->{title},$parentold,$!)); } $ChangeRecordingData = 1; @@ -1798,13 +1798,13 @@ WHERE if($dropEPGEntry) { # Delete EpgOld Entrys my $sth = $obj->{dbh}->prepare('DELETE FROM OLDEPG WHERE eventid = ?'); $sth->execute($rec->{EventId}) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } if($ChangeRecordingData) { my $sth = $obj->{dbh}->prepare('DELETE FROM RECORDS WHERE RecordMD5 = ?'); $sth->execute($recordid) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); } if($touchVDR) { #Ab 1.3.11 resync with touch /video/.update @@ -1850,8 +1850,8 @@ sub _loadreccmds { sub conv { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $data = shift || 0; $obj->_loadreccmds; @@ -1869,7 +1869,7 @@ sub conv { } my ($cmdid, $recid) = split(/[\s_]/, $data); - my $cmd = (split(':', $obj->{reccmds}->[$cmdid-1]))[-1] || return $console->err(gettext("Cannot find this command ID!")); + my $cmd = (split(':', $obj->{reccmds}->[$cmdid-1]))[-1] || return $console->err(gettext("Couldn't 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 recording "%s"%s', @@ -1920,7 +1920,7 @@ ORDER BY my $fields = fields($obj->{dbh}, $sql); my $sth = $obj->{dbh}->prepare($sql); $sth->execute($lastReportTime) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); unshift(@$erg, $fields); return { @@ -1939,7 +1939,7 @@ sub IdToPath { my $sth = $obj->{dbh}->prepare('select Path from RECORDS where RecordMD5 = ?'); $sth->execute($id) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchrow_hashref(); return $erg ? $erg->{Path} : undef; } @@ -1948,7 +1948,7 @@ sub IdToPath { sub getPreviewFiles { # ------------------ my $obj = shift || return error('No object defined!'); - my $id = shift || return error ('No EventID!' ); + my $id = shift || return error('No eventid defined!'); # look for pictures my $outdir = sprintf('%s/%lu_shot', $obj->{previewimages}, $id); @@ -1968,11 +1968,11 @@ sub getPreviewFiles { sub getGroupIds { # ------------------ my $obj = shift || return error('No object defined!'); - my $recid = shift || return error ('No recording defined!' ); + my $recid = shift || return error ('No recording defined!'); my $epgid = getDataById($recid, 'RECORDS', 'RecordMD5'); if(!$epgid) { - error sprintf("Can't find recording '%s'!", $recid); + error sprintf("Couldn't find recording '%s'!", $recid); return; } my $epgdata = main::getModule('EPG')->getId($epgid->{eventid}); @@ -2033,7 +2033,7 @@ sub translate { { $title =~ s/([^üäößa-z0-9\&\!\-\s\.\@\~\,\(\)\%\+])/sprintf('#%X', ord($1))/seig; $title =~ s/[^üäößa-z0-9\!\&\-\#\.\@\~\,\(\)\%\+]/_/sig; - # Windows can't handle '.' at the end of directory names + # Windows couldn't handle '.' at the end of directory names $title =~ s/(\.$)/\#2E/sig; $title =~ s/(\.~)/\#2E~/sig; } else { @@ -2091,10 +2091,11 @@ sub converttitle { } # ------------------ -sub suggest {# ------------------ +sub suggest { +# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $params = shift; @@ -2127,7 +2128,7 @@ LIMIT 25 |; my $sth = $obj->{dbh}->prepare($sql); $sth->execute('%'.$search.'%','%'.$search.'%') - or return error "Can't execute query: $sth->errstr."; + or return error "Couldn't execute query: $sth->errstr."; my $result = $sth->fetchall_arrayref(); $console->table($result) if(ref $console && $result); diff --git a/lib/XXV/MODULES/REMOTE.pm b/lib/XXV/MODULES/REMOTE.pm index 4eaba23..b462890 100644 --- a/lib/XXV/MODULES/REMOTE.pm +++ b/lib/XXV/MODULES/REMOTE.pm @@ -92,10 +92,10 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; - $self->init or return error('Problem to initialize module'); + $self->init or return error('Problem to initialize modul!'); return $self; } @@ -108,7 +108,7 @@ sub init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } @@ -152,8 +152,8 @@ sub parse { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $cmds = $obj->parse(); my @list = (['__Id', 'Name', 'Cmd']); @@ -168,9 +168,9 @@ sub list { sub command { # ------------------ 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!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $command = shift || return error('No command defined!'); my $cmds = $obj->parse(); return $console->err(gettext('This cmd id does not exist!')) @@ -182,7 +182,7 @@ sub command { lg $msg; my $out; - open(README, "$cmds->{$command}->{bat} 2>&1 |") or return error("Can't run program: $!"); + open(README, "$cmds->{$command}->{bat} 2>&1 |") or return error("Couldn't run program: $!"); while(<README>) { $out .= $_; } @@ -200,8 +200,8 @@ sub command { sub remote { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $command = shift; debug sprintf('Call remote with command "%s"%s', diff --git a/lib/XXV/MODULES/REPORT.pm b/lib/XXV/MODULES/REPORT.pm index 55e57fa..232693e 100644 --- a/lib/XXV/MODULES/REPORT.pm +++ b/lib/XXV/MODULES/REPORT.pm @@ -85,7 +85,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{LastReportTime} = time; @@ -101,7 +101,7 @@ sub new { ); # The Initprocess - my $erg = $self->init or return error('Problem to initialize module'); + my $erg = $self->init or return error('Problem to initialize modul!'); # Initiat after load modules ... main::after(sub{ @@ -193,7 +193,7 @@ sub report { sub news { # ------------------ my $obj = shift || return error('No object defined!'); - my $title = shift || return error ('No title!' ); + my $title = shift || return error('No title defined!'); my $text = shift || ''; my $cmd = shift || ''; my $id = shift || ''; @@ -201,7 +201,7 @@ sub news { # convert Levelname to integer my $lev = $obj->scala($levname) - || return error('Problem to analyze Level!'); + || return error('Problem to analyze level!'); my $url = sprintf("http://%s:%s/", $obj->{host}, main::getModule('HTTPD')->{Port}); $url = sprintf("%s?cmd=%s&data=%s", $url, $cmd, $id) @@ -238,8 +238,8 @@ sub news { sub request { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!' ); - my $console = shift || return error ('No Console!' ); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); # To this time you can set on # cmd=request&data=rss&ver=2 or # cmd=request&data=mail diff --git a/lib/XXV/MODULES/ROBOT.pm b/lib/XXV/MODULES/ROBOT.pm index 733b1aa..3a1f54f 100644 --- a/lib/XXV/MODULES/ROBOT.pm +++ b/lib/XXV/MODULES/ROBOT.pm @@ -65,7 +65,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; return $self; @@ -75,10 +75,10 @@ sub new { sub saveRobot { # ------------------ my $obj = shift || return error('No object defined!'); - my $rname = shift || return error ('No robot Name!' ); - my $rsub = shift || return error ('No Robot sub!' ); + my $rname = shift || return error('No robot name defined!'); + my $rsub = shift || return error('No robot subroutine defined!'); - return error("$rname is not a Code Reference!'") + return error("$rname is not a code reference!'") unless(ref $rsub eq 'CODE'); $obj->clean( $rname ); @@ -90,7 +90,7 @@ sub saveRobot { sub register { # ------------------ my $obj = shift || return error('No object defined!'); - my $rname = shift || return error ('No robot Name!' ); + my $rname = shift || return error('No robot name defined!'); my @args = @_; return error("$rname is not a Robot!'") @@ -103,7 +103,7 @@ sub register { sub start { # ------------------ my $obj = shift || return error('No object defined!'); - my $rname = shift || return error ('No Robot Name to start!'); + my $rname = shift || return error('No robot name defined!'); my $watcher = shift; my $console = shift; my $endcb = shift; @@ -115,7 +115,7 @@ sub start { } # fork and forget - defined(my $child = fork()) or die "Can't fork: $!"; + defined(my $child = fork()) or die "Couldn't fork: $!"; if($child == 0) { $obj->{dbh}->{InactiveDestroy} = 1; # create a new browser @@ -144,7 +144,7 @@ sub start { sub clean { # ------------------ my $obj = shift || return error('No object defined!'); - my $rname = shift || return error ('No Robot Name to clean!'); + my $rname = shift || return error('No robot name defined!'); delete $obj->{jobs}->{$rname}; } @@ -153,7 +153,7 @@ sub clean { sub result { # ------------------ my $obj = shift || return error('No object defined!'); - my $rname = shift || return error ('No robot Name!' ); + my $rname = shift || return error('No robot name defined!'); return $obj->{result}->{$rname}; diff --git a/lib/XXV/MODULES/SHARE.pm b/lib/XXV/MODULES/SHARE.pm index a052135..a7bb45b 100644 --- a/lib/XXV/MODULES/SHARE.pm +++ b/lib/XXV/MODULES/SHARE.pm @@ -106,11 +106,11 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # The Initprocess - $self->_init or return error('Problem to initialize module'); + $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -128,7 +128,7 @@ sub _init { $obj->{SOAP} = $obj->ConnectToSOAP($obj->{SessionId}); unless($obj->{SOAP}) { - error("Can't connect to SOAP server %s!", $obj->{uri}); + error("Couldn't connect to SOAP server %s!", $obj->{uri}); return 0; } else { $obj->getSoapData(); @@ -179,7 +179,7 @@ sub generateUniqueId { sub ConnectToSOAP { # ------------------ my $obj = shift || return error('No object defined!'); - my $sid = shift || $obj->{SessionId} || return error ('No SesionID!' ); + my $sid = shift || $obj->{SessionId} || return error('No session id defined!'); my $uri = shift || $obj->{uri}; my $prx = shift || $obj->{proxy}; @@ -193,7 +193,7 @@ sub ConnectToSOAP { my $usrkey; if($soap) { - $usrkey = $obj->CmdToSoap($soap,'getUsrKey',$obj->{SessionId}) or error "Can't get user key"; + $usrkey = $obj->CmdToSoap($soap,'getUsrKey',$obj->{SessionId}) or error "Couldn't get user key"; error "Response contain wrong answer" if($usrkey ne $obj->{SessionId}); } @@ -219,8 +219,8 @@ sub getEventLevel { sub TopTen { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $anzahl = shift || 10; $obj->{TopTen} = $obj->getTopTen(1000) @@ -260,8 +260,8 @@ sub TopTen { sub CmdToSoap { # ------------------ my $obj = shift || return error('No object defined!'); - my $soap = shift || return error ('No SOAP!' ); - my $cmd = shift || return error ('No Command!' ); + my $soap = shift || return error('No SOAP defined!'); + my $cmd = shift || return error('No command defined!'); my @arg = @_; lg(sprintf("CmdToSoap : %s - %s",$cmd, join(", ",@arg))); diff --git a/lib/XXV/MODULES/STATUS.pm b/lib/XXV/MODULES/STATUS.pm index a658059..3cbf009 100644 --- a/lib/XXV/MODULES/STATUS.pm +++ b/lib/XXV/MODULES/STATUS.pm @@ -145,7 +145,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your System:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # Interval to read timers and put to DB @@ -193,8 +193,8 @@ sub remember { sub vitals { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $output = { name => $obj->name(), @@ -220,8 +220,8 @@ sub vitals { sub network { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $interfaces = $obj->netDevs(); my $param = { @@ -238,8 +238,8 @@ sub network { sub hardware { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my ($number, $model, $speed, $cache, $bogomips) = $obj->CPU(); my $pci = $obj->pci(); @@ -266,8 +266,8 @@ sub hardware { sub memory { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $ret = $obj->meminfo(); my $param = { @@ -284,8 +284,8 @@ sub memory { sub filesys { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $ret = $obj->mounts(); my $param = { @@ -494,7 +494,7 @@ sub CPU { sub util { my $obj = shift || return error('No object defined!'); - open(STAT, "/proc/stat") or return error "Can't open /proc/stat\n"; + open(STAT, "/proc/stat") or return error "Couldn't open /proc/stat\n"; my $buffer = <STAT>; close(STAT); @@ -507,7 +507,7 @@ sub util { #take an argument < 1 sleep(1); - open (STAT, "/proc/stat") or return error "Can't open /proc/stat\n"; + open (STAT, "/proc/stat") or return error "Couldn't open /proc/stat\n"; $buffer = <STAT>; close(STAT); @@ -535,7 +535,7 @@ sub users { 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"; + or return error "Couldn't execute $obj->{whoBinary} or $obj->{wcBinary}\n"; $result =~ s/\n//g; return $result; @@ -609,7 +609,7 @@ sub scsi { my $cd_no = '0'; my $st_no = '0'; open(F,$file) - or return error "Can't open $file : $!\n";; + or return error "Couldn't open $file : $!\n";; while(<F>) { if(/Host: (\S+) Channel: (\d+) Id: (\d+) Lun: (\d+)/) { $host = $1, $channel = $2, $id = $3, $lun = $4; @@ -683,7 +683,7 @@ sub mounts{ my $clr = shift || 0; my $df = `$obj->{dfBinary} -TP -x cdfs -x iso9660 -x udf` - or return error "Can't execute $obj->{dfBinary} $!\n"; + or return error "Couldn't execute $obj->{dfBinary} $!\n"; my $ret = [[qw/FS Typ Space Used Free Cap. Mount/]]; foreach my $zeile (split('\n', $df)) { @@ -706,7 +706,7 @@ sub mounts{ sub videoMounts { # ------------------ my $obj = shift || return error('No object defined!'); - my $videodir = shift || return error ('No Video dir!'); + my $videodir = shift || return error('No video path defined!'); my $mounts = $obj->mounts; my $ret = []; @@ -738,7 +738,7 @@ sub findttf }, $obj->{paths}->{FONTPATH} ); - error "Can't find useful font at : $obj->{paths}->{FONTPATH}" + error "Couldn't find useful font at : $obj->{paths}->{FONTPATH}" if(scalar $found == 0); return $found; } @@ -747,7 +747,7 @@ sub findttf sub watchDog { # ------------------ my $obj = shift || return error('No object defined!'); - my $mou = shift || return error ('No Data!' ); + my $mou = shift || return error('No data defined!'); # Not all 15 seconds a panic message ;) return if($obj->{LastWarning}+900 > time); diff --git a/lib/XXV/MODULES/STREAM.pm b/lib/XXV/MODULES/STREAM.pm index 84b72d6..e2c4aa2 100644 --- a/lib/XXV/MODULES/STREAM.pm +++ b/lib/XXV/MODULES/STREAM.pm @@ -82,11 +82,11 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your System:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # The Initprocess - my $erg = $self->init or return error('Problem to initialize module'); + my $erg = $self->init or return error('Problem to initialize modul!'); return $self; } @@ -104,8 +104,8 @@ sub init { sub live_stream { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $channel = shift || return $console->err(gettext("No ChannelID to Stream! Please use livestream 'cid'")); debug sprintf('Call live stream with channel "%s"%s', @@ -137,14 +137,14 @@ sub live_stream { sub play_record { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $recid = shift || return $console->err(gettext("No RecordID to Play! Please use rplay 'rid'")); my $rmod = main::getModule('RECORDS'); my $videopath = $rmod->{videodir}; my $path = $rmod->IdToPath($recid) - or return $console->err(gettext(sprintf('I can\'t found recid: %s', $recid))); + or return $console->err(gettext(sprintf("Couldn't find recording: '%s'", $recid))); debug sprintf('Call play record "%s"%s', $path, diff --git a/lib/XXV/MODULES/SVDRP.pm b/lib/XXV/MODULES/SVDRP.pm index 493583a..9fe4b3f 100644 --- a/lib/XXV/MODULES/SVDRP.pm +++ b/lib/XXV/MODULES/SVDRP.pm @@ -84,7 +84,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle @@ -200,7 +200,7 @@ sub command { sub status { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); + my $watcher = shift || return error('No watcher defined!'); my $console = shift || return; my $erg = $obj->command('stat disk'); @@ -212,8 +212,8 @@ sub status { sub scommand { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || return $console->err(gettext("No command defined! Please use scommand 'cmd'.")); my $erg = $obj->command($text); diff --git a/lib/XXV/MODULES/TELNET.pm b/lib/XXV/MODULES/TELNET.pm index d12fbeb..90fcfe1 100644 --- a/lib/XXV/MODULES/TELNET.pm +++ b/lib/XXV/MODULES/TELNET.pm @@ -108,14 +108,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - $self->init or return error('Problem to initialize module'); + $self->init or return error('Problem to initialize modul!'); return $self; } @@ -137,7 +137,7 @@ sub init { LocalPort => $obj->{Port}, LocalAddr => $obj->{Interface}, Reuse => 1 - ) or return error("Can't create Socket: $!"); + ) or return error("Couldn't create socket: $!"); # install an initial watcher Event->io( @@ -151,7 +151,7 @@ sub init { # accept client my $client=$socket->accept; - panic "Can't connect telnet to new client.\n" and return unless $client; + panic "Couldn't connect to new telnet client." and return unless $client; $client->autoflush; my $console = XXV::OUTPUT::Console->new( @@ -232,8 +232,8 @@ sub init { sub handleInput { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $line = shift || return; my $user = shift || $console->{USER}; @@ -256,7 +256,7 @@ sub handleInput { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - return main::getModule('HTTPD')->usage(@_); + return main::getModule('CONFIG')->usage(@_); } 1; diff --git a/lib/XXV/MODULES/TIMERS.pm b/lib/XXV/MODULES/TIMERS.pm index f3e59b8..f4a3b7d 100644 --- a/lib/XXV/MODULES/TIMERS.pm +++ b/lib/XXV/MODULES/TIMERS.pm @@ -309,7 +309,7 @@ sub status { my $sth = $obj->{dbh}->prepare("select count(*) as count from TIMERS"); if(!$sth->execute()) { - error sprintf("Can't execute query: %s.",$sth->errstr); + error sprintf("Couldn't execute query: %s.",$sth->errstr); } else { my $erg = $sth->fetchrow_hashref(); $total = $erg->{count} if($erg && $erg->{count}); @@ -343,14 +343,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -399,7 +399,7 @@ sub _init { main::after(sub{ $obj->{svdrp} = main::getModule('SVDRP'); unless($obj->{svdrp}) { - panic ("Can't get modul SVDRP"); + panic ("Couldn't get modul SVDRP"); return 0; } @@ -424,7 +424,7 @@ sub _init { sub saveTimer { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error('No Data to Save!'); + my $data = shift || return error('No data defined!'); my $timerid = shift || 0; my $status = ($data->{Activ} eq 'y' ? 1 : 0); @@ -465,7 +465,7 @@ sub saveTimer { ], $pos); } - event('Save timer "%s" with TimerId: "%d"', $data->{File}, $pos); + event('Save timer "%s" with id: "%d"', $data->{File}, $pos); return $erg; } @@ -474,8 +474,8 @@ sub saveTimer { sub newTimer { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $epgid = shift || 0; my $epg = shift || 0; @@ -537,8 +537,8 @@ WHERE sub editTimer { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $timerid = shift || 0; # If timerid the edittimer my $data = shift || 0; # Data for defaults @@ -780,8 +780,8 @@ WHERE sub deleteTimer { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift; - my $console = shift; + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $timerid = shift || return $console->err(gettext("No timer defined for deletion! Please use tdelete 'tid'.")); # If timerid the edittimer my $answer = shift || 0; @@ -790,7 +790,7 @@ sub deleteTimer { my $sql = sprintf('SELECT Id,File,ChannelID,NextStartTime,IF(Status & 1 and NOW() between NextStartTime and NextStopTime,1,0) as Running FROM TIMERS where Id in (%s)', join(',' => ('?') x @timers)); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@timers) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $data = $sth->fetchall_hashref('Id'); my $mod = main::getModule('CHANNELS') or return; @@ -844,8 +844,8 @@ sub deleteTimer { sub toggleTimer { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); 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); @@ -853,7 +853,7 @@ sub toggleTimer { my $sql = sprintf('SELECT Id,File,Status,NextStartTime, NextStopTime FROM TIMERS where Id in (%s)', join(',' => ('?') x @timers)); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@timers) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $data = $sth->fetchall_hashref('Id'); my $ref; @@ -898,7 +898,7 @@ sub toggleTimer { join(',' => ('?') x @timers),$ref); my $sth = $obj->{dbh}->prepare($sql); $sth->execute(@timers) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $erg = $sth->fetchall_arrayref(); $console->table($erg); } @@ -932,7 +932,7 @@ sub insert { # NextTime my $nexttime = $obj->getNextTime( $data->[3], $data->[4], $data->[5] ) - or return error(sprintf("Can't get time form this data: %s", join(' ', @$data))); + or return error(sprintf("Couldn't get time form this data: %s", join(' ', @$data))); push(@$data, $nexttime->{start}, $nexttime->{stop}); # insert placeholder @@ -1022,7 +1022,7 @@ sub readData { $obj->{REGISTER}++; if(scalar keys %$oldTimers != $c or $obj->{REGISTER} == 2) { # Event to signal we are finish to read - event(sprintf('Reread %d timers and written to DB!', $c)); + event(sprintf('Reread %d timers and written into database!', $c)); } $console->message(sprintf(gettext("%d timer written to database."), $c), {overlapping => $overlapping}) @@ -1059,8 +1059,8 @@ sub updated { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $text = shift || ''; my $in = ''; @@ -1152,7 +1152,7 @@ ORDER BY sub getTimerById { # ------------------ my $obj = shift || return error('No object defined!'); - my $tid = shift || return error ('No TimerId!' ); + my $tid = shift || return error('No id defined!'); my $sql = qq| SELECT @@ -1311,7 +1311,7 @@ sub getEpgIds { sub getEpgDesc { # ------------------ my $obj = shift || return error('No object defined!'); - my $tid = shift || return error ('No TimerId!' ); + my $tid = shift || return error('No id defined!'); my $sql = qq| select @@ -1367,7 +1367,7 @@ where TIMERS.ChannelID = CHANNELS.Id sub checkOverlapping { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $NextStartTime = $data->{NextStartTime}; my $NextStopTime = $data->{NextStopTime}; @@ -1401,7 +1401,7 @@ ORDER BY $NextStartTime,$NextStopTime, $NextStartTime,$NextStopTime, $tid,$transponder,$source) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $result = $sth->fetchall_arrayref(); if(scalar @{$result}) { @@ -1492,7 +1492,7 @@ sub getNextTimer { sub _getNextEpgId { # ------------------ my $obj = shift || return error('No object defined!'); - my $timer = shift || return error ('No Hash!' ); + my $timer = shift || return error('No data defined!'); my $e; my @file = split('~', $timer->{File}); @@ -1512,7 +1512,7 @@ sub _getNextEpgId { '%'.$file[-2].'%', '%'.$file[-1].'%', $timer->{NextStartTime})) { - lg sprintf("Can't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ); + lg sprintf("Couldn't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ); return 0; } $e = $sth->fetchrow_hashref(); @@ -1531,14 +1531,14 @@ sub _getNextEpgId { $timer->{NextStopTime}, '%'.$timer->{File}.'%', $timer->{NextStartTime})) { - lg sprintf("Can't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ); + lg sprintf("Couldn't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ); return 0; } $e = $sth->fetchrow_hashref(); } - lg sprintf("Can't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ) + lg sprintf("Couldn't find epg event for timer with id %d - %s", $timer->{Id} , $timer->{File} ) if(not exists $e->{eventid}); return $e; } @@ -1550,9 +1550,9 @@ sub _getNextEpgId { sub getNextTime { # ------------------ 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!' ); + my $dor = shift || return error('No day defined!'); + my $start = shift || return error('No start time defined!'); + my $stop = shift || return error('No stop time defined!'); $start = sprintf('%04d', $start); $stop = sprintf('%04d', $stop); @@ -1641,7 +1641,7 @@ sub getTimersByAutotimer { activeTimer => [], deactiveTimer => [], }; - my $erg = getDataBySearch('TIMERS', sprintf('AutotimerId = %d', $aid)); + my $erg = getDataBySearch('TIMERS', 'AutotimerId = ?', $aid); map { my $type = ($_->[1] ? 'activeTimer' : 'deactiveTimer'); push(@{$obj->{AIDS}->{$aid}->{$type}}, $_->[0]); @@ -1686,10 +1686,11 @@ sub my_strftime { } # ------------------ -sub suggest {# ------------------ +sub suggest { +# ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $params = shift; @@ -1709,7 +1710,7 @@ sub suggest {# ------------------ |; my $sth = $obj->{dbh}->prepare($sql); $sth->execute('%'.$search.'%') - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); my $result = $sth->fetchall_arrayref(); $console->table($result) if(ref $console && $result); diff --git a/lib/XXV/MODULES/USER.pm b/lib/XXV/MODULES/USER.pm index 8ab2f0a..497eaf7 100644 --- a/lib/XXV/MODULES/USER.pm +++ b/lib/XXV/MODULES/USER.pm @@ -103,8 +103,8 @@ or the same parameter is set for each function."), description => gettext("Log out from current session."), short => 'exit', callback => sub{ - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); if($obj->{active} eq 'y') { $console->message(gettext("Session closed.")); @@ -169,14 +169,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - my $erg = $self->_init or return error('Problem to initialize module'); + my $erg = $self->_init or return error('Problem to initialize modul!'); return $self; } @@ -227,8 +227,8 @@ sub _init { # ------------------ sub create { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $data = shift || 0; @@ -240,8 +240,8 @@ sub create { sub userprefs { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || $obj->{USER}->{Id}; my $data = shift || 0; @@ -323,8 +323,8 @@ sub userprefs { # ------------------ sub edit { my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $id = shift || 0; my $data = shift || 0; @@ -490,9 +490,9 @@ sub edit { # ------------------ sub delete { 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 user account defined to delete! Please use udelete 'uid'.")); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); + my $id = shift || return $console->err(gettext("No user account defined for deletion! Please use udelete 'uid'.")); my $sth = $obj->{dbh}->prepare('delete from USER where Id = ?'); $sth->execute($id) @@ -514,8 +514,8 @@ sub delete { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my %f = ( 'Id' => umlaute(gettext('Service')), @@ -625,7 +625,7 @@ sub check { # check User my $sth = $obj->{dbh}->prepare('select * from USER where Name = ? and Password = md5( ? )'); $sth->execute($name, $password) - or return error sprintf("Can't execute query: %s.",$sth->errstr); + or return error sprintf("Couldn't execute query: %s.",$sth->errstr); $obj->{USER} = $sth->fetchrow_hashref(); # Set the user settings from user @@ -691,9 +691,9 @@ sub setUserSettings { sub allowCommand { # ------------------ 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'); + my $modCfg = shift || return error('No modul defined!'); + my $cmdName = shift || return error('No command name defined!'); + my $user = shift || return error('No user defined!'); my $DontdumpViolation = shift || ''; if( @@ -734,8 +734,8 @@ sub t_checkCommand { # ------------------ sub checkCommand { my $obj = shift || return error('No object defined!'); - my $console = shift || return error ('No Console' ); - my $ucmd = shift || return error ('No Command' ); + my $console = shift || return error('No console defined!'); + my $ucmd = shift || return error('No command defined!'); my $DontdumpViolation = shift || ''; my $mods = main::getModules(); @@ -775,7 +775,7 @@ sub checkCommand { } } unless($ok) { - $err = sprintf(gettext("I do not understand the command '%s' \n"), $ucmd); + $err = sprintf(gettext("Sorry, couldn't understand command '%s'!\n"), $ucmd); $shorterr = 'noexists'; } @@ -907,7 +907,7 @@ sub userTmp { my $dir = sprintf('%s/%s/%d', $obj->{tempimages} , $user, $$); unless(-d $dir) { - mkpath($dir) or error "Can't mkpath $dir : $!"; + mkpath($dir) or error "Couldn't mkpath $dir : $!"; } # Nach Logout oder beenden von xxv das temp löschen diff --git a/lib/XXV/MODULES/VTX.pm b/lib/XXV/MODULES/VTX.pm index fbf214a..d01184c 100644 --- a/lib/XXV/MODULES/VTX.pm +++ b/lib/XXV/MODULES/VTX.pm @@ -83,7 +83,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; return $self; @@ -94,12 +94,12 @@ sub new { # Find first usable channel sub findfirst { - my $self = shift || return error ('No Object!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $self = shift || return error('No object defined!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $basedir = $self->{dir} - || return $self->pagedump($console,gettext("directory is for modul vtx not registered!"),""); + || return $self->pagedump($console,gettext("Directory is for modul vtx not registered!"),""); my $mod = main::getModule ('CHANNELS'); my $channels =[]; @@ -124,12 +124,12 @@ sub findfirst { # Callback "Channel choice" sub channel { - my $self = shift || return error ('No Object!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $self = shift || return error('No object defined!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $channel = shift || return $self->findfirst ($watcher, $console); - my $basedir = $self->{dir} || return error ('No Base Directory defined !'); + my $basedir = $self->{dir} || return error ('No base directory defined!'); my $cache = $self->{cache} || 'packed'; my $mod = main::getModule ('CHANNELS'); @@ -214,7 +214,7 @@ sub channel # warn($dump); # } - $console->message(sprintf(gettext("channel \'%s\' for modul vtx registered."),$channelname)) + $console->message(sprintf(gettext("Channel \'%s\' for modul vtx registered."),$channelname)) if ($console->{TYP} ne 'HTML') ; } else { $self->pagedump($console,sprintf(gettext("No data found for \'%s\'!"),$channelname),""); @@ -227,13 +227,13 @@ sub channel ################################################################################ # Callback "Teletextpage choice" sub page { - my $self = shift || return error ('No Object!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $self = shift || return error('No object defined!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $page = shift || ""; my $channel = $self->{CHANNEL} || return $self->findfirst ($watcher, $console); - my $basedir = $self->{dir} || return error ('No Base Directory defined !'); - my $chandir = $self->{CHANNELDIR} || return error ('No CHANNEL'); + my $basedir = $self->{dir} || return error('No base directory defined!'); + my $chandir = $self->{CHANNELDIR} || return error('No channel defined!'); my $cache = $self->{cache} || 'packed'; my @pp = split ('_', $page); @@ -263,8 +263,8 @@ sub page { ################################################################################ # Generate Message sub pagedump { - my $self = shift || return error ('No Object!'); - my $console = shift || return error ('No Console'); + my $self = shift || return error('No object defined!'); + my $console = shift || return error('No console defined!'); my $result = shift; my $chandir = shift; @@ -414,14 +414,14 @@ sub NavigatePages { ################################################################################ # Our internal real page deliverer sub realpage { - my $self = shift || return error ('No Object!'); - my $console = shift || return error ('No Console!'); - my $mainpage= shift || return error ('No Page!'); - my $subpage = shift || return error ('No Subpage!'); + my $self = shift || return error('No object defined!'); + my $console = shift || return error('No console defined!'); + my $mainpage= shift || return error('No page defined!'); + my $subpage = shift || return error('No sub page defined!'); my $bHTML = shift; - my $basedir = $self->{dir} || return error ('No directory is defined!'); - my $chandir = $self->{CHANNELDIR} || return error ('No CHANNEL'); + my $basedir = $self->{dir} || return error('No base directory defined!'); + my $chandir = $self->{CHANNELDIR} || return error('No channel defined!'); my $cache = $self->{cache} || 'packed'; ################################################################################ # get filename @@ -438,7 +438,7 @@ sub realpage { # Now open and read this file my $fh = FileHandle->new; if(!$fh->open($filename)) { - $self->pagedump($console,gettext("The page could not be found!"),""); + $self->pagedump($console,gettext("Couldn't find page!"),""); return ""; } @@ -1065,7 +1065,7 @@ sub readpage { my $notfound = 1; while($notfound == 1) { if($fh->read($tocbuf, 4*2*8) ne 64) { - $self->pagedump($console,gettext("The page could not readed!"),""); + $self->pagedump($console,gettext("Couldn't read page!"),""); return ""; } my @toc = unpack( "i*", $tocbuf); @@ -1075,7 +1075,7 @@ sub readpage { my $spage = int(sprintf ("%X",@toc[($n*2)+1])); # Check for last toc entry 0/0 if($mpage == 0 and $spage == 0) { - $self->pagedump($console,gettext("The page could not be found!"),""); + $self->pagedump($console,gettext("Couldn't find page!"),""); return ""; } # Look for toc entry same wanted page @@ -1093,7 +1093,7 @@ sub readpage { --$n if($notfound == 0); # Skip unwanted Pages if(0 == $fh->seek((972*$n), 1)) { - $self->pagedump($console,gettext("The page could not readed!"),""); + $self->pagedump($console,gettext("Couldn't read page!"),""); return ""; } } @@ -1105,7 +1105,7 @@ sub readpage { # Read page now my $packed; if($fh->read($packed, 972) ne 972) { - $self->pagedump($console,gettext("The page could not readed!"),""); + $self->pagedump($console,gettext("Couldn't read page!"),""); return ""; } my $result = ""; @@ -1252,7 +1252,7 @@ sub GetPackedToc { my @index; my $fh = FileHandle->new; if(!$fh->open($filename)) { - error ("The page could not be found! : $filename"); + error ("Couldn't find page! : $filename"); } else { # Parse TOC # @@ -1331,9 +1331,9 @@ sub HighLight { ################################################################################ # Callback "Teletext search" sub search { - my $self = shift || return error ('No Object!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $self = shift || return error('No object defined!'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $search = shift; my $channel = $self->{CHANNEL}; diff --git a/lib/XXV/MODULES/WAPD.pm b/lib/XXV/MODULES/WAPD.pm index 26966ef..fc0dd8e 100644 --- a/lib/XXV/MODULES/WAPD.pm +++ b/lib/XXV/MODULES/WAPD.pm @@ -111,14 +111,14 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # read the DB Handle $self->{dbh} = delete $attr{'-dbh'}; # The Initprocess - $self->init or return error('Problem to initialize module'); + $self->init or return error('Problem to initialize modul!'); return $self; } @@ -138,7 +138,7 @@ sub init { LocalPort => $obj->{Port}, LocalAddr => $obj->{Interface}, Reuse => 1 - ) or return error("Can't create Socket: $!"); + ) or return error("Couldn't create socket: $!"); # install an initial watcher Event->io( @@ -147,7 +147,7 @@ sub init { cb => sub { # accept client my $client=$socket->accept; - panic "Can't connect wapd to new client." and return unless $client; + panic "Couldn't connect to new wap client." and return unless $client; $client->autoflush; # make "channel" number @@ -245,7 +245,7 @@ sub init { sub parseRequest { # ------------------ my $obj = shift || return error('No object defined!'); - my $hdl = shift || return error ('No Handle!' ); + my $hdl = shift || return error('No handle defined!'); my $logout = shift || 0; my ($Req, $size) = getFromSocket($hdl); @@ -283,8 +283,8 @@ sub parseRequest { sub handleInput { # ------------------ my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); + my $watcher = shift || return error('No watcher defined!'); + my $console = shift || return error('No console defined!'); my $cgi = shift || return error ('No CGI Object'); my $ucmd = $cgi->param('cmd') || '<undef>'; @@ -327,7 +327,7 @@ sub handleInput { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - return main::getModule('HTTPD')->usage(@_); + return main::getModule('CONFIG')->usage(@_); } # ------------------ @@ -347,7 +347,7 @@ sub findskins }, $obj->{paths}->{HTMLDIR} ); - error "Can't find useful WML Skin at : $obj->{paths}->{HTMLDIR}" + error "Couldn't find useful WML Skin at : $obj->{paths}->{HTMLDIR}" if(scalar $found == 0); return $found; } diff --git a/lib/XXV/OUTPUT/Ajax.pm b/lib/XXV/OUTPUT/Ajax.pm index 772ca54..c5ce83d 100644 --- a/lib/XXV/OUTPUT/Ajax.pm +++ b/lib/XXV/OUTPUT/Ajax.pm @@ -58,7 +58,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{handle} = $attr{'-handle'} @@ -154,7 +154,7 @@ sub printout { sub header { # ------------------ my $obj = shift || return error('No object defined!'); - my $typ = shift || return error ('No Type!' ); + my $typ = shift || return error('No type defined!'); my $arg = shift || {}; $arg->{'Content-encoding'} = 'gzip' @@ -216,7 +216,7 @@ sub typ { sub setCall { # ------------------ my $obj = shift || return error('No object defined!'); - my $name = shift || return error ('No Name!' ); + my $name = shift || return error('No name defined!'); $obj->{call} = $name; return $obj->{call}; diff --git a/lib/XXV/OUTPUT/Console.pm b/lib/XXV/OUTPUT/Console.pm index 7d46545..a450227 100644 --- a/lib/XXV/OUTPUT/Console.pm +++ b/lib/XXV/OUTPUT/Console.pm @@ -60,7 +60,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{handle} = $attr{'-handle'} @@ -94,7 +94,7 @@ sub new { sub printout { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); $data =~ s/[^\r]\n/\r\n/sig; @@ -106,7 +106,7 @@ sub printout { sub message { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $t = Text::ASCIITable->new(); $t->setOptions( $obj->{TableDefaults} ); @@ -124,7 +124,7 @@ sub message { sub push { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); $obj->printout($data); } @@ -132,7 +132,7 @@ sub push { sub msg { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $err = shift || return $obj->message($data); $obj->err($data) if($err); @@ -142,7 +142,7 @@ sub msg { sub err { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $t = Text::ASCIITable->new; $t->setOptions( $obj->{TableDefaults} ); @@ -160,7 +160,7 @@ sub err { sub menu { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $t = Text::ASCIITable->new; $t->setOptions( $obj->{TableDefaults} ); @@ -184,7 +184,7 @@ sub menu { sub littlemenu { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $text = $data->{title}."\n"; $text .= gettext("Please use the command and one of the following sectors:\n"); @@ -197,7 +197,7 @@ sub littlemenu { sub login { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $questions = [ 'Name' => { @@ -219,7 +219,7 @@ sub login { sub table { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); my $param = shift || {}; my $noPrint = shift || 0; @@ -281,7 +281,7 @@ sub question { # ------------------ my $obj = shift || return error('No object defined!'); my $title = shift || 0; - my $questions = shift || return error ('No Data!' ); + my $questions = shift || return error('No data defined!'); my $erg = shift || {}; my $quest; @@ -340,7 +340,7 @@ sub question { sub list { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; my $def; @@ -390,7 +390,7 @@ sub list { sub string { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; @@ -459,7 +459,7 @@ sub date { sub integer { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; @@ -496,7 +496,7 @@ sub integer { sub confirm { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; @@ -534,7 +534,7 @@ sub confirm { sub hidden { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); return error('No <def> in hidden Variable!') unless(defined $data->{def}); @@ -545,16 +545,16 @@ sub hidden { sub image { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data to display'); + my $data = shift || return error('No data defined!'); - return $obj->message(gettext("Sorry, cannot display images in this interface.")); + return $obj->message(gettext("Sorry, couldn't display images in this interface.")); } # ------------------ sub checkbox { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; @@ -587,7 +587,7 @@ sub checkbox { sub radio { # ------------------ my $obj = shift || return error('No object defined!'); - my $data = shift || return error ('No Data!' ); + my $data = shift || return error('No data defined!'); my $t = $obj->{term}; my $error; @@ -625,7 +625,7 @@ sub radio { sub pod { # ------------------ my $obj = shift || return error('No object defined!'); - my $modname = uc(shift) || return error ('No Modname!' ); + my $modname = uc(shift) || return error('No modul name defined!'); $modname = ucfirst($modname) if($modname eq 'GENERAL'); my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname); @@ -652,7 +652,7 @@ sub pod { sub txtfile { # ------------------ my $obj = shift || return error('No object defined!'); - my $filename = shift || return error ('No TxtFile to diplay!' ); + my $filename = shift || return error('No file defined!'); my $param = shift || {}; my $txtfile = sprintf('%s/%s.txt', $obj->{paths}->{DOCPATH}, $filename); @@ -709,8 +709,8 @@ sub _myallowansi_cb { sub _parseData { # ------------------ my $obj = shift || return error('No object defined!'); - my $fields = shift || return error ('No Fields!' ); - my $data = shift || return error ('No Data!' ); + my $fields = shift || return error('No field defined!'); + my $data = shift || return error('No data defined!'); my $displayFields = []; @$displayFields = grep(!/^__/, @$fields); @@ -735,7 +735,7 @@ sub _parseData { # ------------------ 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/Dump.pm b/lib/XXV/OUTPUT/Dump.pm index c7c4d35..60dbc50 100644 --- a/lib/XXV/OUTPUT/Dump.pm +++ b/lib/XXV/OUTPUT/Dump.pm @@ -45,7 +45,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{TYP} = 'INTERFACE'; diff --git a/lib/XXV/OUTPUT/Html.pm b/lib/XXV/OUTPUT/Html.pm index efd36c7..a3189ed 100644 --- a/lib/XXV/OUTPUT/Html.pm +++ b/lib/XXV/OUTPUT/Html.pm @@ -65,7 +65,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{handle} = $attr{'-handle'} @@ -458,7 +458,7 @@ sub status404 { $file =~ s/$obj->{htmdir}\///g; # Don't post html root, avoid spy out - $obj->statusmsg(404,sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why), + $obj->statusmsg(404,sprintf(gettext("Couldn't open file '%s' : %s!"),$file,$why), gettext("Not found")); } @@ -642,7 +642,7 @@ sub datei { my $child = fork(); if ($child < 0) { - error("Can't create process for streaming : " . $!); + error("Couldn't create process for streaming : " . $!); return $obj->status404($file,$!); } elsif ($child > 0) { diff --git a/lib/XXV/OUTPUT/NEWS/JABBER.pm b/lib/XXV/OUTPUT/NEWS/JABBER.pm index 18e5602..09300a4 100644 --- a/lib/XXV/OUTPUT/NEWS/JABBER.pm +++ b/lib/XXV/OUTPUT/NEWS/JABBER.pm @@ -148,7 +148,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{TYP} = 'text/plain'; @@ -157,8 +157,8 @@ sub new { main::after(sub{ # The Initprocess my $erg = $self->init - or return error('Problem to initialize news module'); - }, "NEWS::JABBER: Start initiate the Jabber module ...") + or return error('Problem to initialize news modul!'); + }, "NEWS::JABBER: Start initiate the jabber modul ...") if($self->{active} eq 'y'); return $self; @@ -222,7 +222,7 @@ sub jdisconnect { sub send { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No Vars!' ); + my $vars = shift || return error('No data defined!'); return undef, lg('This function is deactivated!') if($obj->{active} ne 'y'); @@ -245,7 +245,7 @@ sub send { sub read { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No News!' ); + my $vars = shift || return error('No data defined!'); return $obj->send($vars); @@ -270,7 +270,7 @@ sub req { if($obj->send($vars)) { return sprintf('Message is send to %s at %s', $obj->{receiveUser}, datum($vars->{AddDate}, 'voll')); } else { - return sprintf('Upps, problem send Message to %s at %s', $obj->{receiveUser}, datum($vars->{AddDate}, 'voll')); + return sprintf("Sorry, couldn't send message to %s at %s", $obj->{receiveUser}, datum($vars->{AddDate}, 'voll')); } } diff --git a/lib/XXV/OUTPUT/NEWS/MAIL.pm b/lib/XXV/OUTPUT/NEWS/MAIL.pm index 8ef872b..78089b6 100644 --- a/lib/XXV/OUTPUT/NEWS/MAIL.pm +++ b/lib/XXV/OUTPUT/NEWS/MAIL.pm @@ -135,7 +135,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; # create Template object @@ -161,7 +161,7 @@ sub new { # The Initprocess my $erg = $self->init - or return error('Problem to initialize news module') + or return error('Problem to initialize news modul!') if($self->{active} eq 'y'); $self->{TYP} = 'text/plain'; @@ -271,7 +271,7 @@ sub parseFooter { sub read { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No News!' ); + my $vars = shift || return error('No data defined!'); my $output = ''; $vars->{count} = ++$obj->{NEWSCOUNT}; diff --git a/lib/XXV/OUTPUT/NEWS/RSS.pm b/lib/XXV/OUTPUT/NEWS/RSS.pm index 129452b..b4d5293 100644 --- a/lib/XXV/OUTPUT/NEWS/RSS.pm +++ b/lib/XXV/OUTPUT/NEWS/RSS.pm @@ -81,7 +81,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{TYP} = 'application/xhtml+xml'; @@ -90,8 +90,8 @@ sub new { main::after(sub{ # The Initprocess my $erg = $self->init - or return error('Problem to initialize News Module'); - }, "NEWS::RSS: Start initiate the RSS Feed ...") + or return error('Problem to initialize news modul!'); + }, "NEWS::RSS: Start initiate rss feed ...") if($self->{active} eq 'y'); @@ -167,7 +167,7 @@ sub createRSS { sub send { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No Vars!' ); + my $vars = shift || return error('No data defined!'); ++$obj->{COUNT}; @@ -187,7 +187,7 @@ sub send { sub read { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No News!' ); + my $vars = shift || return error('No data defined!'); return undef, lg('This function is deactivated!') if($obj->{active} ne 'y'); diff --git a/lib/XXV/OUTPUT/NEWS/VDR.pm b/lib/XXV/OUTPUT/NEWS/VDR.pm index 38ad12a..c0072a9 100644 --- a/lib/XXV/OUTPUT/NEWS/VDR.pm +++ b/lib/XXV/OUTPUT/NEWS/VDR.pm @@ -78,7 +78,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{TYP} = 'text/plain'; @@ -87,8 +87,8 @@ sub new { main::after(sub{ # The Initprocess my $erg = $self->init - or return error('Problem to initialize news module'); - }, "NEWS::VDR: Start initiate the News vdr module ...") + or return error('Problem to initialize news modul!'); + }, "NEWS::VDR: Start initiate news vdr module ...") if($self->{active} eq 'y'); return $self; @@ -110,7 +110,7 @@ sub init { sub send { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No Vars!' ); + my $vars = shift || return error('No data defined!'); return undef, lg('This function is deactivated!') if($obj->{active} ne 'y'); @@ -131,7 +131,7 @@ sub send { sub read { # ------------------ my $obj = shift || return error('No object defined!'); - my $vars = shift || return error ('No News!' ); + my $vars = shift || return error('No data defined!'); return $obj->send($vars); diff --git a/lib/XXV/OUTPUT/Wml.pm b/lib/XXV/OUTPUT/Wml.pm index 2d2ff59..2e6e417 100644 --- a/lib/XXV/OUTPUT/Wml.pm +++ b/lib/XXV/OUTPUT/Wml.pm @@ -58,7 +58,7 @@ sub new { # Try to use the Requirments map { eval "use $_"; - return panic("\nCan not load Module: $_\nPlease install this module on your System:\nperl -MCPAN -e 'install $_'") if($@); + return panic("\nCouldn't load modul: $_\nPlease install this modul on your system:\nperl -MCPAN -e 'install $_'") if($@); } keys %{$self->{MOD}->{Prereq}}; $self->{handle} = $attr{'-handle'} @@ -74,13 +74,13 @@ sub new { || return error('No wmldir given!'); $self->{cgi} = $attr{'-cgi'} - || return error('No TemplateDir given!'); + || return error('No cgi object given!'); $self->{mime} = $attr{'-mime'} - || return error('No Mimehash given!'); + || return error('No mime hash given!'); $self->{browser} = $attr{'-browser'} - || return error('No Mimehash given!'); + || return error('No browser given!'); # $self->{start} = $attr{'-start'} # || return error('No StartPage given!'); @@ -107,8 +107,8 @@ sub new { sub parseTemplate { # ------------------ my $obj = shift || return error('No object defined!'); - my $name = shift || return error ('No Name!' ); - my $data = shift || return error ('No Data!' ); + my $name = shift || return error('No name defined!'); + my $data = shift || return error('No data defined!'); my $params = shift || {}; my $t = $obj->{tt}; @@ -210,7 +210,7 @@ sub header { # ------------------ sub statusmsg { # ------------------ - my $obj = shift || return error ('No Object!'); + my $obj = shift || return error('No object defined!'); my $msg = shift || return error ('No Msg!'); my $status = shift || return error ('No Status!'); @@ -235,7 +235,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($msg,"401 Authorization Required\nWWW-Authenticate: Basic realm=\"xxvd\""); @@ -245,7 +245,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($msg,"403 Forbidden"); @@ -256,15 +256,15 @@ 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 || ""; - warn("I can't read file $file"); + lg sprintf("Couldn't open file '%s' : %s!",$file,$why); $file =~ s/$obj->{wmldir}\///g; # Don't post wml root, avoid spy out - $obj->statusmsg(sprintf(gettext("Cannot open file '%s' : %s!"),$file,$why),"404 File not found"); + $obj->statusmsg(sprintf(gettext("Couldn't open file '%s' : %s!"),$file,$why),"404 File not found"); } # ------------------ @@ -272,7 +272,7 @@ sub question { # ------------------ 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}; @@ -338,7 +338,7 @@ sub question { sub image { # ------------------ my $obj = shift || return error('No object defined!'); - my $file = shift || return error ('No File!' ); + my $file = shift || return error('No file defined!'); my $typ = shift || $obj->{mime}->{lc((split('\.', $file))[-1])} or return error("No Type in Mimehash or File: $file"); @@ -352,7 +352,7 @@ sub image { sub datei { # ------------------ my $obj = shift || return error('No object defined!'); - my $file = shift || return error ('No File!' ); + my $file = shift || return error('No file defined!'); my $data = load_file($file) or return $obj->status404($file,$!); @@ -364,7 +364,7 @@ sub datei { sub pod { # ------------------ my $obj = shift || return error('No object defined!'); - my $modname = shift || return error ('No Modname!' ); + my $modname = shift || return error('No modul name defined!'); $modname = ucfirst($modname) if($modname eq 'GENERAL'); my $podfile = sprintf('%s/%s.pod', $obj->{paths}->{PODPATH}, $modname); @@ -399,7 +399,7 @@ sub typ { sub setCall { # ------------------ my $obj = shift || return error('No object defined!'); - my $name = shift || return error ('No Name!' ); + my $name = shift || return error('No name defined!'); $obj->{call} = $name; return $obj->{call}; |