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

Fixed some minor errors

Browse Source
This commit is contained in:
Maniacikarus
2008-09-30 09:18:22 +02:00
parent f31d3c1f23
commit 2d0adb746e
6 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/cfgroot/graphs.pl
View File

@@ -3,7 +3,7 @@
############################################################################### ###############################################################################
# # # #
# IPFire.org - A linux based firewall # # IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt # # Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# # # #
# This program is free software: you can redistribute it and/or modify # # This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by # # it under the terms of the GNU General Public License as published by #
@@ -77,21 +77,21 @@ foreach (@sensorsdir){
# 3 if given is the height of the iframe default if nothing is given # 3 if given is the height of the iframe default if nothing is given
sub makegraphbox { sub makegraphbox {
my $height = 275; my $height = 285;
my $width = 700; my $width = 700;
if ( $_[3] ne "" ){ $height = $_[3]; } if ( $_[3] ne "" ){ $height = $_[3]; }
print "<center>"; print "<center>";
print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'>Hour</a>"; print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
print " - "; print " - ";
print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'>Day</a>"; print "<a href='".$_[0]."?".$_[1]."?day' target='".$_[1]."box'><b>".$Lang::tr{'day'}."</b></a>";
print " - "; print " - ";
print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'>Week</a>"; print "<a href='".$_[0]."?".$_[1]."?week' target='".$_[1]."box'><b>".$Lang::tr{'week'}."</b></a>";
print " - "; print " - ";
print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'>Month</a>"; print "<a href='".$_[0]."?".$_[1]."?month' target='".$_[1]."box'><b>".$Lang::tr{'month'}."</b></a>";
print " - "; print " - ";
print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'>Year</a>"; print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>"; print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
print "</center>"; print "</center>";
} }

4
config/menu/EX-wlanap.menu
View File

@@ -1,5 +1,5 @@
$subipfire->{'54.wlanap'} = {'caption' => wlanap, $subipfire->{'54.wlanap'} = {'caption' => WLanAP,
'uri' => '/cgi-bin/wlanap.cgi', 'uri' => '/cgi-bin/wlanap.cgi',
'title' => wlanap, 'title' => WLanAP,
'enabled' => 1, 'enabled' => 1,
}; };

6
html/cgi-bin/urlfilter.cgi
View File

@@ -1443,12 +1443,6 @@ print <<END
<td class='base'>$Lang::tr{'urlfilter msg text 3'}:&nbsp;<img src='/blob.gif' alt='*' /></td> <td class='base'>$Lang::tr{'urlfilter msg text 3'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='MSG_TEXT_3' value='$filtersettings{'MSG_TEXT_3'}' size='40' /></td> <td><input type='text' name='MSG_TEXT_3' value='$filtersettings{'MSG_TEXT_3'}' size='40' /></td>
</tr> </tr>
<tr>
<td class='base'>$Lang::tr{'urlfilter enable jpeg'}:</td>
<td><input type='checkbox' name='ENABLE_JPEG' $checked{'ENABLE_JPEG'}{'on'} /></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</table> </table>
<hr size='1'> <hr size='1'>
<table width='100%'> <table width='100%'>

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

@@ -1663,7 +1663,7 @@
'unknown' => 'UNKNOWN', 'unknown' => 'UNKNOWN',
'unnamed' => 'Unnamed', 'unnamed' => 'Unnamed',
'update' => 'Update', 'update' => 'Update',
'update accelerator' => 'update booster', 'update accelerator' => 'Update Booster',
'update time' => 'Update the time:', 'update time' => 'Update the time:',
'update transcript' => 'Update transcript', 'update transcript' => 'Update transcript',
'updatedatabase' => 'Update Database with last Report', 'updatedatabase' => 'Update Database with last Report',
@@ -1751,7 +1751,7 @@
'upstream proxy host:port' => 'Upstream proxy (host:port)', 'upstream proxy host:port' => 'Upstream proxy (host:port)',
'upstream username' => 'Upstream username:', 'upstream username' => 'Upstream username:',
'uptime and users' => 'Uptime and users:', 'uptime and users' => 'Uptime and users:',
'url filter' => 'content filter', 'url filter' => 'Content Filter',
'urlfilter access' => 'Access', 'urlfilter access' => 'Access',
'urlfilter activity detection' => 'Activity detection', 'urlfilter activity detection' => 'Activity detection',
'urlfilter add new time constraint rule' => 'Add new time constraint rule', 'urlfilter add new time constraint rule' => 'Add new time constraint rule',

2
lfs/hostapd
View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP) DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd PROG = hostapd
PAK_VER = 4 PAK_VER = 5
DEPS = "" DEPS = ""

6
src/initscripts/init.d/collectd
View File

@@ -63,8 +63,10 @@ case "$1" in
evaluate_retval evaluate_retval
;; ;;
restore) restore)
boot_mesg "Copying rrd files to ramd..." if [ -e $RRDLOG.bak ];then
cp -pR $RRDLOG.bak/* $RRDLOG/ boot_mesg "Copying rrd files to ramd..."
cp -pR $RRDLOG.bak/* $RRDLOG/
fi
;; ;;
status) status)
statusproc /usr/sbin/collectd statusproc /usr/sbin/collectd