Merge branch 'work'

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1df8d45e55babeccc31c3a3bb79ac57f56f202fd..9e7f79f4ce6c732aca25b65a00080402300e02c0 100644 (file)
--- 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 "<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 "<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 "<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 "<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 "<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 "</center>";
 }

diff --git a/config/menu/EX-wlanap.menu b/config/menu/EX-wlanap.menu
index 2859cfb6da135f8b67fd65c58f8d54c151c327f0..95b6530528ad0f517bf18018a207378e5b801bff 100644 (file)
--- 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 5ae2d8dc7a74b74e021934e595d7a5683b6fbf5e..af0964e10437b86f811ce11957a4262bbc53f199 100644 (file)
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1443,12 +1443,6 @@ print <<END
        <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>
 </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>
 <hr size='1'>
 <table width='100%'>

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index fc06ebca4ea0a1b9737ffd4705b0b33e4b9441cc..a9273a8926f182950d6f013a26b5494e05bf6727 100644 (file)
--- 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 f09e62a12cf1927c09bd1cef0e273e5f70558a1a..962027d7cbce8b4ae0bf6267288a5bf509705df2 100644 (file)
--- 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 9afb9944cab0d8169efebfca88479b327d752e4e..f0f559ddb80c104cadbbc5b55a1196f2972e5fe6 100644 (file)
--- 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

diff --git a/tools/make-functions b/tools/make-functions
index c41f4c69a5cd1f428659742b205a537ab3048456..9eb7219532166a826c163ff552551c0b1d5a6c53 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -492,6 +492,8 @@ batch_script() {
 
        if [ "$IPFIRE_REBUILD" -eq "0" ]; then
                export IPFIRE_START_TIME=`date`
+
+               $0 clean
                evaluate 1
 
                $0 git update
@@ -507,12 +509,12 @@ batch_script() {
        evaluate 1 mail_me ERROR
 
        echo "### UPLOADING ISO"
-       #$0 upload iso
-       #evaluate 1 mail_me ISO
+       $0 upload iso
+       evaluate 1 mail_me ISO
        
        echo -ne "### UPLOADING PAKS"
-       #$0 upload paks
-       #evaluate 1 mail_me PAKS
+       $0 upload paks
+       evaluate 1 mail_me PAKS
 
        echo -ne "${BOLD}***SUCCESS!${NORMAL}"
        mail_me success