- fixed configure.pl and makeDist.

[BackupPC.git] / lib / BackupPC / CGI / Queue.pm

diff --git a/lib/BackupPC/CGI/Queue.pm b/lib/BackupPC/CGI/Queue.pm
index 116ea0f..a6e6294 100644 (file)
--- a/lib/BackupPC/CGI/Queue.pm
+++ b/lib/BackupPC/CGI/Queue.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.0.0alpha, released 23 Jan 2006.

 #
 # See http://backuppc.sourceforge.net.
 #
 #
 # See http://backuppc.sourceforge.net.
 #


@@ -71,18 +71,16 @@ EOF
     while ( @CmdQueue ) {
         my $req = pop(@CmdQueue);
         my $reqTime = timeStamp2($req->{reqTime});
     while ( @CmdQueue ) {
         my $req = pop(@CmdQueue);
         my $reqTime = timeStamp2($req->{reqTime});

-        (my $cmd = $req->{cmd}[0]) =~ s/$BinDir\///;
+        (my $cmd = $bpc->execCmd2ShellCmd(@{$req->{cmd}})) =~ s/$BinDir\///;

         $strCmd .= <<EOF;
 <tr><td> ${HostLink($req->{host})} </td>
     <td align="center"> $reqTime </td>
     <td align="center"> $req->{user} </td>
         $strCmd .= <<EOF;
 <tr><td> ${HostLink($req->{host})} </td>
     <td align="center"> $reqTime </td>
     <td align="center"> $req->{user} </td>

-    <td> $cmd $req->{cmd}[0] </td></tr>
+    <td> $cmd </td></tr>

 EOF
     }
 EOF
     }

-    Header($Lang->{BackupPC__Queue_Summary});
-
-    print ( eval ( "qq{$Lang->{Backup_Queue_Summary}}") );
-
+    my $content = eval ( "qq{$Lang->{Backup_Queue_Summary}}");
+    Header($Lang->{BackupPC__Queue_Summary}, $content);

     Trailer();
 }
 
     Trailer();
 }