* Various tweaks to recent changes, including additional patches

  from Josh and Paul.  Added host selection list to restore page.
  Tweak CSS and layout.

* Fixed $Conf{HardLinkMax} limit check in BackupPC::Lib; reported
  by Ross Skaliotis.

diff --git a/ChangeLog b/ChangeLog
index 5b4a846..4f9edef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,15 @@
 # Version __VERSION__, __RELEASEDATE__
 #------------------------------------------------------------------------
 
+* GFK updated fr.pm from en.pm.
+
+* Various tweaks to recent changes, including additional patches
+  from Josh and Paul.  Added host selection list to restore page.
+  Tweak CSS and layout.
+
+* Fixed $Conf{HardLinkMax} limit check in BackupPC::Lib; reported
+  by Ross Skaliotis.
+
 * Major changes from Ryan Kucera to add style sheets to the CGI
   interface, allowing easy customization.  Added new icons and
   BackupPC logo.  Numerous navigation improvements.
@@ -67,7 +76,8 @@
   fatal. This is used to catch miscellaneous Xfer errors that
   result in no files being backed up.  A new config parameter
   $Conf{BackupZeroFilesIsFatal} (defaults to 1) and can be set to
-  zero to turn off this check. Suggested by Guillaume Filion.
+  zero to turn off this check.  Suggested by Guillaume Filion.
+  Additional change: this check only applies to a full dump.
 
 * SMB: now detect NT_STATUS_ACCESS_DENIED on entire share or BackupFilesOnly
   (also ERRDOS - ERRnoaccess (Access denied.) for older versions of

diff --git a/bin/BackupPC_dump b/bin/BackupPC_dump
index f59e38a..11fc3db 100755 (executable)
--- a/bin/BackupPC_dump
+++ b/bin/BackupPC_dump
@@ -688,10 +688,10 @@ for my $shareName ( @$ShareNames ) {
 }
 
 #
-# If any share had zero files then consider the dump bad
+# If this is a full, and any share had zero files then consider the dump bad
 #
-if ( $stat{hostError} eq ""
-       && length($noFilesErr) && $Conf{BackupZeroFilesIsFatal} ) {
+if ( $type eq "full" && $stat{hostError} eq ""
+           && length($noFilesErr) && $Conf{BackupZeroFilesIsFatal} ) {
     $stat{hostError} = $noFilesErr;
     $stat{xferOK} = 0;
 }

diff --git a/conf/config.pl b/conf/config.pl
index 8c58140..c086992 100644 (file)
--- a/conf/config.pl
+++ b/conf/config.pl
@@ -241,7 +241,7 @@ $Conf{BackupPCUserVerify} = 1;
 #
 # Maximum number of hardlinks supported by the $TopDir file system
 # that BackupPC uses.  Most linux or unix file systems should support
-# at least 32000 hardlinks per file, or 64K in other cases.  If a pool
+# at least 32000 hardlinks per file, or 64000 in other cases.  If a pool
 # file already has this number of hardlinks, a new pool file is created
 # so that new hardlinks can be accommodated.  This limit will only
 # be hit if an identical file appears at least this number of times
@@ -1500,7 +1500,7 @@ h2 {
         
 p {
     font-family:arial,sans-serif;
-    font-size:.8em
+    font-size:.9em
 }
         
 a {
@@ -1508,6 +1508,10 @@ a {
     font-size:1em;
     color:#3333ff
 }
+
+li {
+    font-size:.9em;
+}
         
 a:hover {
     color:#cc0000;
@@ -1516,8 +1520,6 @@ a:hover {
         
 a.NavCurrent {
     font-weight:bold;
-    padding-left:5px;
-    padding-right:5px;
 }
         
 a.navbar {
@@ -1544,19 +1546,22 @@ a.navbar {
     padding:3px;
     padding-left:10px
 }
-    
+
 .border {
     border-bottom:1px solid #000000;
-    border-left:1px dotted #666666
+    border-left:1px dotted #666666;
+    font-size:.9em;
 }
 
 .tableheader {
+    font-size:.8em;
     font-weight:bold;
     background-color:#cccccc
 }
     
 .fviewheader {
     font-weight:bold;
+    font-size:.8em;
     color:#ffffff;
     background-color:#999999
 }
@@ -1564,7 +1569,8 @@ a.navbar {
 .fviewborder {
     border-bottom:1px solid #000000;
     border-left:1px dotted #666666;
-    background-color:#dddddd
+    background-color:#dddddd;
+    font-size:.9em;
 }
     
 .fviewon {
@@ -1611,7 +1617,7 @@ div.NavMenu a {
     font-size:.8em;
     display:block;
     margin-left:8px;
-    padding:3px;
+    padding:2px;
 }
              
 div.NavTitle {
@@ -1622,23 +1628,6 @@ div.NavTitle {
     font-weight:bold
 }
              
-div.HostOn {
-    width:18%;
-    background-color:#ddeeee;
-    padding:3px;
-    padding-left:10px;
-}
-
-div.HostOnContent {
-    background-color:#ddeeee;
-    padding:5px;
-}
-
-div.HostOnContent a {
-    font-size:.8em;
-    display:block;
-}
-
 #Content {
     float:right;
     width:80%;

diff --git a/lib/BackupPC/CGI/Archive.pm b/lib/BackupPC/CGI/Archive.pm
index 43a9b8e..2a774eb 100644 (file)
--- a/lib/BackupPC/CGI/Archive.pm
+++ b/lib/BackupPC/CGI/Archive.pm
@@ -70,10 +70,10 @@ sub action
             $fullSizeTot += $fullSize + $incrSizeTot;
             $fullSize = sprintf("%.2f", ($fullSize + $incrSizeTot) / 1000);
             $str = <<EOF;
-<tr bgcolor="#ffffcc">
-<td><input type="hidden" name="backup$checkBoxCnt" value="$backupnumber"><input type="checkbox" name="fcb$checkBoxCnt" value="$host">&nbsp;${HostLink($host)} </td>
-<td align="center"> ${UserLink($Hosts->{$host}{user})} </td>
-<td align="center"> $fullSize </td>
+<tr>
+<td class="border"><input type="hidden" name="backup$checkBoxCnt" value="$backupnumber"><input type="checkbox" name="fcb$checkBoxCnt" value="$host">&nbsp;${HostLink($host)} </td>
+<td align="center" class="border"> ${UserLink($Hosts->{$host}{user})} </td>
+<td align="center" class="border"> $fullSize </td>
 EOF
             $checkBoxCnt++;
             if ( @Backups == 0 ) {
@@ -90,9 +90,8 @@ EOF
         $strGood .= <<EOF;
 <input type="hidden" name="archivehost" value="$In{'archivehost'}">
 EOF
-        Header($Lang->{BackupPC__Archive});
-        print eval ("qq{$Lang->{BackupPC_Archive}}");
-
+        my $content = eval("qq{$Lang->{BackupPC_Archive}}");
+        Header(eval("qq{$Lang->{BackupPC__Archive}}"),$content);
         Trailer();
     } else {
 
@@ -163,8 +162,8 @@ EOF
             # Tell the user what options they have
             #
 
-            Header($Lang->{BackupPC__Archive});
-            print eval ("qq{$Lang->{BackupPC_Archive2}}");
+            my $content = eval("qq{$Lang->{BackupPC_Archive2}}");
+            Header(eval("qq{$Lang->{BackupPC__Archive}}"),$content);
             Trailer();
         } elsif ( $In{type} == 2 ) {
             my $reqFileName;
@@ -223,8 +222,9 @@ EOF
         $reply = $bpc->ServerMesg("archive $User $archivehost $reqFileName");
 
         $str = eval("qq{$Lang->{Archive_requested}}");
-            Header($Lang->{BackupPC__Archive});
-            print eval ("qq{$Lang->{BackupPC_Archive_Reply_from_server}}");
+
+            my $content = eval("qq{$Lang->{BackupPC_Archive_Reply_from_server}}");
+            Header(eval("qq{$Lang->{BackupPC__Archive}}"),$content);
             Trailer();
         }
 

diff --git a/lib/BackupPC/CGI/ArchiveInfo.pm b/lib/BackupPC/CGI/ArchiveInfo.pm
index effb362..962aa0c 100644 (file)
--- a/lib/BackupPC/CGI/ArchiveInfo.pm
+++ b/lib/BackupPC/CGI/ArchiveInfo.pm
@@ -79,8 +79,8 @@ EOF
         $counter++;
     }
 
-    Header(eval("qq{$Lang->{Archive___num_details_for__host}}"));
-    print(eval("qq{$Lang->{Archive___num_details_for__host2 }}"));
+    my $content = eval("qq{$Lang->{Archive___num_details_for__host2 }}");
+    Header(eval("qq{$Lang->{Archive___num_details_for__host}}"),$content);
     Trailer();
 }
 

diff --git a/lib/BackupPC/CGI/Browse.pm b/lib/BackupPC/CGI/Browse.pm
index 3eb7f30..70dd4a1 100644 (file)
--- a/lib/BackupPC/CGI/Browse.pm
+++ b/lib/BackupPC/CGI/Browse.pm
@@ -218,11 +218,7 @@ EOF
                 if ( $gotDir ) {
                     $fileStr .= <<EOF;
 <tr><td class="fviewborder">
-    <table cellpadding="0" cellspacing="0" border="0"><tr><td>
-    <input type="checkbox" name="fcb$checkBoxCnt" value="$path">&nbsp;$iconStr
-    </td><td>
-        &nbsp;<a href="$MyURL?action=browse&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a>
-    </td></tr></table>
+    <input type="checkbox" name="fcb$checkBoxCnt" value="$path">&nbsp;$iconStr&nbsp;<a href="$MyURL?action=browse&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a>
 </td>
 $attrStr
 </tr>
@@ -230,11 +226,7 @@ EOF
                 } else {
                     $fileStr .= <<EOF;
 <tr><td class="fviewborder">
-    <table cellpadding="0" cellspacing="0" border="0"><tr><td>
-    <input type="checkbox" name="fcb$checkBoxCnt" value="$path">&nbsp;$iconStr
-    </td><td>
-        &nbsp;<a href="$MyURL?action=RestoreFile&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a>
-    </td></tr></table>
+    <input type="checkbox" name="fcb$checkBoxCnt" value="$path">&nbsp;$iconStr&nbsp;<a href="$MyURL?action=RestoreFile&host=${EscURI($host)}&num=$num&share=$shareURI&dir=$path">$fDisp</a>
 </td>
 $attrStr
 </tr>
@@ -290,23 +282,18 @@ EOF
     } else {
        $fileStr = eval("qq{$Lang->{The_directory_is_empty}}");
     }
-    my @otherDirs;
     my $pathURI  = $dir;
     my $shareURI = $share;
     $pathURI  =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
     $shareURI =~ s/([^\w.\/-])/uc sprintf("%%%02x", ord($1))/eg;
-    foreach my $i ( $view->backupList($share, $dir) ) {
-        push(@otherDirs, $i);
-    }
-    if ( @otherDirs ) {
-       my $otherDirs  = join(",\n", @otherDirs);
-        my $inc = 0;
-        foreach my $value (@otherDirs) {
-            my $selected = undef;
-            my $showDate = timeStamp2($Backups[$inc]{startTime});
-            $selected = " selected" if ($value == $num);
-            $otherDirs .= "<option value=\"$MyURL?action=browse&host=${EscURI($host)}&num=$value\"$selected>#$value - ($showDate)</option>\n";
-            $inc++;
+    if ( my @otherDirs = $view->backupList($share, $dir) ) {
+        my $otherDirs;
+        foreach my $i ( @otherDirs ) {
+            my $selected;
+            my $showDate  = timeStamp2($Backups[$i]{startTime});
+           my $backupNum = $Backups[$i]{num};
+            $selected   = " selected" if ( $backupNum == $num );
+            $otherDirs .= "<option value=\"$MyURL?action=browse&host=${EscURI($host)}&num=$backupNum&share=$shareURI&dir=$pathURI\"$selected>#$backupNum - ($showDate)</option>\n";
         }
         $filledBackup .= eval("qq{$Lang->{Visit_this_directory_in_backup}}");
     }

diff --git a/lib/BackupPC/CGI/DirHistory.pm b/lib/BackupPC/CGI/DirHistory.pm
index 728068f..f19bf94 100644 (file)
--- a/lib/BackupPC/CGI/DirHistory.pm
+++ b/lib/BackupPC/CGI/DirHistory.pm
@@ -71,7 +71,8 @@ sub action
         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"
@@ -84,10 +85,10 @@ sub action
        my %inode2name;
        my $nameCnt = 0;
        (my $fDisp  = "${EscHTML($f)}") =~ s/ /&nbsp;/g;
-       $fileStr   .= "<tr><td align=\"left\"  class=\"histView\">$fDisp</td>";\r
-       my($colSpan, $url, $inode, $type);\r
-       my $tdClass = ' class="histView"';\r
-       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 ) {
                #
@@ -110,16 +111,16 @@ sub action
                    $colSpan++;
                    next;
                }
-               $fileStr .= "<td align=center colspan=$colSpan$tdClass>"\r
+               $fileStr .= "<td align=center colspan=$colSpan$tdClass>"
                          . "$url</td>";
                $colSpan = 0;
-               $tdClass = ' class="histView"';\r
+               $tdClass = ' class="histView"';
            }
            if ( !defined($hist->{$f}[$i]) ) {
                $colSpan = 1;
                $url     = "&nbsp;";
                $inode   = -3;                  # special value for missing
-               $tdClass = ' class="histViewMis"';\r
+               $tdClass = ' class="histViewMis"';
                next;
            }
             if ( $dir eq "" ) {
@@ -155,7 +156,7 @@ EOF
            $colSpan = 1;
        }
        if ( $colSpan > 0 ) {
-           $fileStr .= "<td align=center colspan=$colSpan$tdClass>$url</td>";\r
+           $fileStr .= "<td align=center colspan=$colSpan$tdClass>$url</td>";
            $colSpan = 0;
        }
        $fileStr .= "</tr>\n";
@@ -165,8 +166,8 @@ EOF
     $dirDisplay =~ s{//+}{/}g;
     $dirDisplay =~ s{/+$}{}g;
     $dirDisplay = "/" if ( $dirDisplay eq "" );
-    my $content = eval("qq{$Lang->{DirHistory_for__host}}");\r
-    Header(eval("qq{$Lang->{DirHistory_backup_for__host}}"), $content);\r
+    my $content = eval("qq{$Lang->{DirHistory_for__host}}");
+    Header(eval("qq{$Lang->{DirHistory_backup_for__host}}"), $content);
     Trailer();
 }
 

diff --git a/lib/BackupPC/CGI/Lib.pm b/lib/BackupPC/CGI/Lib.pm
index 1a22698..4bc7227 100644 (file)
--- a/lib/BackupPC/CGI/Lib.pm
+++ b/lib/BackupPC/CGI/Lib.pm
@@ -93,11 +93,24 @@ sub NewRequest
     $Cgi = new CGI;
     %In = $Cgi->Vars;
 
+    if ( !defined($bpc) ) {
+       ErrorExit($Lang->{BackupPC__Lib__new_failed__check_apache_error_log})
+           if ( !($bpc = BackupPC::Lib->new(undef, undef, 1)) );
+       $TopDir = $bpc->TopDir();
+       $BinDir = $bpc->BinDir();
+       %Conf   = $bpc->Conf();
+       $Lang   = $bpc->Lang();
+       $ConfigMTime = $bpc->ConfigMTime();
+    } elsif ( $bpc->ConfigMTime() != $ConfigMTime ) {
+        $bpc->ServerMesg("log Re-read config file because mtime changed");
+        $bpc->ServerMesg("server reload");
+    }
+
     #
     # Default REMOTE_USER so in a miminal installation the user
     # has a sensible default.
     #
-    $ENV{REMOTE_USER} = $Conf{BackupPCUser} if ( !defined($ENV{REMOTE_USER}) );
+    $ENV{REMOTE_USER} = $Conf{BackupPCUser} if ( $ENV{REMOTE_USER} eq "" );
 
     #
     # We require that Apache pass in $ENV{SCRIPT_NAME} and $ENV{REMOTE_USER}.
@@ -108,19 +121,6 @@ sub NewRequest
     $MyURL  = $ENV{SCRIPT_NAME};
     $User   = $ENV{REMOTE_USER};
 
-    if ( !defined($bpc) ) {
-       ErrorExit($Lang->{BackupPC__Lib__new_failed__check_apache_error_log})
-           if ( !($bpc = BackupPC::Lib->new(undef, undef, 1)) );
-       $TopDir = $bpc->TopDir();
-       $BinDir = $bpc->BinDir();
-       %Conf   = $bpc->Conf();
-       $Lang   = $bpc->Lang();
-       $ConfigMTime = $bpc->ConfigMTime();
-    } elsif ( $bpc->ConfigMTime() != $ConfigMTime ) {
-        $bpc->ServerMesg("log Re-read config file because mtime changed");
-        $bpc->ServerMesg("server reload");
-    }
-
     #
     # Clean up %ENV for taint checking
     #
@@ -264,8 +264,8 @@ sub ServerConnect
         if ( CheckPermission() 
           && -f $Conf{ServerInitdPath}
           && $Conf{ServerInitdStartCmd} ne "" ) {
-            Header(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"));
-            print (eval("qq{$Lang->{Admin_Start_Server}}"));
+            my $content = eval("qq{$Lang->{Admin_Start_Server}}");
+            Header(eval("qq{$Lang->{Unable_to_connect_to_BackupPC_server}}"), $content);
             Trailer();
             exit(1);
         } else {
@@ -328,27 +328,22 @@ sub CheckPermission
 
 #
 # Returns the list of hosts that should appear in the navigation bar
-# for this user.  If $Conf{CgiNavBarAdminAllHosts} is set, the admin
-# gets all the hosts.  Otherwise, regular users get hosts for which
-# they are the user or are listed in the moreUsers column in the
-# hosts file.
+# for this user.  If $getAll is set, the admin gets all the hosts.
+# Otherwise, regular users get hosts for which they are the user or
+# are listed in the moreUsers column in the hosts file.
 #
 sub GetUserHosts
 {
-    my($host) = @_;
+    my($host, $getAll) = @_;
     my @hosts;
 
-    if ( $Conf{CgiNavBarAdminAllHosts} && CheckPermission() ) {
+    if ( $getAll && CheckPermission() ) {
         @hosts = sort keys %$Hosts;
     } else {
         @hosts = sort grep { $Hosts->{$_}{user} eq $User ||
                        defined($Hosts->{$_}{moreUsers}{$User}) } keys(%$Hosts);
     }
-    #
-    # return the selected host first (if present)
-    #
-    return @hosts if ( !defined($host) || !grep(/^$host$/, @hosts) );
-    return ($host, grep(!/^$host$/, @hosts));
+    return @hosts;
 }
 
 #
@@ -397,7 +392,8 @@ sub Header
         { link => "",                         name => $Lang->{Status},
                                               priv => 1},
         { link => "?action=adminOpts",        name => $Lang->{Admin_Options} },
-        { link => "?action=summary",          name => $Lang->{PC_Summary} },
+        { link => "?action=summary",          name => $Lang->{PC_Summary},
+                                              priv => 1},
         { link => "?action=view&type=LOG",    name => $Lang->{LOG_file} },
         { link => "?action=LOGlist",          name => $Lang->{Old_LOGs} },
         { link => "?action=emailSummary",     name => $Lang->{Email_summary} },
@@ -411,6 +407,8 @@ sub Header
         { link => "http://backuppc.sourceforge.net", name => "SourceForge",
                                               priv => 1},
     );
+    my $host = $In{host};
+
     print $Cgi->header();
     print <<EOF;
 <!doctype html public "-//W3C//DTD HTML 4.01 Transitional//EN">
@@ -421,67 +419,66 @@ $Conf{CgiHeaders}
 </head><body onLoad="document.getElementById('NavMenu').style.height=document.body.scrollHeight">
 <img src="$Conf{CgiImageDirURL}/logo.gif" hspace="5" vspace="7"><br>
 EOF
-    if (!defined($In{host})) {
-        print <<EOF;
+
+    if ( defined($Hosts) && defined($host) && defined($Hosts->{$host}) ) {
+       print "<div class=\"NavMenu\">";
+       NavSectionTitle("${EscURI($host)}");
+       print <<EOF;
+</div>
+<div class="NavMenu">
+EOF
+       NavLink("?host=${EscURI($host)}",
+               "$host $Lang->{Home}", " class=\"navbar\"");
+       NavLink("?action=browse&host=${EscURI($host)}",
+               $Lang->{Browse}, " class=\"navbar\"");
+       NavLink("?action=view&type=LOG&host=${EscURI($host)}",
+               $Lang->{LOG_file}, " class=\"navbar\"");
+       NavLink("?action=LOGlist&host=${EscURI($host)}",
+               $Lang->{LOG_files}, " class=\"navbar\"");
+       if ( -f "$TopDir/pc/$host/SmbLOG.bad"
+                   || -f "$TopDir/pc/$host/SmbLOG.bad.z"
+                   || -f "$TopDir/pc/$host/XferLOG.bad"
+                   || -f "$TopDir/pc/$host/XferLOG.bad.z" ) {
+          NavLink("?action=view&type=XferLOGbad&host=${EscURI($host)}",
+                   $Lang->{Last_bad_XferLOG}, " class=\"navbar\"");
+          NavLink("?action=view&type=XferErrbad&host=${EscURI($host)}",
+                   $Lang->{Last_bad_XferLOG_errors_only},
+                   " class=\"navbar\"");
+       }
+       if ( -f "$TopDir/pc/$host/config.pl" ) {
+           NavLink("?action=view&type=config&host=${EscURI($host)}",
+                   $Lang->{Config_file}, " class=\"navbar\"");
+       }
+       print <<EOF;
+</div>
 <div id="Content">
 $content
 <br><br><br>
 </div>
-<div class="NavMenu" id="NavMenu" style="height:100%">
+<div class="NavMenu" style="height:100%" id="NavMenu">
 EOF
     } else {
-        print "<div class=\"NavMenu\">";
-    }
-    NavSectionTitle($Lang->{Hosts});
-    my $hostSelectbox = "<option value=\"#\">Select a host...</option>";
-    my @hosts;
-    if ( defined($Hosts) && %$Hosts > 0 ) {
-        @hosts = GetUserHosts($In{host});
-        foreach my $host ( @hosts ) {
-            if ($In{host} eq $host) {
-                print <<EOF;
-</div>
-<div class="HostOn"> <a href="?host=${EscURI($host)}">$host</a> <br>
-<div class="HostOnContent">
-EOF
-                NavLink("?host=${EscURI($host)}",
-                        "$host $Lang->{Home}", " class=\"navbar\"");
-                NavLink("?action=browse&host=${EscURI($host)}",
-                        $Lang->{Browse}, " class=\"navbar\"");
-                NavLink("?action=view&type=LOG&host=${EscURI($host)}",
-                        $Lang->{LOG_file}, " class=\"navbar\"");
-                NavLink("?action=LOGlist&host=${EscURI($host)}",
-                        $Lang->{LOG_files}, " class=\"navbar\"");
-                if ( -f "$TopDir/pc/$host/SmbLOG.bad"
-                            || -f "$TopDir/pc/$host/SmbLOG.bad.z"
-                            || -f "$TopDir/pc/$host/XferLOG.bad"
-                            || -f "$TopDir/pc/$host/XferLOG.bad.z" ) {
-                   NavLink("?action=view&type=XferLOGbad&host=${EscURI($host)}",
-                            $Lang->{Last_bad_XferLOG}, " class=\"navbar\"");
-                   NavLink("?action=view&type=XferErrbad&host=${EscURI($host)}",
-                            $Lang->{Last_bad_XferLOG_errors_only},
-                            " class=\"navbar\"");
-                }
-                if ( -f "$TopDir/pc/$host/config.pl" ) {
-                    NavLink("?action=view&type=config&host=${EscURI($host)}",
-                            $Lang->{Config_file}, " class=\"navbar\"");
-                }
-                print <<EOF;
-</div></div>
+        print <<EOF;
 <div id="Content">
 $content
 <br><br><br>
 </div>
-<div class="NavMenu" style="height:100%" id="NavMenu">
+<div class="NavMenu" id="NavMenu" style="height:100%">
 EOF
-            } else {
-                NavLink("?host=${EscURI($host)}", $host) if ( @hosts < 6 );
-                $hostSelectbox .= "<option value=\"?host=${EscURI($host)}\">"
-                                . "$host</option>";
-            }
+    }
+    my $hostSelectbox = "<option value=\"#\">Select a host...</option>";
+    my @hosts = GetUserHosts($In{host}, $Conf{CgiNavBarAdminAllHosts});
+    if ( defined($Hosts) && %$Hosts > 0 && @hosts ) {
+       NavSectionTitle($Lang->{Hosts});
+        foreach my $host ( @hosts ) {
+           NavLink("?host=${EscURI($host)}", $host)
+                   if ( @hosts < $Conf{CgiNavBarAdminAllHosts} );
+           my $sel = " selected" if ( $host eq $In{host} );
+           $hostSelectbox .= "<option value=\"?host=${EscURI($host)}\"$sel>"
+                           . "$host</option>";
         }
     }
-    if ( @hosts >= 6 ) {
+    if ( @hosts >= $Conf{CgiNavBarAdminAllHosts} ) {
         print <<EOF;
 <br>
 <select onChange="document.location=this.value">
@@ -490,10 +487,9 @@ $hostSelectbox
 <br><br>
 EOF
     }
-    NavSectionTitle($Lang->{Host_or_User_name});
     print <<EOF;
 <form action="$MyURL" method="get">
-    <input type="text" name="host" size="10" maxlength="64">
+    <input type="text" name="host" size="14" maxlength="64">
     <input type="hidden" name="action" value="hostInfo"><input type="submit" value="$Lang->{Go}" name="ignore">
     </form>
 EOF
@@ -522,9 +518,7 @@ sub NavSectionTitle
 {
     my($head) = @_;
     print <<EOF;
-<div class="NavTitle">
-$head
-</div>
+<div class="NavTitle">$head</div>
 EOF
 }
 

diff --git a/lib/BackupPC/CGI/Restore.pm b/lib/BackupPC/CGI/Restore.pm
index 2a6d683..29cfcf8 100644 (file)
--- a/lib/BackupPC/CGI/Restore.pm
+++ b/lib/BackupPC/CGI/Restore.pm
@@ -98,6 +98,15 @@ EOF
        @fileList = ( $pathHdr );
     }
     if ( $In{type} == 0 ) {
+       #
+       # Build list of hosts
+       #
+       my $hostDestSel;
+       foreach my $h ( GetUserHosts() ) {
+           my $sel = " selected" if ( $h eq $In{host} );
+           $hostDestSel .= "<option value=\"$h\"$sel>${EscHTML($h)}</option>";
+       }
+
         #
         # Tell the user what options they have
         #

diff --git a/lib/BackupPC/CGI/Summary.pm b/lib/BackupPC/CGI/Summary.pm
index 50e730b..4d70694 100644 (file)
--- a/lib/BackupPC/CGI/Summary.pm
+++ b/lib/BackupPC/CGI/Summary.pm
@@ -48,8 +48,7 @@ sub action
     GetStatusInfo("hosts");
     my $Privileged = CheckPermission();
 
-    foreach my $host ( GetUserHosts() ) { ## give access to users hosts only
-    ## foreach my $host ( sort(keys(%Status)) ) {
+    foreach my $host ( GetUserHosts(undef, 1) ) {
         my($fullDur, $incrCnt, $incrAge, $fullSize, $fullRate, $reasonHilite);
        my($shortErr);
         my @Backups = $bpc->BackupInfoRead($host);

diff --git a/lib/BackupPC/Lang/en.pm b/lib/BackupPC/Lang/en.pm
index 3e6f5aa..7a38167 100644 (file)
--- a/lib/BackupPC/Lang/en.pm
+++ b/lib/BackupPC/Lang/en.pm
@@ -199,15 +199,14 @@ There are \$hostCntGood hosts that have been backed up for a total size of \${fu
 <input type="hidden" name="fcbMax" value="\$checkBoxCnt">
 <input type="hidden" name="type" value="1">
 <input type="hidden" name="action" value="Archive">
-<table cellpadding="0" cellspacing="0" bgcolor="#333333"><tr><td>
-<table border="0" width="100%" align="left" cellpadding="2" cellspacing="1">
-<tr bgcolor="#99cc33"><td align=center> Host</td>
+<table cellpadding="3" cellspacing="1">
+<tr class="tableheader"><td align=center> Host</td>
     <td align="center"> User </td>
     <td align="center"> Backup Size </td>
 \$strGood
 \$checkAllHosts
+</form>
 </table>
-</td></tr></table>
 <p>
 
 </table>
@@ -245,6 +244,7 @@ About to archive the following hosts
 <tr>
     <td colspan=2><input type="submit" value="Start the Archive" name=""></td>
 </tr>
+</form>
 </table>
 EOF
 
@@ -433,14 +433,14 @@ selected will be overwritten!
     <td><!--<input type="text" size="40" value="\${EscHTML(\$host)}"
         name="hostDest">-->
         <select name="hostDest" onChange="document.direct.shareDest.value=''">
-        <!-- hostOpt -->
+        \$hostDestSel
         </select>
         <script language="Javascript">
         function myOpen(URL) {
-               window.open(URL,'','width=200,height=200');
-       }
+               window.open(URL,'','width=500,height=400');
+        }
         </script>
-        <a href="javascript:myOpen('\$MyURL?action=findShares&host='+document.direct.hostDest.options.value)">Search for available shares</a></td>
+        <a href="javascript:myOpen('\$MyURL?action=findShares&host='+document.direct.hostDest.options.value)">Search for available shares (NOT IMPLEMENTED)</a></td>
 </tr><tr>
     <td>Restore the files to share</td>
     <td><input type="text" size="40" value="\${EscHTML(\$share)}"
@@ -1070,9 +1070,9 @@ $Lang{checkAll} = <<EOF;
 EOF
 
 $Lang{checkAllHosts} = <<EOF;
-<tr bgcolor="#ffffcc"><td>
+<tr><td class="fviewborder">
 <input type="checkbox" name="allFiles" onClick="return checkAll('allFiles');">&nbsp;Select all
-</td><td colspan="2" align="center">
+</td><td colspan="2" align="center" class="fviewborder">
 <input type="submit" name="Submit" value="Archive selected hosts">
 </td></tr>
 EOF

diff --git a/lib/BackupPC/Lang/fr.pm b/lib/BackupPC/Lang/fr.pm
index aabeb0d..f81c6f2 100644 (file)
--- a/lib/BackupPC/Lang/fr.pm
+++ b/lib/BackupPC/Lang/fr.pm
@@ -199,15 +199,14 @@ Il y a \$hostCntGood h
 <input type="hidden" name="fcbMax" value="\$checkBoxCnt">
 <input type="hidden" name="type" value="1">
 <input type="hidden" name="action" value="Archive">
-<table cellpadding="0" cellspacing="0" bgcolor="#333333"><tr><td>
-<table border="0" width="100%" align="left" cellpadding="2" cellspacing="1">
-<tr bgcolor="#99cc33"><td align=center> Host</td>
+<table cellpadding="3" cellspacing="1">
+<tr class="tableheader"><td align=center> Host</td>
     <td align="center"> Usager </td>
     <td align="center"> Taille </td>
 \$strGood
 \$checkAllHosts
+</form>
 </table>
-</td></tr></table>
 <p>
 
 </table>
@@ -245,6 +244,7 @@ Pr
 <tr>
     <td colspan=2><input type="submit" value="Démarrer l'archivage" name=""></td>
 </tr>
+</form>
 </table>
 EOF
 
@@ -433,14 +433,14 @@ tous les fichiers correspondant 
     <td><!--<input type="text" size="40" value="\${EscHTML(\$host)}"
         name="hostDest">-->
         <select name="hostDest" onChange="document.direct.shareDest.value=''">
-        <!-- hostOpt -->
+        \$hostDestSel
         </select>
         <script language="Javascript">
         function myOpen(URL) {
-               window.open(URL,'','width=200,height=200');
+               window.open(URL,'','width=500,height=400');
        }
         </script>
-        <a href="javascript:myOpen('\$MyURL?action=findShares&host='+document.direct.hostDest.options.value)">Chercher les partitions disponibles</a></td>
+        <a href="javascript:myOpen('\$MyURL?action=findShares&host='+document.direct.hostDest.options.value)">Chercher les partitions disponibles (ENGLISH: NOT IMPLEMENTED)</a></td>
 </tr><tr>
     <td>Restaurer les fichiers vers le partage</td>
     <td><input type="text" size="40" value="\${EscHTML(\$share)}"
@@ -1069,9 +1069,9 @@ $Lang{checkAll} = <<EOF;
 EOF
 
 $Lang{checkAllHosts} = <<EOF;
-<tr bgcolor="#ffffcc"><td> (ENGLISH)
+<tr><td class="fviewborder">
 <input type="checkbox" name="allFiles" onClick="return checkAll('allFiles');">&nbsp;Select all
-</td><td colspan="2" align="center">
+</td><td colspan="2" align="center" class="fviewborder">
 <input type="submit" name="Submit" value="Archive selected hosts">
 </td></tr>
 EOF

diff --git a/lib/BackupPC/Lib.pm b/lib/BackupPC/Lib.pm
index cef6d9c..fe31429 100644 (file)
--- a/lib/BackupPC/Lib.pm
+++ b/lib/BackupPC/Lib.pm
@@ -740,7 +740,8 @@ sub MakeFileLink
         return -2 if ( !defined($rawFile = $bpc->MD52Path($d, $compress)) );
         $rawFile .= "_$i" if ( $i >= 0 );
         if ( -f $rawFile ) {
-            if ( !compare($name, $rawFile) ) {
+            if ( (stat(_))[3] < $bpc->{Conf}{HardLinkMax}
+                    && !compare($name, $rawFile) ) {
                 unlink($name);
                 return -3 if ( !link($rawFile, $name) );
                 return 1;

diff --git a/lib/BackupPC/View.pm b/lib/BackupPC/View.pm
index b75321d..b035391 100644 (file)
--- a/lib/BackupPC/View.pm
+++ b/lib/BackupPC/View.pm
@@ -268,6 +268,9 @@ sub dirAttrib
     return $m->{files};
 }
 
+#
+# Return a listref of backup numbers that are merged to create this view
+#
 sub mergeNums
 {
     my($m) = @_;
@@ -275,6 +278,9 @@ sub mergeNums
     return $m->{mergeNums};
 }
 
+#
+# Return a list of backup indexes for which the directory exists
+#
 sub backupList
 {
     my($m, $share, $dir) = @_;
@@ -296,7 +302,7 @@ sub backupList
         }
         $path .= $sharePathM;
         next if ( !-d $path );
-        push(@backupList, $backupNum);
+        push(@backupList, $i);
     }
     return @backupList;
 }