X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=lib%2FBackupPC%2FCGI%2FGeneralInfo.pm;h=40dbd7114b97a0e502ebe307e54236c8de7a2c0e;hb=57307aaa251ad94e09d3bf3bf6663d58aa9d7ae7;hp=bb71e51857708acea0120d87e3c761283f360938;hpb=329e870f56fb6572fa697998d33676588034c149;p=BackupPC.git

diff --git a/lib/BackupPC/CGI/GeneralInfo.pm b/lib/BackupPC/CGI/GeneralInfo.pm
index bb71e51..40dbd71 100644
--- a/lib/BackupPC/CGI/GeneralInfo.pm
+++ b/lib/BackupPC/CGI/GeneralInfo.pm
@@ -10,7 +10,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2003  Craig Barratt
+#   Copyright (C) 2003-2009  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.0, released 31 Jul 2010.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -49,19 +49,20 @@ sub action
         my $startTime = timeStamp2($Jobs{$host}{startTime});
         next if ( $host eq $bpc->trashJob
                     && $Jobs{$host}{processState} ne "running" );
+        next if ( !$Privileged && !CheckPermission($host) );
         $Jobs{$host}{type} = $Status{$host}{type}
                     if ( $Jobs{$host}{type} eq "" && defined($Status{$host}));
         (my $cmd = $Jobs{$host}{cmd}) =~ s/$BinDir\///g;
         (my $xferPid = $Jobs{$host}{xferPid}) =~ s/,/, /g;
         $jobStr .= <<EOF;
-<tr><td> ${HostLink($host)} </td>
-    <td align="center"> $Jobs{$host}{type} </td>
-    <td align="center"> ${UserLink(defined($Hosts->{$host})
+<tr><td class="border"> ${HostLink($host)} </td>
+    <td align="center" class="border"> $Jobs{$host}{type} </td>
+    <td align="center" class="border"> ${UserLink(defined($Hosts->{$host})
 					? $Hosts->{$host}{user} : "")} </td>
-    <td> $startTime </td>
-    <td> $cmd </td>
-    <td align="center"> $Jobs{$host}{pid} </td>
-    <td align="center"> $xferPid </td>
+    <td class="border"> $startTime </td>
+    <td class="border"> $cmd </td>
+    <td align="center" class="border"> $Jobs{$host}{pid} </td>
+    <td align="center" class="border"> $xferPid </td>
 EOF
         $jobStr .= "</tr>\n";
     }
@@ -70,6 +71,7 @@ EOF
 		    && $Status{$host}{reason} ne "Reason_restore_failed"
 		    && (!$Status{$host}{userReq}
 			|| $Status{$host}{reason} ne "Reason_no_ping") );
+        next if ( !$Privileged && !CheckPermission($host) );
         my $startTime = timeStamp2($Status{$host}{startTime});
         my($errorTime, $XferViewStr);
         if ( $Status{$host}{errorTime} > 0 ) {
@@ -89,14 +91,14 @@ EOF
         }
         (my $shortErr = $Status{$host}{error}) =~ s/(.{48}).*/$1.../;   
         $statusStr .= <<EOF;
-<tr><td> ${HostLink($host)} </td>
-    <td align="center"> $Status{$host}{type} </td>
-    <td align="center"> ${UserLink(defined($Hosts->{$host})
+<tr><td class="border"> ${HostLink($host)} </td>
+    <td align="center" class="border"> $Status{$host}{type} </td>
+    <td align="center" class="border"> ${UserLink(defined($Hosts->{$host})
 					? $Hosts->{$host}{user} : "")} </td>
-    <td align="right"> $startTime </td>
-    <td> $XferViewStr </td>
-    <td align="right"> $errorTime </td>
-    <td> ${EscHTML($shortErr)} </td></tr>
+    <td align="right" class="border"> $startTime </td>
+    <td class="border"> $XferViewStr </td>
+    <td align="right" class="border"> $errorTime </td>
+    <td class="border"> ${EscHTML($shortErr)} </td></tr>
 EOF
     }
     my $now          = timeStamp2(time);
@@ -107,6 +109,7 @@ EOF
     my $numUserQueue = $QueueLen{UserQueue};
     my $numCmdQueue  = $QueueLen{CmdQueue};
     my $serverStartTime = timeStamp2($Info{startTime});
+    my $configLoadTime  = timeStamp2($Info{ConfigLTime});
     my $poolInfo     = genPoolInfo("pool", \%Info);
     my $cpoolInfo    = genPoolInfo("cpool", \%Info);
     if ( $Info{poolFileCnt} > 0 && $Info{cpoolFileCnt} > 0 ) {
@@ -123,9 +126,10 @@ EOF
     } elsif ( $Info{cpoolFileCnt} > 0 ) {
         $poolInfo = $cpoolInfo;
     }
-
-    Header($Lang->{H_BackupPC_Server_Status});
-    print (eval ("qq{$Lang->{BackupPC_Server_Status}}"));
+    my $generalInfo = eval("qq{$Lang->{BackupPC_Server_Status_General_Info}}")
+                                if ( $Privileged );
+    my $content = eval("qq{$Lang->{BackupPC_Server_Status}}");
+    Header($Lang->{H_BackupPC_Server_Status}, $content);
     Trailer();
 }