From: Alexander Marx <alexander.marx@ipfire.org>
Date: Tue, 2 Dec 2014 07:38:51 +0000 (+0100)
Subject: Squid-Accounting: Bugfix 10693
X-Git-Tag: v2.17-core89~83^2~54^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=ddfc0693e99bbc241f4e054ddcba85f0068596fd

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 0dca63f751..184c9227fb 100644
--- 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 a19140d04c..826be26b14 100644
--- 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);
 }