* HTTPD: Fix - count received bytes.

3 files changed, 33 insertions, 27 deletions

diff --git a/lib/XXV/MODULES/HTTPD.pm b/lib/XXV/MODULES/HTTPD.pm
index 3e5ab64..c51024b 100644
--- a/lib/XXV/MODULES/HTTPD.pm
+++ b/lib/XXV/MODULES/HTTPD.pm
@@ -202,7 +202,7 @@ sub init {
 sub communicator 
 {
     my $obj = shift || return error('No object defined!');
-    my $watcher = shift || return error ('No Watcher!' );
+    my $watcher = shift || return error('No watcher defined!');
 
     # read new line and report it
     my $handle=$watcher->w->fd;
@@ -334,6 +334,7 @@ sub communicator
         );
 
     $obj->{STATUS}->{'sendbytes'} += $console->{'sendbytes'};
+
     $watcher->w->cancel;
     undef $watcher;
 }
@@ -359,7 +360,7 @@ sub _readline {
 sub parseRequest {
 # ------------------
     my $obj = shift || return error('No object defined!');
-    my $socket = shift || return error ('No Handle!' );
+    my $socket = shift || return error('No handle defined!' );
     my $logout = shift || 0;
 
     binmode $socket;
@@ -394,6 +395,7 @@ sub parseRequest {
     		} else {
           #dumper($line);
     		}
+        $obj->{STATUS}->{'readbytes'} += length($line) if($line);
       }
    
 	$data->{Request} =~ s/%([a-f0-9][a-f0-9])/pack("C", hex($1))/ieg
@@ -407,6 +409,7 @@ sub parseRequest {
         my $bytes = sysread($socket,$post,$data->{ContentLength});
         $data->{Post} = $post
           if($bytes && $data->{ContentLength} == $bytes);
+        $obj->{STATUS}->{'readbytes'} += $bytes;
       }
       #dumper($data);
       return $data;
@@ -420,9 +423,9 @@ 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 $cgi     = shift || return error ('No CGI Object');
+    my $watcher = shift || return error('No watcher defined!');
+    my $console = shift || return error('No console defined!');
+    my $cgi     = shift || return error('No CGI object defined!');
 
     my $ucmd    = $cgi->param('cmd')  || '<undef>';
     my $udata   = $cgi->param('data') || '';
@@ -477,8 +480,11 @@ sub status {
     my $lastReportTime = shift || 0;
 
     return {
-        message => sprintf(gettext('Traffic on HTTPD Socket since %s: sent: %d kbytes - received: %d kbytes - connections: %d'),
-            $obj->{STATUS}->{'starttime'}, convert($obj->{STATUS}->{'sendbytes'}), convert($obj->{STATUS}->{'readbytes'}), $obj->{STATUS}->{'connects'} ),
+        message => sprintf(gettext('Traffic on HTTPD socket since %s: sent: %s kbytes - received: %s kbytes - connections: %d.'),
+            $obj->{STATUS}->{'starttime'}, 
+            convert($obj->{STATUS}->{'sendbytes'}), 
+            convert($obj->{STATUS}->{'readbytes'}),
+            $obj->{STATUS}->{'connects'} ),
     };
 
 }
@@ -516,8 +522,8 @@ sub findskins
 #       return 1 if(load_file($res) eq 'abc');
 # ------ unzip ------------
 sub unzip {
-    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 $gz = gzopen($file, "rb")
          or return $obj->msg(undef, sprintf(gettext("Could not open file '%s'! : %s"), $file, &gzerror ));
@@ -544,9 +550,9 @@ sub unzip {
 sub checkvalue {
 # ------------------
     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 @query = split(':',$data);
     my $check = $query[0];
diff --git a/locale/de.po b/locale/de.po
index 813dd76..c6a1748 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -2190,12 +2190,12 @@ msgid "This module is a multisession HTTPD server."
 msgstr "Dieses Modul ist ein Mehrfachsitzung HTTPD Server."
 
 #--------------------
-#: ../lib/XXV/MODULES/HTTPD.pm:480
-msgid "Traffic on HTTPD Socket since %s: sent: %d kbytes - received: %d kbytes - connections: %d"
-msgstr "Datenverkehr des HTTPD Anschlusses seit %s: gesendet: %d Kbytes - empfangen: %d Kbytes - Verbindungen: %d"
+#: ../lib/XXV/MODULES/HTTPD.pm:483
+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:523
+#: ../lib/XXV/MODULES/HTTPD.pm:529
 msgid "Could not open file '%s'! : %s"
 msgstr "Konnte Datei '%s' nicht öffnen : %s"
 
@@ -2805,7 +2805,7 @@ msgid "Cut recording 'rid' in vdr"
 msgstr "Schneide Aufnahme 'rid' im VDR"
 
 #--------------------
-#: ../lib/XXV/MODULES/RECORDS.pm:1544 ../lib/XXV/MODULES/RECORDS.pm:1672 ../lib/XXV/OUTPUT/Html.pm:475 ../lib/XXV/OUTPUT/Wml.pm:267
+#: ../lib/XXV/MODULES/RECORDS.pm:1544 ../lib/XXV/MODULES/RECORDS.pm:1672 ../lib/XXV/OUTPUT/Html.pm:461 ../lib/XXV/OUTPUT/Wml.pm:267
 msgid "Cannot open file '%s' : %s!"
 msgstr "Kann Datei '%s' nicht öffnen : %s"
 
@@ -3944,17 +3944,17 @@ msgid "This receives and sends ASCII messages"
 msgstr "Dies empfängt und sendet ASCII Nachrichten"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Console.pm:305 ../lib/XXV/OUTPUT/Html.pm:510 ../lib/XXV/OUTPUT/Wml.pm:297 ../wml/widgets/dir.tmpl:8
+#: ../lib/XXV/OUTPUT/Console.pm:305 ../lib/XXV/OUTPUT/Html.pm:496 ../lib/XXV/OUTPUT/Wml.pm:297 ../wml/widgets/dir.tmpl:8
 msgid "Directory '%s' does not exist!"
 msgstr "Verzeichnis '%s' existiert leider nicht!"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Console.pm:310 ../lib/XXV/OUTPUT/Html.pm:515 ../lib/XXV/OUTPUT/Wml.pm:302 ../wml/widgets/file.tmpl:8
+#: ../lib/XXV/OUTPUT/Console.pm:310 ../lib/XXV/OUTPUT/Html.pm:501 ../lib/XXV/OUTPUT/Wml.pm:302 ../wml/widgets/file.tmpl:8
 msgid "File '%s' does not exist!"
 msgstr "Datei '%s' existiert leider nicht!"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Console.pm:314 ../lib/XXV/OUTPUT/Html.pm:524 ../lib/XXV/OUTPUT/Wml.pm:306
+#: ../lib/XXV/OUTPUT/Console.pm:314 ../lib/XXV/OUTPUT/Html.pm:510 ../lib/XXV/OUTPUT/Wml.pm:306
 msgid "Error '%s' (%s) : %s!"
 msgstr "Fehler im Feld '%s' (%s) : %s"
 
@@ -3995,7 +3995,7 @@ msgid "You can only use one of these elements: %s"
 msgstr "Sie können nur einen von diesen Elementen verwenden: %s"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Console.pm:632 ../lib/XXV/OUTPUT/Html.pm:723
+#: ../lib/XXV/OUTPUT/Console.pm:632 ../lib/XXV/OUTPUT/Html.pm:709
 msgid "Module %s not found!"
 msgstr "Modul %s nicht gefunden!"
 
@@ -4010,32 +4010,32 @@ msgid "This receives and sends HTML messages."
 msgstr "Dies empfängt und sendet HTML Nachrichten"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:451
+#: ../lib/XXV/OUTPUT/Html.pm:437
 msgid "Authorization required"
 msgstr "Berechtigung erforderlich"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:461
+#: ../lib/XXV/OUTPUT/Html.pm:447
 msgid "Forbidden"
 msgstr "Verboten"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:476
+#: ../lib/XXV/OUTPUT/Html.pm:462
 msgid "Not found"
 msgstr "Nicht gefunden"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:562
+#: ../lib/XXV/OUTPUT/Html.pm:548
 msgid "Please wait ..."
 msgstr "Bitte warten ..."
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:741 ../lib/XXV/OUTPUT/Wml.pm:385
+#: ../lib/XXV/OUTPUT/Html.pm:727 ../lib/XXV/OUTPUT/Wml.pm:385
 msgid "Back to configuration page."
 msgstr "Zurück zur Konfigurationsseite"
 
 #--------------------
-#: ../lib/XXV/OUTPUT/Html.pm:761
+#: ../lib/XXV/OUTPUT/Html.pm:747
 msgid "File"
 msgstr "Datei"
 
diff --git a/locale/de/LC_MESSAGES/xxv.mo b/locale/de/LC_MESSAGES/xxv.mo
index 81f8a8e..d4694b6 100644
--- a/locale/de/LC_MESSAGES/xxv.mo
+++ b/locale/de/LC_MESSAGES/xxv.mo