X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FQueue.pm;h=3a31aaa198ea5c52ec894361e0e690c9abbbaf95;hp=116ea0fd1f9949d8f6c7fdc9d7a87d404ead8077;hb=f6fbcc3682d2bc9e7dfdc26e95bd5fcdb359496d;hpb=329e870f56fb6572fa697998d33676588034c149 diff --git a/lib/BackupPC/CGI/Queue.pm b/lib/BackupPC/CGI/Queue.pm index 116ea0f..3a31aaa 100644 --- a/lib/BackupPC/CGI/Queue.pm +++ b/lib/BackupPC/CGI/Queue.pm @@ -10,7 +10,7 @@ # Craig Barratt # # COPYRIGHT -# Copyright (C) 2003 Craig Barratt +# Copyright (C) 2003-2007 Craig Barratt # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ # #======================================================================== # -# Version 2.1.0_CVS, released 3 Jul 2003. +# Version 3.2.0beta0, released 5 April 2009. # # See http://backuppc.sourceforge.net. # @@ -71,18 +71,16 @@ EOF 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 .= < ${HostLink($req->{host})} $reqTime $req->{user} - $cmd $req->{cmd}[0] + $cmd 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(); }