Squid-Accounting: Bugfix 10693

Fixes problem with last years month in webinterface and bill creation

diff --git a/lfs/squid-accounting b/lfs/squid-accounting
index 0dca63f751f4c43aa036d8fa53954c740fe7e194..184c9227fb170da74777ed2744e8a27a3c2c854d 100644 (file)
--- a/lfs/squid-accounting
+++ b/lfs/squid-accounting
@@ -9,7 +9,7 @@
 
 include Config
 
-VER        = 1.0.1
+VER        = 1.0.2
 
 THISAPP    = squid-accounting-$(VER)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index a19140d04cd055714d8dae3dd556b73222488d85..826be26b148234aaa0263fd2187caf848bb5a549 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);
 }