From 2d0adb746e7bf8f45c60eb12adf6d59bd93ab856 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Tue, 30 Sep 2008 09:18:22 +0200 Subject: [PATCH] Fixed some minor errors --- config/cfgroot/graphs.pl | 14 +++++++------- config/menu/EX-wlanap.menu | 4 ++-- html/cgi-bin/urlfilter.cgi | 6 ------ langs/en/cgi-bin/en.pl | 4 ++-- lfs/hostapd | 2 +- src/initscripts/init.d/collectd | 6 ++++-- 6 files changed, 16 insertions(+), 20 deletions(-) diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 1df8d45e55..9e7f79f4ce 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -3,7 +3,7 @@ ############################################################################### # # # 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 # # 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 sub makegraphbox { - my $height = 275; + my $height = 285; my $width = 700; if ( $_[3] ne "" ){ $height = $_[3]; } print "
"; - print "Hour"; + print "".$Lang::tr{'hour'}.""; print " - "; - print "Day"; + print "".$Lang::tr{'day'}.""; print " - "; - print "Week"; + print "".$Lang::tr{'week'}.""; print " - "; - print "Month"; + print "".$Lang::tr{'month'}.""; print " - "; - print "Year"; + print "".$Lang::tr{'year'}.""; print ""; print "
"; } diff --git a/config/menu/EX-wlanap.menu b/config/menu/EX-wlanap.menu index 2859cfb6da..95b6530528 100644 --- a/config/menu/EX-wlanap.menu +++ b/config/menu/EX-wlanap.menu @@ -1,5 +1,5 @@ - $subipfire->{'54.wlanap'} = {'caption' => wlanap, + $subipfire->{'54.wlanap'} = {'caption' => WLanAP, 'uri' => '/cgi-bin/wlanap.cgi', - 'title' => wlanap, + 'title' => WLanAP, 'enabled' => 1, }; diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi index 5ae2d8dc7a..af0964e104 100644 --- a/html/cgi-bin/urlfilter.cgi +++ b/html/cgi-bin/urlfilter.cgi @@ -1443,12 +1443,6 @@ print <$Lang::tr{'urlfilter msg text 3'}: * - - $Lang::tr{'urlfilter enable jpeg'}: - -   -   -
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index fc06ebca4e..a9273a8926 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1663,7 +1663,7 @@ 'unknown' => 'UNKNOWN', 'unnamed' => 'Unnamed', 'update' => 'Update', -'update accelerator' => 'update booster', +'update accelerator' => 'Update Booster', 'update time' => 'Update the time:', 'update transcript' => 'Update transcript', 'updatedatabase' => 'Update Database with last Report', @@ -1751,7 +1751,7 @@ 'upstream proxy host:port' => 'Upstream proxy (host:port)', 'upstream username' => 'Upstream username:', 'uptime and users' => 'Uptime and users:', -'url filter' => 'content filter', +'url filter' => 'Content Filter', 'urlfilter access' => 'Access', 'urlfilter activity detection' => 'Activity detection', 'urlfilter add new time constraint rule' => 'Add new time constraint rule', diff --git a/lfs/hostapd b/lfs/hostapd index f09e62a12c..962027d7cb 100644 --- a/lfs/hostapd +++ b/lfs/hostapd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = hostapd -PAK_VER = 4 +PAK_VER = 5 DEPS = "" diff --git a/src/initscripts/init.d/collectd b/src/initscripts/init.d/collectd index 9afb9944ca..f0f559ddb8 100644 --- a/src/initscripts/init.d/collectd +++ b/src/initscripts/init.d/collectd @@ -63,8 +63,10 @@ case "$1" in evaluate_retval ;; restore) - boot_mesg "Copying rrd files to ramd..." - cp -pR $RRDLOG.bak/* $RRDLOG/ + if [ -e $RRDLOG.bak ];then + boot_mesg "Copying rrd files to ramd..." + cp -pR $RRDLOG.bak/* $RRDLOG/ + fi ;; status) statusproc /usr/sbin/collectd -- 2.39.2