Merge branch 'seventeen-geoip' into next-geoip

[people/pmueller/ipfire-2.x.git] / src / squid-accounting / acct-lib.pl

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index f0081b7ef9551049e8ef027dc63e879a6aa496a8..7969a5023908b9c3e5dc402e57d5f5b45f1a618b 100644 (file)
--- a/src/squid-accounting/acct-lib.pl
+++ b/src/squid-accounting/acct-lib.pl
@@ -337,7 +337,12 @@ sub getmonth{
                my $monat=$_[0]-1 if($_[0]);
                my $tag=1;
                my $time1=timelocal(0,0,0,$tag,$monat,$jahr);
-               my $time2=timelocal(0,0,0,$tag,($monat+1),$jahr);
+               my $time2=0;
+               if (($monat+1) == 12){
+                       $time2=timelocal(0,0,0,$tag,0,$jahr+1);
+               }else{
+                       $time2=timelocal(0,0,0,$tag,$monat+1,$jahr);
+               }
                --$time2;
                return ($time1,$time2);
 }
@@ -387,6 +392,7 @@ sub pdf2 {
        my @billar              = @{$_[0]}; #DATA from sendbill (just host/values)
        my $month               = $_[1];
        $month                  = '0'.$month if $month < 10;
+       $month                  = '12' if $month == 0;
        my $year                = $_[2];
        my $mwst                = $_[3];
        my @address_cust= @{$_[4]}; #Array which contains customer and hoster adresses and some additional info from billgroup
@@ -460,7 +466,6 @@ sub pdf2 {
        $lines->linewidth('0.5');
 
        #Fill BILL DATA into PDF
-       setlocale(LC_ALL, "$mainsettings{'LANGUAGE'}_$uplang");
        foreach (@billar) {
                my ($a1,$a2) = split( /\,/, $_ );
                $a2=sprintf"%.2f",($a2/1024/1024);