From b3afe1bf2625101e8db9400d15f272c2e454b1b5 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Tue, 11 Sep 2007 17:44:02 +0000 Subject: * Refactoring HTTPD/TELNET - move command usage (MODUL TELNET now none essential ) * Some little fixes --- html/bloecke/percentbar.tmpl | 8 ++-- html/now.tmpl | 4 +- html/schema.tmpl | 21 +++++----- lib/XXV/MODULES/HTTPD.pm | 71 +++++++++++++++++++++++++++++++-- lib/XXV/MODULES/TELNET.pm | 79 ++++-------------------------------- lib/XXV/MODULES/WAPD.pm | 2 +- locale/de.po | 93 +++++++++++++++++++++++++------------------ locale/de/LC_MESSAGES/xxv.mo | Bin 65042 -> 65141 bytes 8 files changed, 148 insertions(+), 130 deletions(-) diff --git a/html/bloecke/percentbar.tmpl b/html/bloecke/percentbar.tmpl index f8b17fe..16ebaab 100644 --- a/html/bloecke/percentbar.tmpl +++ b/html/bloecke/percentbar.tmpl @@ -9,13 +9,13 @@ %?>
- -
- + +
+
200 %?>
- % + %
diff --git a/html/now.tmpl b/html/now.tmpl index 795fc9e..e124a67 100644 --- a/html/now.tmpl +++ b/html/now.tmpl @@ -86,9 +86,9 @@ 100 OR duration <= 0 %?> - 100 ? 100 : per) %?> + 100 ? 100 : per) %?> - ${per}%%") %?> + ${per}%%") %?> diff --git a/html/schema.tmpl b/html/schema.tmpl index 38ad6d6..5869c4e 100644 --- a/html/schema.tmpl +++ b/html/schema.tmpl @@ -21,7 +21,10 @@ Duration = param.zeitbis - param.zeitvon;

 
-      +  +   +   +

@@ -42,7 +45,7 @@ Duration = param.zeitbis - param.zeitvon; colspan = colspan + 1; zeit = param.zeitvon + c; -%?> -
19 ? text : " ") %?>
+ date.now %?>  < @@ -64,10 +67,10 @@ Duration = param.zeitbis - param.zeitvon; p = (a / Duration) * width; %?>
-
 
+
 
