This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, next has been updated via a8e3b15d77512134c29d86ec0489d25f8a801fec (commit) via 57e86b559393116238e67dd3a7593d0ffcff6a1e (commit) via 61e19f97aa1ee3a68e7b8e720ae1e55940ff43fc (commit) via 382ffe320c05b4dc99a77f4e5002265d0e0c70c6 (commit) from 0ee35ce0cac70ac4da8817f2ed3c84d84ddcfc44 (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a8e3b15d77512134c29d86ec0489d25f8a801fec Author: Alexander Marx alexander.marx@ipfire.org Date: Sun May 3 05:24:39 2015 +0200

squid-accounting: fix monthly dbmove funktion to put values in history table

commit 57e86b559393116238e67dd3a7593d0ffcff6a1e Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 3 12:53:28 2015 +0200

core90: Add updated netovpnsrv.cgi to update

commit 61e19f97aa1ee3a68e7b8e720ae1e55940ff43fc Merge: 0ee35ce 382ffe3 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun May 3 12:52:50 2015 +0200

Merge remote-tracking branch 'amarx/core90' into next

commit 382ffe320c05b4dc99a77f4e5002265d0e0c70c6 Author: Alexander Marx alexander.marx@ipfire.org Date: Sun May 3 05:12:13 2015 +0200

Core90: make N2N Graphs higher to them correctly

Graphs in core 89 where not heigh enough so that they where zoomed which looked bad

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/core/90/filelists/files | 1 + html/cgi-bin/netovpnsrv.cgi | 2 +- src/squid-accounting/acct-lib.pl | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 35f0798..d4dcfae 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/geoip-block.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/html/themes/darkdos/include/style.css diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi index ddf4177..15a95b6 100755 --- a/html/cgi-bin/netovpnsrv.cgi +++ b/html/cgi-bin/netovpnsrv.cgi @@ -59,7 +59,7 @@ if ( $querry[0] ne ""){ if (@vpns){ foreach (@vpns) { &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); - &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); + &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320); &Header::closebox(); } }else{ diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl index 779ecf8..58b154a 100644 --- a/src/squid-accounting/acct-lib.pl +++ b/src/squid-accounting/acct-lib.pl @@ -93,8 +93,10 @@ sub delbefore { }

sub movedbdata { + &connectdb; $dbh->do("insert into ACCT_HIST select datetime(TIME_RUN,'unixepoch'),NAME,SUM(BYTES) from ACCT where datetime(TIME_RUN,'unixepoch') < datetime('now','start of month') group by NAME,datetime(TIME_RUN,'unixepoch');"); $dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','start of month');"); + &closedb; }

sub gethourgraphdata {

hooks/post-receive -- IPFire 2.x development tree