webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-15 05:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.ipfire.org:/pub/git/ipfire-2.x

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-01-02 11:29:57 +01:00
parent facf38edd1 132557976f
commit a91fd50d80
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lfs/squid-accounting
View File

@@ -15,7 +15,7 @@ THISAPP = squid-accounting-$(VER)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squid-accounting
PAK_VER = 3
PAK_VER = 4
DEPS = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards perl-PDF-API2 sendEmail"

1
src/squid-accounting/acct-lib.pl
View File

@@ -387,6 +387,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

4
src/squid-accounting/acct.pl
View File

@@ -210,7 +210,9 @@ sub sendbill {
my @now = localtime(time);
$now[5] = $now[5] + 1900;
my $actmonth = $now[4];
my $month = '0'.$actmonth if $actmonth < 10;
my $month;
$month = '0'.$actmonth if $actmonth < 10;
$month = '12' if $actmonth == 0;
my $actyear = $now[5];
my ($from,$till)=&ACCT::getmonth($actmonth,$actyear); #FIXME month and year as variables!
my @billar = &ACCT::GetTaValues($from,$till,$rggrp);