-
+
" src='images/blank.png' @@ -119,7 +122,7 @@ Duration = param.zeitbis - param.zeitvon; percent = (laenge / Duration) * width; ges = ges + percent; -%?> - ' height=8 border=0 align='left' /> + ", epgDesc ];desc=d.join("") %?> - ' height=8 border=0 hspace=0 vspace=0 align='left' /> + -
+
diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm index 72acbb7..ee0652c 100644 --- a/lib/XXV/MODULES/HTTPD.pm +++ b/lib/XXV/MODULES/HTTPD.pm @@ -107,6 +107,24 @@ 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(@_) }, @@ -361,7 +379,7 @@ sub _readline { sub parseRequest { # ------------------ my $obj = shift || return error('No object defined!'); - my $socket = shift || return error('No handle defined!' ); + my $socket = shift || return error('No handle defined!'); my $logout = shift || 0; binmode $socket; @@ -396,7 +414,7 @@ sub parseRequest { } else { #dumper($line); } - $obj->{STATUS}->{'readbytes'} += length($line) if($line); + $obj->{STATUS}->{'readbytes'} += length($line); } $data->{Request} =~ s/%([a-f0-9][a-f0-9])/pack("C", hex($1))/ieg @@ -469,7 +487,54 @@ sub handleInput { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - return main::getModule('TELNET')->usage(@_); + 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 ], + }, + ); } # ------------------ diff --git a/lib/XXV/MODULES/TELNET.pm b/lib/XXV/MODULES/TELNET.pm index 7974109..d12fbeb 100644 --- a/lib/XXV/MODULES/TELNET.pm +++ b/lib/XXV/MODULES/TELNET.pm @@ -49,13 +49,6 @@ sub module { }, }, Commands => { - help => { - description => gettext("This will display all commands or description of module 'name'."), - short => 'h', - callback => sub{ - return $obj->usage(@_); - }, - }, quit => { description => gettext("This will exit the telnet session"), short => 'q', @@ -88,17 +81,6 @@ sub module { }, Level => 'admin' }, - 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; @@ -246,60 +228,6 @@ sub init { } -# ------------------ -sub usage { -# ------------------ - my $obj = shift || return error('No object defined!'); - my $watcher = shift || return error ('No Watcher!'); - my $console = shift || return error ('No Console'); - my $modulename = shift || 0; - 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 ], - }, - ); -} - # ------------------ sub handleInput { # ------------------ @@ -324,4 +252,11 @@ sub handleInput { } } +# ------------------ +sub usage { +# ------------------ + my $obj = shift || return error('No object defined!'); + return main::getModule('HTTPD')->usage(@_); +} + 1; diff --git a/lib/XXV/MODULES/WAPD.pm b/lib/XXV/MODULES/WAPD.pm index 95ca6bf..26966ef 100644 --- a/lib/XXV/MODULES/WAPD.pm +++ b/lib/XXV/MODULES/WAPD.pm @@ -327,7 +327,7 @@ sub handleInput { sub usage { # ------------------ my $obj = shift || return error('No object defined!'); - return main::getModule('TELNET')->usage(@_); + return main::getModule('HTTPD')->usage(@_); } # ------------------ diff --git a/locale/de.po b/locale/de.po index c6a1748..4ea2187 100644 --- a/locale/de.po +++ b/locale/de.po @@ -1060,9 +1060,24 @@ msgstr "Alle Aufnahmen mit Titel" #-------------------- #: ../html/schema.tmpl:24 +msgid "Display" +msgstr "Zeige" + +#-------------------- +#: ../html/schema.tmpl:25 +msgid "from" +msgstr "von" + +#-------------------- +#: ../html/schema.tmpl:26 msgid "to" msgstr "bis" +#-------------------- +#: ../html/schema.tmpl:27 +msgid "o'clock" +msgstr "Uhr" + #-------------------- #: ../html/search.tmpl:12 msgid "Found %s items" @@ -2180,7 +2195,22 @@ msgid "Dump additional debugging information, required only for software develop msgstr "Ausgeben von zusätzliche Informationen zur Fehlersuche, wird nur für die Software-Entwicklung benötigt." #-------------------- -#: ../lib/XXV/MODULES/HTTPD.pm:262 ../lib/XXV/MODULES/WAPD.pm:196 +#: ../lib/XXV/MODULES/HTTPD.pm:111 +msgid "This will display all commands or description of module 'name'." +msgstr "Dieses zeigt alle Befehle oder das Hilfetext des 'Modulnamen'" + +#-------------------- +#: ../lib/XXV/MODULES/HTTPD.pm:118 +msgid "Restart all modules." +msgstr "Dieses lädt alle Module neu." + +#-------------------- +#: ../lib/XXV/MODULES/HTTPD.pm:124 +msgid "Modules loaded." +msgstr "Module neugeladen." + +#-------------------- +#: ../lib/XXV/MODULES/HTTPD.pm:280 ../lib/XXV/MODULES/WAPD.pm:196 msgid "You are not authorized to use this system!" msgstr "Sie haben keine Berechtigungen für dieses System!" @@ -2190,12 +2220,21 @@ msgid "This module is a multisession HTTPD server." msgstr "Dieses Modul ist ein Mehrfachsitzung HTTPD Server." #-------------------- -#: ../lib/XXV/MODULES/HTTPD.pm:483 +#: ../lib/XXV/MODULES/HTTPD.pm:505 +msgid "" +"%sThis is the xxv %s server.\n" +"Please use the following commands:\n" +msgstr "" +"%sDas ist der xxv-%s-Server.\n" +"Bitte verwende folgende Befehle:\n" + +#-------------------- +#: ../lib/XXV/MODULES/HTTPD.pm:549 msgid "Traffic on HTTPD socket since %s: sent: %s kbytes - received: %s kbytes - connections: %d." msgstr "Datenverkehr des HTTPD Anschlusses seit %s: gesendet: %s kBytes - empfangen: %s kBytes - Verbindungen: %d." #-------------------- -#: ../lib/XXV/MODULES/HTTPD.pm:529 +#: ../lib/XXV/MODULES/HTTPD.pm:595 msgid "Could not open file '%s'! : %s" msgstr "Konnte Datei '%s' nicht öffnen : %s" @@ -3340,12 +3379,7 @@ msgid "Send a command to svdrp" msgstr "Sende ein Kommando zum svdrp" #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:20 -msgid "This module is a multisession telnet server." -msgstr "Dieses Modul ist ein Mehrfachsitzungstelnet-Server." - -#-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:215 +#: ../lib/XXV/MODULES/TELNET.pm:197 msgid "" "Welcome to xxv system version: %s.\\r\n" "This is session %s.\\r\n" @@ -3354,29 +3388,25 @@ msgstr "" "Das ist Sitzung %s.\\r\n" #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:224 +#: ../lib/XXV/MODULES/TELNET.pm:20 +msgid "This module is a multisession telnet server." +msgstr "Dieses Modul ist ein Mehrfachsitzungstelnet-Server." + +#-------------------- +#: ../lib/XXV/MODULES/TELNET.pm:206 msgid "Welcome to xxv system." msgstr "Willkommen im xxv-System." #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:228 +#: ../lib/XXV/MODULES/TELNET.pm:210 msgid "Welcome to xxv system. Please Login:" msgstr "Willkommen im xxv-System. Bitte Anmelden:" #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:234 +#: ../lib/XXV/MODULES/TELNET.pm:216 msgid "Sorry, but permission denied!" msgstr "Entschuldigung, aber Erlaubnis verweigert!" -#-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:268 -msgid "" -"%sThis is the xxv %s server.\n" -"Please use the following commands:\n" -msgstr "" -"%sDas ist der xxv-%s-Server.\n" -"Bitte verwende folgende Befehle:\n" - #-------------------- #: ../lib/XXV/MODULES/TELNET.pm:39 msgid "Number of port to listen for telnet clients" @@ -3384,39 +3414,24 @@ msgstr "Nummer des Port, um auf Telnet-Clients zu lauschen" #-------------------- #: ../lib/XXV/MODULES/TELNET.pm:53 -msgid "This will display all commands or description of module 'name'." -msgstr "Dieses zeigt alle Befehle oder das Hilfetext des 'Modulnamen'" - -#-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:60 msgid "This will exit the telnet session" msgstr "Das beendet die Telnetsitzung" #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:65 ../lib/XXV/MODULES/USER.pm:110 +#: ../lib/XXV/MODULES/TELNET.pm:58 ../lib/XXV/MODULES/USER.pm:110 msgid "Session closed." msgstr "Sitzung geschlossen." #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:70 ../lib/XXV/MODULES/TELNET.pm:81 +#: ../lib/XXV/MODULES/TELNET.pm:63 ../lib/XXV/MODULES/TELNET.pm:74 msgid "This will exit the xxv system." msgstr "Das wird das xxv-System beenden." #-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:78 +#: ../lib/XXV/MODULES/TELNET.pm:71 msgid "Are you sure to exit the xxv system?" msgstr "Sind Sie sicher, das XXV-System zu beenden?" -#-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:92 -msgid "Restart all modules." -msgstr "Dieses lädt alle Module neu." - -#-------------------- -#: ../lib/XXV/MODULES/TELNET.pm:98 -msgid "Modules loaded." -msgstr "Module neugeladen." - #-------------------- #: ../lib/XXV/MODULES/TIMERS.pm:100 msgid "Edit timer 'tid'" diff --git a/locale/de/LC_MESSAGES/xxv.mo b/locale/de/LC_MESSAGES/xxv.mo index d4694b6..fd4ecf7 100644 Binary files a/locale/de/LC_MESSAGES/xxv.mo and b/locale/de/LC_MESSAGES/xxv.mo differ -- cgit v1.2.3