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

Ajax Speedmeter ist ueber Guioptions deaktivierbar -> friss gut CPU

Browse Source 
Connections CGI sollte die IPSec Verbindungen einfaerben
Hardwaregraphen sollten wieder funktionieren
QOS gefixt,viele kleine Fehler
Squid Initskript setzt die Squid und Squidguard logs auch owner squid


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@633 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
maniacikarus
2007-06-16 14:30:20 +00:00
parent 76c87b23cb
commit 18322edf27
13 changed files with 106 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
html/cgi-bin/connections.cgi
View File

@@ -40,9 +40,14 @@ open (ACTIVE, 'iptstate -1rbt |') or die 'Unable to open ip_conntrack';
my @active = <ACTIVE>;
close (ACTIVE);
my @vpn = ('none');
#open (ACTIVE, "/proc/net/ipsec_eroute") and @vpn = <ACTIVE>;
#close (ACTIVE);
my @vpn = ` route -n | grep ipsec | awk '{ print \$1" "\$3}'`;
foreach my $route (@vpn) {
chomp($route);
my @temp = split(/[\t ]+/, $route);
push(@network, $temp[0]);
push(@masklen, $temp[1]);
push(@colour, ${Header::colourvpn} );
}
my $aliasfile = "${General::swroot}/ethernet/aliases";
open(ALIASES, $aliasfile) or die 'Unable to open aliases file.';

16
html/cgi-bin/gui.cgi
View File

