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/XXV/OUTPUT | |
| 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/XXV/OUTPUT')
| -rw-r--r-- | lib/XXV/OUTPUT/Ajax.pm | 6 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/Console.pm | 50 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/Dump.pm | 2 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/Html.pm | 6 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/NEWS/JABBER.pm | 12 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/NEWS/MAIL.pm | 6 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/NEWS/RSS.pm | 10 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/NEWS/VDR.pm | 10 | ||||
| -rw-r--r-- | lib/XXV/OUTPUT/Wml.pm | 36 |
9 files changed, 69 insertions, 69 deletions
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}; |
