cosmetics

[BackupPC.git] / lib / BackupPC / SearchLib.pm

diff --git a/lib/BackupPC/SearchLib.pm b/lib/BackupPC/SearchLib.pm
index 8334075..70dea68 100644 (file)
--- a/lib/BackupPC/SearchLib.pm
+++ b/lib/BackupPC/SearchLib.pm
@@ -87,7 +87,7 @@ sub getFiles($$)
                FROM files 
                        INNER JOIN shares       ON files.shareID=shares.ID
                        INNER JOIN hosts        ON hosts.ID = shares.hostID
-                       INNER JOIN backups      ON backups.num = files.backupNum
+                       INNER JOIN backups      ON backups.num = files.backupNum and backups.hostID = hosts.ID
                        LEFT  JOIN dvds         ON dvds.ID = files.dvdid
          };
 
@@ -280,11 +280,11 @@ sub displayGrid($$$$) {
        <table style="fview" width="100%">
                <tr> 
                <td class="tableheader">Host</td>
-               <td class="tableheader">Type</td>
                <td class="tableheader">Name</td>
-               <td class="tableheader">backup no.</td>
-               <td class="tableheader">size</td>
-               <td class="tableheader">date</td>
+               <td class="tableheader">Type</td>
+               <td class="tableheader">#</td>
+               <td class="tableheader">Size</td>
+               <td class="tableheader">Date</td>
                <td class="tableheader">Media</td>
                </tr>
        };
@@ -298,15 +298,13 @@ sub displayGrid($$$$) {
        }
 
        foreach $file (@files) {
-               my $ftype = "file";
-               $ftype = "dir" if ($file->{'type'} == BPC_FTYPE_DIR);
-
+               my $typeStr  = BackupPC::Attrib::fileType2Text(undef, $file->{'type'});
                $retHTML .= "<tr>";
 
                foreach my $v ((
                        $file->{'hname'},
-                       $ftype,
-                       hilite_html( $file->{'fpath'}, $hilite ),
+                       qq{<img src="$Conf{CgiImageDirURL}/icon-$typeStr.gif" align="center">&nbsp;} . hilite_html( $file->{'fpath'}, $hilite ),
+                       $typeStr,
                        $file->{'backupno'},
                        $file->{'size'},
                        $file->{'date'},