use unit all over

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

diff --git a/lib/BackupPC/CGI/BurnMedia.pm b/lib/BackupPC/CGI/BurnMedia.pm
index 7d7eff3..7fce5df 100644 (file)
--- a/lib/BackupPC/CGI/BurnMedia.pm
+++ b/lib/BackupPC/CGI/BurnMedia.pm
@@ -4,10 +4,7 @@ use strict;
 use BackupPC::CGI::Lib qw(:all);
 use BackupPC::Search;
 use Data::Dumper;
-use vars qw($Cgi %In $MyURL $User %Conf $TopDir $BinDir $bpc);
-
-my $dsn = $Conf{SearchDSN};
-my $db_user = $Conf{SearchUser} || '';
+use vars qw($Cgi %In $MyURL $User $TopDir $BinDir $bpc);
 
 sub action() {
        my $cont = "";
@@ -15,7 +12,10 @@ sub action() {
        my $subtitle;
        my @files;
 
-       my $dbh = DBI->connect($dsn, $db_user, "", { RaiseError => 1, AutoCommit => 0 } );
+       $bpc->ConfigRead('_search_archive');
+       my %Conf = $bpc->Conf;
+
+       my $dbh = DBI->connect($Conf{SearchDSN}, $Conf{SearchUser}, "", { RaiseError => 1, AutoCommit => 0 } );
 
        BackupPC::CGI::Lib::NewRequest();
 #      $cont = Dumper(%In);
@@ -66,9 +66,12 @@ EOF
                        } 
                }
 
-               if ($total_size > ($Conf{MaxArchiveSize} * $parts)) {
-                       $cont .= eval( q{ ${h2(Error)}});
-                       $cont .= "Selected backups size " . sprintf("%1.2f", $total_size / 1024) ." Kb exceed max archive size " . sprintf("%1.2f", $Conf{MaxArchiveSize} / 1024) ." Kb.";
+               if ($total_size > ($Conf{ArchiveMediaSize} * $parts)) {
+                       $cont .= eval(' ${h2(Error)} ');
+                       $cont .= join(' '
+                               , "Selected backups size", unit($total_size)
+                               , "exceed medium size ", unit($Conf{ArchiveMediaSize})
+                       );
                } elsif ($total_size == 0) {
                        $cont .= eval( q{ ${h2(Error)}});
                        $cont .= "No backups selected.";
@@ -130,7 +133,7 @@ EOF
                                Archived following backups:
                        } . join(", ", @selected_backup_ids) . q{
                                <br/>with total size of
-                       <b>} . sprintf("%1.2f Mb", $total_size / 1024 / 1024) 
+                       <b>} . unit($total_size)
                        . q{</b>
                                to media <b>} . $dvd_nr . q{</b>
                                with following message:
@@ -141,6 +144,11 @@ EOF
                }
        }
 
+       $cont .= join(' '
+               , "ArchiveMediaSize:", unit($Conf{ArchiveMediaSize})
+               , "ArchiveChunkSize:", unit($Conf{ArchiveChunkSize})
+       );
+
        Header($Lang->{Burn_media}, "", 1, "", $cont);
 
        Trailer();