* Various changes for 3.0.0beta1

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

diff --git a/lib/BackupPC/CGI/Summary.pm b/lib/BackupPC/CGI/Summary.pm
index 0706b62..bd7f52e 100644 (file)
--- a/lib/BackupPC/CGI/Summary.pm
+++ b/lib/BackupPC/CGI/Summary.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.0.0beta1, released 30 Jul 2006.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -48,15 +48,19 @@ sub action
     GetStatusInfo("hosts");
     my $Privileged = CheckPermission();
 
-    if ( !$Privileged ) {
-        ErrorExit($Lang->{Only_privileged_users_can_view_PC_summaries} );
-    }
-    foreach my $host ( sort(keys(%Status)) ) {
+    foreach my $host ( GetUserHosts(1) ) {
         my($fullDur, $incrCnt, $incrAge, $fullSize, $fullRate, $reasonHilite);
        my($shortErr);
         my @Backups = $bpc->BackupInfoRead($host);
         my $fullCnt = $incrCnt = 0;
         my $fullAge = $incrAge = -1;
+
+        $bpc->ConfigRead($host);
+        %Conf = $bpc->Conf();
+
+        next if ( $Conf{XferMethod} eq "archive" );
+        next if ( !$Privileged && !CheckPermission($host) );
+
         for ( my $i = 0 ; $i < @Backups ; $i++ ) {
             if ( $Backups[$i]{type} eq "full" ) {
                 $fullCnt++;
@@ -102,17 +106,17 @@ sub action
        }
 
         $str = <<EOF;
-<tr$reasonHilite><td> ${HostLink($host)} </td>
-    <td align="center"> ${UserLink(defined($Hosts->{$host})
+<tr$reasonHilite><td class="border"> ${HostLink($host)} </td>
+    <td align="center" class="border"> ${UserLink(defined($Hosts->{$host})
                                    ? $Hosts->{$host}{user} : "")} </td>
-    <td align="center"> $fullCnt </td>
-    <td align="center"> $fullAge </td>
-    <td align="center"> $fullSize </td>
-    <td align="center"> $fullRate </td>
-    <td align="center"> $incrCnt </td>
-    <td align="center"> $incrAge </td>
-    <td align="center"> $Lang->{$Status{$host}{state}} </td>
-    <td> $Lang->{$Status{$host}{reason}}$shortErr </td></tr>
+    <td align="center" class="border"> $fullCnt </td>
+    <td align="center" class="border"> $fullAge </td>
+    <td align="center" class="border"> $fullSize </td>
+    <td align="center" class="border"> $fullRate </td>
+    <td align="center" class="border"> $incrCnt </td>
+    <td align="center" class="border"> $incrAge </td>
+    <td align="center" class="border"> $Lang->{$Status{$host}{state}} </td>
+    <td class="border"> $Lang->{$Status{$host}{reason}}$shortErr </td></tr>
 EOF
         if ( @Backups == 0 ) {
             $hostCntNone++;
@@ -126,9 +130,8 @@ EOF
     $incrSizeTot = sprintf("%.2f", $incrSizeTot / 1000);
     my $now      = timeStamp2(time);
 
-    Header($Lang->{BackupPC__Server_Summary});
-    print eval ("qq{$Lang->{BackupPC_Summary}}");
-
+    my $content = eval ("qq{$Lang->{BackupPC_Summary}}");
+    Header($Lang->{BackupPC__Server_Summary}, $content);
     Trailer();
 }