webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2015-05-03 13:03:25 +02:00
parent 9666a34d0e a8e3b15d77
commit 2c97e77300
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/90/filelists/files
View File

@@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/geoip-block.cgi srv/web/ipfire/cgi-bin/geoip-block.cgi
srv/web/ipfire/cgi-bin/index.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/ovpnmain.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/darkdos/include/style.css srv/web/ipfire/html/themes/darkdos/include/style.css

2
html/cgi-bin/netovpnsrv.cgi
View File

@@ -59,7 +59,7 @@ if ( $querry[0] ne ""){
if (@vpns){ if (@vpns){
foreach (@vpns) { foreach (@vpns) {
&Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}"); &Header::openbox('100%', 'center', "$_ $Lang::tr{'graph'}");
&Graphs::makegraphbox("netovpnsrv.cgi",$_, "day"); &Graphs::makegraphbox("netovpnsrv.cgi",$_, "day",320);
&Header::closebox(); &Header::closebox();
} }
}else{ }else{

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

@@ -93,8 +93,10 @@ sub delbefore {
} }
sub movedbdata { 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("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');"); $dbh->do("DELETE FROM ACCT WHERE datetime(TIME_RUN,'unixepoch') < date('now','start of month');");
&closedb;
} }
sub gethourgraphdata { sub gethourgraphdata {