@@ -26,6 +26,7 @@ my $errormessage='';
$cgiparams{'FX'} = 'off';
$cgiparams{'SPEED'} = 'off';
$cgiparams{'WINDOWWITHHOSTNAME'} = 'off';
$cgiparams{'REFRESHINDEX'} = 'off';
$cgiparams{'ACTION'} = '';
@@ -77,6 +78,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
$mainsettings{'WINDOWWITHHOSTNAME'} = $cgiparams{'WINDOWWITHHOSTNAME'};
$mainsettings{'PPPUPDOWNBEEP'} = $cgiparams{'PPPUPDOWNBEEP'};
$mainsettings{'FX'} = $cgiparams{'FX'};
$mainsettings{'SPEED'} = $cgiparams{'SPEED'};
$mainsettings{'THEME'} = $cgiparams{'theme'};
$mainsettings{'REFRESHINDEX'} = $cgiparams{'REFRESHINDEX'};
&General::writehash("${General::swroot}/main/settings", \%mainsettings);
@@ -112,6 +114,11 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}")
} else {
$cgiparams{'REFRESHINDEX'} = 'off';
}
if($mainsettings{'SPEED'}) {
$cgiparams{'SPEED'} = $mainsettings{'SPEED'};
} else {
$cgiparams{'SPEED'} = 'off';
}
}
# Default settings
@@ -121,6 +128,7 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'restore defaults'}")
$cgiparams{'PPPUPDOWNBEEP'} = 'on';
$cgiparams{'REFRESHINDEX'} = 'off';
$cgiparams{'FX'} = 'on';
$cgiparams{'SPEED'} = 'on';
$cgiparams{'THEME'} = 'ipfire';
}
@@ -140,6 +148,10 @@ $checked{'FX'}{'off'} = '';
$checked{'FX'}{'on'} = '';
$checked{'FX'}{$cgiparams{'FX'}} = "checked='checked'";
$checked{'SPEED'}{'off'} = '';
$checked{'SPEED'}{'on'} = '';
$checked{'SPEED'}{$cgiparams{'SPEED'}} = "checked='checked'";
&Header::openpage($Lang::tr{'gui settings'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
@@ -169,6 +181,10 @@ print <<END
<td><input type='checkbox' name='REFRESHINDEX' $checked{'REFRESHINDEX'}{'on'} /></td>
<td>$Lang::tr{'refresh index page while connected'}</td>
</tr>
<tr>
<td><input type='checkbox' name='SPEED' $checked{'SPEED'}{'on'} /></td>
<td>$Lang::tr{'show ajax speedmeter in footer'}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>$Lang::tr{'languagepurpose'}</td>

8
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -180,7 +180,7 @@ if ($cgigraphs[1] =~ /hddtemp/){
}
&Header::closebox();
print "<div align='center'><table width='80%'><tr><td align='center'>";
print "<a href='/cgi-bin/mbmongraph.cgi'>";
print "<a href='/cgi-bin/hardwaregraphs.cgi=${graph}'>";
print "$Lang::tr{'back'}</a></td></tr></table></div>\n";
}
else
@@ -192,7 +192,7 @@ else
{
my $ftime = localtime((stat("$graphdir/mbmon-temp-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/mbmongraph.cgi?graph=temp'>";
print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=temp'>";
print "<img src='/graphs/mbmon-temp-day.png' border='0' />";
print "</a>";
}
@@ -211,7 +211,7 @@ else
{
my $ftime = localtime((stat("$graphdir/mbmon-fan-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/mbmongraph.cgi?graph=fan'>";
print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=fan'>";
print "<img src='/graphs/mbmon-fan-day.png' border='0' />";
print "</a>";
}
@@ -230,7 +230,7 @@ else
{
my $ftime = localtime((stat("$graphdir/mbmon-volt-day.png"))[9]);
print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
print "<a href='/cgi-bin/mbmongraph.cgi?graph=volt'>";
print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=volt'>";
print "<img src='/graphs/mbmon-volt-day.png' border='0' />";
print "</a>";
}

4
html/cgi-bin/ids.cgi
View File

@@ -223,7 +223,7 @@ if (-e "/etc/snort/snort.conf") {
close(FILE);
if ($restartsnortrequired) {
system('/usr/local/bin/snortctrl','restart');
system('/usr/local/bin/snortctrl restart >/dev/null');
}
}
@@ -271,7 +271,7 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'save'})
unlink "${General::swroot}/snort/enable_orange";
}
system('/usr/local/bin/snortctrl','restart');
system('/usr/local/bin/snortctrl restart >/dev/null');
} else {
# INSTALLMD5 is not in the form, so not retrieved by getcgihash

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

@@ -31,8 +31,6 @@ my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
###
### Initialize variables
###

5
html/cgi-bin/proxy.cgi
View File

@@ -21,6 +21,11 @@ my @squidversion = `/usr/sbin/squid -v`;
my $http_port='81';
my $https_port='444';
my %color = ();
my %mainsettings = ();
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
my %proxysettings=();
my %netsettings=();
my %filtersettings=();

48
html/cgi-bin/qos.cgi
View File

@@ -762,8 +762,8 @@ END
print "<tr><td colspan='3' align='center'>$message";
}
if ( $qossettings{'EDIT'} eq 'yes' ) {
print "<input type='hidden' name='CLASS' value=$qossettings{'CLASS'} />";
print "<input type='hidden' name='DEVICE' value=$qossettings{'DEVICE'} />";
print "<input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' />";
print "<input type='hidden' name='DEVICE' value='$qossettings{'DEVICE'}' />";
}
print <<END
<tr><td width='100%' colspan='3'>Geben sie die Daten ein <br /> und klicken Sie danach auf <i>Speichern</i>.
@@ -782,8 +782,8 @@ END
$qossettings{'IMQ_DEV_SEL'} = 'selected';
}
print <<END
<option value=$qossettings{'RED_DEV'} $qossettings{'RED_DEV_SEL'}>$qossettings{'RED_DEV'}</option>
<option value=$qossettings{'IMQ_DEV'} $qossettings{'IMQ_DEV_SEL'}>$qossettings{'IMQ_DEV'}</option></select>
<option value='$qossettings{'RED_DEV'}' $qossettings{'RED_DEV_SEL'}>$qossettings{'RED_DEV'}</option>
<option value='$qossettings{'IMQ_DEV'}' $qossettings{'IMQ_DEV_SEL'}>$qossettings{'IMQ_DEV'}</option></select>
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Klasse:<td width='33%' align='left'>
END
@@ -845,7 +845,7 @@ END
<td width='66%' colspan='2' align='left'><input type='text' name='REMARK' size='40' maxlength='40' value="$qossettings{'REMARK'}" /> <img alt="" alt='blob' src='/blob.gif' />
<tr><td width='33%' align='right'>&nbsp;
<td width='33%' align='left'>&nbsp;
<td width='33%' align='center'><input type='submit' name='DOCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
<td width='33%' align='center'><input type='submit' name='DOCLASS' value='$Lang::tr{'save'}' />&nbsp;<input type='reset' value='$Lang::tr{'reset'}' />
</table></form>
END
;
@@ -920,7 +920,7 @@ END
<option value='1'>Minimale Kosten (1)</option></select>
<td width='33%' align='center'><input type='hidden' name='CLASS' value="$qossettings{'CLASS'}" />
<input type='hidden' name='DEVICE' value="$qossettings{'DEVICE'}" />
<input type='submit' name='DOSCLASS' value=$Lang::tr{'save'} />&nbsp;<input type='reset' value=$Lang::tr{'reset'} />
<input type='submit' name='DOSCLASS' value='$Lang::tr{'save'}' />&nbsp;<input type='reset' value='$Lang::tr{'reset'}' />
</table></form>
END
;
@@ -961,11 +961,11 @@ END
print <<END
</select><td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Quell-IP-Adresse:
<td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value=$qossettings{'QIP'} />
<td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Ziel-IP-Adresse:
<td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value=$qossettings{'DIP'} />
<td width='33%' align='center'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'} /><input type='submit' name='DOLEVEL7' value=$Lang::tr{'save'} />
<td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
<td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOLEVEL7' value='$Lang::tr{'save'}' />
</table></form>
END
;
@@ -998,17 +998,17 @@ END
print <<END
</select><td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Quell-Port:
<td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value=$qossettings{'QPORT'} />
<td width='33%' align='left'><input type='text' name='QPORT' maxlength='5' value='$qossettings{'QPORT'}' />
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Ziel-Port:
<td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value=$qossettings{'DPORT'} />
<td width='33%' align='left'><input type='text' name='DPORT' maxlength='5' value='$qossettings{'DPORT'}' />
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Quell-IP-Adresse:
<td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value=$qossettings{'QIP'} />
<td width='33%' align='left'><input type='text' name='QIP' maxlength='15' value='$qossettings{'QIP'}' />
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>Ziel-IP-Adresse:
<td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value=$qossettings{'DIP'} />
<td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value=$Lang::tr{'save'} />
<td width='33%' align='left'><input type='text' name='DIP' maxlength='15' value='$qossettings{'DIP'}' />
<td width='33%' align='center'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOPORT' value='$Lang::tr{'save'}' />
</table></form>
END
;
@@ -1035,7 +1035,7 @@ END
<tr><td width='50%' align='left'>Maximaler Durchsatz (4) <td width='50%'><input type="radio" name="TOS" value="4" $checked[4] />
<tr><td width='50%' align='left'>Maximale Zuverlaessigkeit (2) <td width='50%'><input type="radio" name="TOS" value="2" $checked[2] />
<tr><td width='50%' align='left'>Minimale Kosten (1) <td width='50%'><input type="radio" name="TOS" value="1" $checked[1] />
<tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value=$qossettings{'CLASS'} /><input type='submit' name='DOTOS' value=$Lang::tr{'save'} />
<tr><td width='100%' align='right' colspan='2'><input type='hidden' name='CLASS' value='$qossettings{'CLASS'}' /><input type='submit' name='DOTOS' value='$Lang::tr{'save'}' />
</table></form>
END
;
@@ -1065,7 +1065,7 @@ sub showclasses {
@classline = split( /\;/, $classentry );
if ( $classline[0] eq $qossettings{'DEV'} )
{
&Header::openbox('100%', 'center', "Klasse: $classline[1]");
&Header::openbox('100%', 'center', "Klasse: $classline[1]");
print <<END
<table border='0' width='100%' cellspacing='0'>
<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
@@ -1270,9 +1270,6 @@ END
}
END
;
}
foreach $subclassentry (sort @subclasses)
{
@subclassline = split( /\;/, $subclassentry );
@@ -1312,9 +1309,10 @@ END
</table>
END
;
&Header::closebox();
&Header::closebox();
}
}
}
}
}
sub expert
@@ -1324,14 +1322,14 @@ sub expert
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<table width='66%'>
<tr><td width='33%' align='right'>MTU:<td width='33%' align='left'>
<input type='text' name='MTU' maxlength='8' required='4' value=$qossettings{'MTU'} />
<input type='text' name='MTU' maxlength='8' required='4' value='$qossettings{'MTU'}' />
<td width='33%' align='center'>Diese Einstellung aendert die MTU nicht global sondern nur fuer das QoS.
<tr><td width='33%' align='right'>Queue Laenge:<td width='33%' align='left'>
<input type='text' name='QLENGTH' maxlength='8' required='2' value=$qossettings{'QLENGTH'} />
<input type='text' name='QLENGTH' maxlength='8' required='2' value='$qossettings{'QLENGTH'}' />
<td width='33%' align='center'>&nbsp;
<tr><td width='33%' align='right'>SFQ Perturb:<td width='33%' align='left'>
<input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value=$qossettings{'SFQ_PERTUB'} />
<td width='33%' align='center'><input type='submit' name='ACTION' value=$Lang::tr{'save'} />
<input type='text' name='SFQ_PERTUB' maxlength='8' required='1' value='$qossettings{'SFQ_PERTUB'}' />
<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
</table>
</form>
END

