* Commit for 2.1.0.

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

diff --git a/lib/BackupPC/CGI/DirHistory.pm b/lib/BackupPC/CGI/DirHistory.pm
index a1b2d2d..30162f0 100644 (file)
--- a/lib/BackupPC/CGI/DirHistory.pm
+++ b/lib/BackupPC/CGI/DirHistory.pm
@@ -28,7 +28,7 @@
 #
 #========================================================================
 #
 #
 #========================================================================
 #

-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 2.1.0, released 20 Jun 2004.

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


@@ -71,7 +71,8 @@ sub action
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
 
         ErrorExit($Lang->{Nice_try__but_you_can_t_put});
     }
 

-    for ( $i = 0 ; $i < @Backups ; $i++ ) {
+    my @backupList = $view->backupList($share, $dir);
+    foreach $i ( @backupList ) {

        my $backupTime  = timeStamp2($Backups[$i]{startTime});
        my $num = $Backups[$i]{num};
        $backupNumStr  .= "<td align=center><a href=\"$MyURL?action=browse"
        my $backupTime  = timeStamp2($Backups[$i]{startTime});
        my $num = $Backups[$i]{num};
        $backupNumStr  .= "<td align=center><a href=\"$MyURL?action=browse"


@@ -84,9 +85,10 @@ sub action
        my %inode2name;
        my $nameCnt = 0;
        (my $fDisp  = "${EscHTML($f)}") =~ s/ /&nbsp;/g;
        my %inode2name;
        my $nameCnt = 0;
        (my $fDisp  = "${EscHTML($f)}") =~ s/ /&nbsp;/g;

-       $fileStr   .= "<tr><td align=left>$fDisp</td>";
-       my($colSpan, $url, $inode, $type, $tdColor);
-       for ( $i = 0 ; $i < @Backups ; $i++ ) {
+       $fileStr   .= "<tr><td align=\"left\"  class=\"histView\">$fDisp</td>";
+       my($colSpan, $url, $inode, $type);
+       my $tdClass = ' class="histView"';
+       foreach $i ( @backupList ) {

            my($path);
            if ( $colSpan > 0 ) {
                #
            my($path);
            if ( $colSpan > 0 ) {
                #


@@ -109,16 +111,16 @@ sub action
                    $colSpan++;
                    next;
                }
                    $colSpan++;
                    next;
                }

-               $fileStr .= "<td align=center colspan=$colSpan$tdColor>"
+               $fileStr .= "<td align=center colspan=$colSpan$tdClass>"

                          . "$url</td>";
                $colSpan = 0;
                          . "$url</td>";
                $colSpan = 0;

-               $tdColor = "";
+               $tdClass = ' class="histView"';

            }
            if ( !defined($hist->{$f}[$i]) ) {
                $colSpan = 1;
                $url     = "&nbsp;";
                $inode   = -3;                  # special value for missing
            }
            if ( !defined($hist->{$f}[$i]) ) {
                $colSpan = 1;
                $url     = "&nbsp;";
                $inode   = -3;                  # special value for missing

-               $tdColor = ' bgcolor="#ffffaa"';
+               $tdClass = ' class="histViewMis"';

                next;
            }
             if ( $dir eq "" ) {
                next;
            }
             if ( $dir eq "" ) {


@@ -154,7 +156,7 @@ EOF
            $colSpan = 1;
        }
        if ( $colSpan > 0 ) {
            $colSpan = 1;
        }
        if ( $colSpan > 0 ) {

-           $fileStr .= "<td align=center colspan=$colSpan$tdColor>$url</td>";
+           $fileStr .= "<td align=center colspan=$colSpan$tdClass>$url</td>";

            $colSpan = 0;
        }
        $fileStr .= "</tr>\n";
            $colSpan = 0;
        }
        $fileStr .= "</tr>\n";


@@ -164,11 +166,8 @@ EOF
     $dirDisplay =~ s{//+}{/}g;
     $dirDisplay =~ s{/+$}{}g;
     $dirDisplay = "/" if ( $dirDisplay eq "" );
     $dirDisplay =~ s{//+}{/}g;
     $dirDisplay =~ s{/+$}{}g;
     $dirDisplay = "/" if ( $dirDisplay eq "" );

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

     Trailer();
 }
 
     Trailer();
 }