From 382ffe320c05b4dc99a77f4e5002265d0e0c70c6 Mon Sep 17 00:00:00 2001
From: Alexander Marx <alexander.marx@ipfire.org>
Date: Sun, 3 May 2015 05:12:13 +0200
Subject: [PATCH 1/3] Core90: make N2N Graphs higher to them correctly

Graphs in core 89 where not heigh enough so that they where zoomed which
looked bad
---
 html/cgi-bin/netovpnsrv.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/html/cgi-bin/netovpnsrv.cgi b/html/cgi-bin/netovpnsrv.cgi
index ddf41771a..15a95b6b9 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{

From 57e86b559393116238e67dd3a7593d0ffcff6a1e Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 3 May 2015 12:53:28 +0200
Subject: [PATCH 2/3] core90: Add updated netovpnsrv.cgi to update

---
 config/rootfiles/core/90/filelists/files | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files
index 35f079823..d4dcfae61 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

From a8e3b15d77512134c29d86ec0489d25f8a801fec Mon Sep 17 00:00:00 2001
From: Alexander Marx <alexander.marx@ipfire.org>
Date: Sun, 3 May 2015 05:24:39 +0200
Subject: [PATCH 3/3] squid-accounting: fix monthly dbmove funktion to put
 values in history table

---
 src/squid-accounting/acct-lib.pl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/squid-accounting/acct-lib.pl b/src/squid-accounting/acct-lib.pl
index 779ecf810..58b154a34 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 {