BIN
html/html/images/openvpn.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

18
html/html/themes/ipfire/include/functions.pl
View File

@@ -156,6 +156,10 @@ END
}
}
</script>
END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" language="javascript">
var http_request = false;
@@ -211,6 +215,12 @@ END
</script>
</head>
<body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
END
;
}
else {
print "</head><body>";}
print <<END
<!-- IPFIRE HEADER -->
<div id="header">
@@ -341,11 +351,19 @@ END
<br class="clear" />
<div id="footer" class="fixed">
<b>Status:</b> $status <b>Uptime:</b>$uptime <b>Version:</b> $FIREBUILD
END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<br />
<form name='speed'>
<b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: 1px solid #FFFFFF; padding: 0; background-color: #FFFFFF; vertical-align: middle" />
$Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: 1px solid #FFFFFF; padding: 0; background-color: #FFFFFF; vertical-align: middle"/>
</form>
END
;
}
print <<END
</div>
</div>
</div>

32
html/html/themes/maniac/include/functions.pl
View File

@@ -156,6 +156,10 @@ END
}
}
</script>
END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" language="javascript">
var http_request = false;
@@ -211,6 +215,12 @@ END
</script>
</head>
<body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
END
;
}
else {
print "</head><body>";}
print <<END
<!-- IPFIRE HEADER -->
<div id="header">
@@ -341,13 +351,21 @@ END
<br class="clear" />
<div id="footer" class="fixed">
<b>Status:</b> $status <b>Uptime:</b>$uptime <b>Version:</b> $FIREBUILD
<br />
<form name='speed'>
<b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: 1px solid black; padding: 0; background-color:black; vertical-align: middle" />
$Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: 1px solid black; padding: 0; background-color:black; vertical-align: middle" />
</form>
</div>
</div>
END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<br />
<form name='speed'>
<b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: 1px solid #FFFFFF; padding: 0; background-color: #FFFFFF; vertical-align: middle" />
$Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: 1px solid #FFFFFF; padding: 0; background-color: #FFFFFF; vertical-align: middle"/>
</form>
END
;
}
print <<END
</div>
</div>
</div>
</body>
</html>

1
langs/de/cgi-bin/de.pl
View File

@@ -1307,6 +1307,7 @@
'shared memory' => 'Gemeins. Speicher',
'sharename' => 'Freigabename',
'shares' => 'Freigaben',
'show ajax speedmeter in footer' => 'Ajax Speed Anzeige',
'show ca certificate' => 'CA Zertifikat anzeigen',
'show certificate' => 'Zertifikat anzeigen',
'show crl' => 'Certificate Revocation List anzeigen',

1
langs/en/cgi-bin/en.pl
View File

@@ -1313,6 +1313,7 @@
'shared memory' => 'Shared Memory',
'sharename' => 'Sharename',
'shares' => 'Shares',
'show ajax speedmeter in footer' => 'Show Ajax Speedmeter',
'show areas' => 'show areas',
'show ca certificate' => 'Show CA Certificate',
'show certificate' => 'Show Certificate',

3
src/initscripts/init.d/squid
View File

@@ -4,6 +4,9 @@
. /etc/sysconfig/rc
. $rc_functions
chown -R squid:squid /var/log/squid
chown -R squid:squid /var/log/squidGuard
transparent() {
DEVICE=$1