kleine fixes am nettraffic

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@599 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-01 15:29:00 +00:00
parent 63978f8d6c
commit fd5c306475
5 changed files with 2146 additions and 9 deletions

View File

@@ -13,7 +13,7 @@ use strict;
# enable only the following on debugging purpose
use warnings;
require '/var/ipfire/general-functions.pl';
require '/var/ipcop/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/net-traffic/net-traffic-lib.pl";
require "${General::swroot}/net-traffic/net-traffic-admin.pl";
@@ -296,9 +296,9 @@ sub sendEmail
my $template = "";
my %ipfireSettings = ();
&General::readhash("${General::swroot}/main/settings", \%ipfireSettings);
my $host = "$ipfireSettings{'HOSTNAME'}.$ipfireSettings{'DOMAINNAME'}";
my %ipcopSettings = ();
&General::readhash("${General::swroot}/main/settings", \%ipcopSettings);
my $host = "$ipcopSettings{'HOSTNAME'}.$ipcopSettings{'DOMAINNAME'}";
my $subject = "[Net-Traffic] $host: ";

File diff suppressed because it is too large Load Diff

View File

@@ -1319,6 +1319,7 @@ srv/web/ipfire/cgi-bin/speed.cgi
srv/web/ipfire/cgi-bin/system.cgi
srv/web/ipfire/cgi-bin/time.cgi
srv/web/ipfire/cgi-bin/traffic.cgi
srv/web/ipfire/cgi-bin/trafficadm.cgi
srv/web/ipfire/cgi-bin/traffics.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/upload.cgi