Hinzugefügt:

  * Kleiner Tux im Webinterface für den eXciter und den Benne :)
Geändert:
  * time.cgi überarbeitet und Funktion verbessert.
  * index.cgi - noch ein Paar Fehler behoben oder was hinzugefügt.
  * FLASH-Eintrag aus der crontab gelöscht.
  * Online-Hilfe-Rettungsringe (die hässlichen) aus den CGIs entfernt.
  * Logger von ipcop nach ipfire umgestellt.
Gelöscht:
  * Nicht benötigte Reste vom IPCop entfernt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@160 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index b40327a6252dec0a5428b1490a9689c541a60d71..d8c2bb959fc997e15e5db9cd066f435fc2139322 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -23,14 +23,14 @@ $|=1; # line buffering
 $General::version = 'VERSION';
 $General::swroot = 'CONFIG_ROOT';
 $General::noipprefix = 'noipg-';
-$General::adminmanualurl = 'http://www.ipcop.org/1.4.0/en/admin/html';
+$General::adminmanualurl = 'http://users.ipfire.eu';
 
 sub log
 {
        my $logmessage = $_[0];
        $logmessage =~ /([\w\W]*)/;
        $logmessage = $1;
-       system('/usr/bin/logger', '-t', 'ipcop', $logmessage);
+       system('/usr/bin/logger', '-t', 'ipfire', $logmessage);
 }
 
 sub readhash
@@ -481,7 +481,7 @@ sub FetchPublicIp {
     my ($out, $response) = Net::SSLeay::get_http(  'checkip.dyndns.org',
                                                    80,
                                                    "/",
-                                                   Net::SSLeay::make_headers('User-Agent' => 'Ipcop' )
+                                                   Net::SSLeay::make_headers('User-Agent' => 'IPFire' )
                                                );
     if ($response =~ m%HTTP/1\.. 200 OK%) {
        $out =~ /Current IP Address: (\d+.\d+.\d+.\d+)/;

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 065bb690b2bcf16c98b61870486d62e1563ff406..3d84c1cc28eeed87da555ed66a9063a08b85de0e 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -760,7 +760,7 @@ END
     &showsubsection($menu);
 
     print <<END
-
+      <p><center><img src="/images/iptux.png" width='160px' height='160px'></center></p>
       </td>
         <td width="100%" valign="top">
         <div id="page-content">

diff --git a/config/cfgroot/time-settings b/config/cfgroot/time-settings
index 2f74f9ccc9b6fac3b2a6a3023d90b8cc838f425e..577b0b3455e700a1eaf6977c4a7ffebf0a67b8c1 100644 (file)
--- a/config/cfgroot/time-settings
+++ b/config/cfgroot/time-settings
@@ -3,5 +3,5 @@ UPDATE_PERIOD=daily
 UPDATE_VALUE=1
 UPDATE_METHOD=manually
 ENABLENTP=off
-NTP_ADDR_1=pool.ntp.org
+NTP_ADDR_1=de.pool.ntp.org
 VALID=yes

diff --git a/config/cron/crontab b/config/cron/crontab
index 435328befe63f449aa3deb039c9200ebae9ec5a2..f51a686a4d8a9fc94206d39f93a54a98d427eb2c 100644 (file)
--- a/config/cron/crontab
+++ b/config/cron/crontab
@@ -9,9 +9,6 @@ HOME=/
 # Log rotation
 01 * * * *     /usr/sbin/logrotate /etc/logrotate.conf
 
-# Backup logs to flashdisk
-01 * * * *     [ -f "/etc/FLASH" ] && /etc/rc.d/rc.flash.down
-
 # Set time
 */5 * * * *    /usr/local/bin/timecheck > /dev/null 2>&1
 

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index be7e0bf5319ab1ffb7bb85bc88fe125d74c4c57c..11fbb6a187cd60767ac941d1cca3c6ddf5759a93 100644 (file)
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -576,9 +576,7 @@ print <<END
     <td class='base' width='25%'><img src='/blob.gif' align='top' alt='*' />&nbsp;$Lang::tr{'this field may be blank'}</td>
     <td class='base' width='30%'>$warnNTPmessage</td>
     <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-    <td width='5%' align='right'>
-        <a href='${General::adminmanualurl}/services.html#services_dhcp' target='_blank'>
-        <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 </form>

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 7bcf44522450266a16566cc33fc187249692989f..9233628df3b4813862419f957174d9c996b9458f 100644 (file)
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -102,13 +102,12 @@ print <<END;
 
 <!-- Table of networks -->
 <table border='0' width=80%>
-  <!--  Headline -->
   <tr> <th bgcolor='lightgrey'>$Lang::tr{'network'}
        <th bgcolor='lightgrey'>IP
        <th bgcolor='lightgrey'>$Lang::tr{'status'}
-  <!-- RED -->
   <tr> <td bgcolor='$Header::colourred' width='25%'><font size='2' color='white'><b>$Lang::tr{'internet'}:</b></font><br>
-       <td width='30%'>$ipaddr <td width='45%'>$connstate
+       <td width='30%'>$ipaddr 
+       <td width='45%'>$connstate
        <tr><td colspan='2'>
                <form method='post' action='/cgi-bin/dial.cgi'>$Lang::tr{'profile'}:
                        <select name='PROFILE'>
@@ -161,13 +160,14 @@ END
                        if ( `cat /var/ipfire/proxy/advanced/settings | grep ^TRANSPARENT_BLUE=on` ) { print " (transparent)"; }
                }       else { print "Proxy aus"; }
        }
-       if (`ifconfig | grep $netsettings{'ORANGE_DEV'}`) { print <<END;
+       if ( $netsettings{'ORANGE_DEV'} ) { print <<END;
                <tr><td bgcolor='$Header::colourorange' width='25%'><font size='2' color='white'><b>$Lang::tr{'dmz'}:</b></font><br>
                <td width='30%'>$netsettings{'ORANGE_ADDRESS'}
                <td width='45%'><font color=$Header::colourgreen>Online</font>
 END
        }
-       if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ) { 
+       if ( `cat /var/ipfire/vpn/settings | grep ^ENABLED=on` ||
+            `cat /var/ipfire/vpn/settings | grep ^ENABLED_BLUE=on` ) { 
                my $ipsecip = `cat /var/ipfire/vpn/settings | grep ^VPN_IP= | cut -c 8-`;
                print <<END;
                <tr><td bgcolor='$Header::colourvpn' width='25%'><font size='2' color='white'><b>$Lang::tr{'vpn'}:</b></font><br>

diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index fcd77e5483093935000b067a53bfca0a6366139c..bd3333b1e5cb5b6aca35eedad57d5ac392ed4556 100644 (file)
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -714,9 +714,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}){
        }
 }
 print <<END
-       <td width='5%' align='right'>
-               <a href='${General::adminmanualurl}/section-firewall.html#section-port-forwarding' target='_blank'>
-               <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+       <td width='5%' align='right'>&nbsp;</td>
        </tr>
 </table>
 END

diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi
index 4ccf805ae0b9766d161ac5726dfa46346c95c785..cd0ace7d3fd1243c4ae0894df45a919c2262151c 100644 (file)
--- a/html/cgi-bin/shutdown.cgi
+++ b/html/cgi-bin/shutdown.cgi
@@ -186,9 +186,7 @@ END
     <td width='30%' align='center'>
         <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
     </td>
-    <td width='10%' align='right'>
-        <a href='${General::adminmanualurl}/system.html#shutdown' target='_blank'>
-        <img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='10%' align='right'>&nbsp;
 </tr>
 </table>
 

diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index aa96479da47ccf527253c001e7a36693a7b2f56c..9b599453b583daf6d5a2e1ee4c0265a450a17765 100644 (file)
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -19,7 +19,7 @@ use strict;
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
-require 'CONFIG_ROOT/general-functions.pl';
+require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
@@ -46,49 +46,6 @@ $timesettings{'SETYEAR'} = '';
 
 &Header::getcgihash(\%timesettings);
 
-if ($timesettings{'ACTION'} eq $Lang::tr{'instant update'})
-{
-       if ($timesettings{'SETHOUR'} eq '' || $timesettings{'SETHOUR'} < 0 || $timesettings{'SETHOUR'} > 23) {
-               $errormessage = $Lang::tr{'invalid time entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETMINUTES'} eq '' || $timesettings{'SETMINUTES'} < 0 || $timesettings{'SETMINUTES'} > 59) {
-               $errormessage = $Lang::tr{'invalid time entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETDAY'} eq '' || $timesettings{'SETDAY'} < 1 || $timesettings{'SETDAY'} > 31) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETMONTH'} eq '' || $timesettings{'SETMONTH'} < 1 || $timesettings{'SETMONTH'} > 12) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-       if ($timesettings{'SETYEAR'} eq '' || $timesettings{'SETYEAR'} < 2003 || $timesettings{'SETYEAR'} > 2030) {
-               $errormessage = $Lang::tr{'invalid date entered'};
-               goto UPDTERROR;
-       }
-
-UPDTERROR:
-       if ($errormessage) {
-               $timesettings{'VALID'} = 'no'; }
-       else {
-               $timesettings{'VALID'} = 'yes'; }
-
-       if ($timesettings{'VALID'} eq 'yes') {
-               # we want date in YYYY-MM-DD HH:MM format for date command
-               # EAO changed datestring to ISO 6801 format 2003-08-11
-               my $datestring = "$timesettings{'SETYEAR'}-$timesettings{'SETMONTH'}-$timesettings{'SETDAY'}";
-               my $timestring = "$timesettings{'SETHOUR'}:$timesettings{'SETMINUTES'}";
-               # EAO setdate.c also revised for ISO 6801 date format 2003-08-11
-               system ('/usr/local/bin/setdate', $datestring, $timestring);
-               &General::log("$Lang::tr{'time date manually reset'} $datestring $timestring");
-       }
-       unless ($errormessage) {
-               undef %timesettings;
-       }
-}
-
 if ($timesettings{'ACTION'} eq $Lang::tr{'save'})
 { 
        if ($timesettings{'ENABLENTP'} eq 'on')
@@ -203,6 +160,7 @@ $timesettings{'ACTION'} = &Header::cleanhtml ($timesettings{'ACTION'});
 if ($timesettings{'ACTION'} eq $Lang::tr{'set time now'} && $timesettings{'ENABLENTP'} eq 'on')
 {
        system ('/bin/touch', "${General::swroot}/time/settimenow");
+       system ('/usr/local/bin/timecheckctrl >& /dev/null');
 }
 
 &General::readhash("${General::swroot}/time/settings", \%timesettings);
@@ -213,7 +171,7 @@ if ($timesettings{'VALID'} eq '')
        $timesettings{'UPDATE_METHOD'} = 'manually';
        $timesettings{'UPDATE_VALUE'} = '1';
        $timesettings{'UPDATE_PERIOD'} = 'daily';
-       $timesettings{'NTP_ADDR_1'} = 'pool.ntp.org';
+       $timesettings{'NTP_ADDR_1'} = 'de.pool.ntp.org';
        $timesettings{'NTP_ADDR_2'} = 'pool.ntp.org';
 }
 
@@ -345,9 +303,7 @@ print <<END
        <td width='30%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
        <td width='40%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'set time now'}' /></td>
        <td width='25%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
-       <td width='5%' align='right'>
-               <a href='${General::adminmanualurl}/services.html#services_time' target='_blank'><img src='/images/web-support.png' title='$Lang::tr{'online help en'}' /></a>
-       </td>
+       <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 END
@@ -355,34 +311,6 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'update time'});
-
-print <<END
-<table width='100%'>
-<tr>
-       <td width='65%' class='base'>
-       <table> 
-       <tr>
-               <td>$Lang::tr{'year'}:&nbsp;</td>
-               <td><input type='text' name='SETYEAR' size='4' maxlength='4' value='$timesettings{'SETYEAR'}' /></td>
-               <td>&nbsp;$Lang::tr{'month'}:&nbsp;</td>
-               <td><input type='text' name='SETMONTH' size='2' maxlength='2' value='$timesettings{'SETMONTH'}' /></td>
-               <td>&nbsp;$Lang::tr{'day'}:&nbsp;</td>
-               <td><input type='text' name='SETDAY' size='2' maxlength='2' value='$timesettings{'SETDAY'}' /></td>
-               <td>&nbsp;&nbsp;&nbsp;&nbsp;$Lang::tr{'hours2'}:&nbsp;</td>
-               <td><input type='text' name='SETHOUR' size='2' maxlength='2' value='$timesettings{'SETHOUR'}' /></td>
-               <td>&nbsp;$Lang::tr{'minutes'}:&nbsp;</td>
-               <td><input type='text' name='SETMINUTES' size='2' maxlength='2' value='$timesettings{'SETMINUTES'}' /></td>
-       </tr>   
-       </table>
-       </td>
-       <td width='35%' align='center' class='base'><input type='submit' name='ACTION' value='$Lang::tr{'instant update'}' /></td>
-</tr>
-</table>
-END
-;
-&Header::closebox();
-
 print "</form>\n";
 
 &Header::closebigbox();

diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi
index 129e8df238385d73b31be413aa64c854a9cee9ab..d73df7034b1f3833b1784d7f7ecc610acb946f38 100644 (file)
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -225,9 +225,7 @@ print <<END
       <input type='hidden' name='ACTION' value='add' />
       <input type='submit' name='SUBMIT' value='$buttontext' />
     </td>
-    <td width='5%' align='right'>
-    <a href='${General::adminmanualurl}/section-firewall.html#section-blue-access' target='_blank'>
-    <img src='/images/web-support.png' alt='$Lang::tr{'online help en'}' title='$Lang::tr{'online help en'}' /></a></td>
+    <td width='5%' align='right'>&nbsp;</td>
 </tr>
 </table>
 END

diff --git a/html/html/images/iptux.png b/html/html/images/iptux.png
new file mode 100644 (file)
index 0000000..38a754b
Binary files /dev/null and b/html/html/images/iptux.png differ

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 1ddae00ff1c9d6cd79ae9df2ed53a60fc5aa8dec..e064e7c3b1eb8d93760f637439a8d68212181a03 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -1361,8 +1361,9 @@ usr/local/bin/setddns.pl
 usr/local/bin/setreservedports
 usr/local/bin/settime
 usr/local/bin/timecheck
+usr/local/bin/timecheckctrl
 #usr/local/bin/tunerrd.pl
-usr/local/bin/updatelists.pl
+#usr/local/bin/updatelists.pl
 usr/local/bin/resetusb
 #usr/local/doc
 #usr/local/etc

diff --git a/src/misc-progs/Makefile b/src/misc-progs/Makefile
index b8967482943dc21a1956506db0694ef2c10ba7e8..06c98eaf4bf5e4db396841abbb79b9bdbfbcb389 100644 (file)
--- a/src/misc-progs/Makefile
+++ b/src/misc-progs/Makefile
@@ -9,7 +9,7 @@ SUID_PROGS = setdmzholes setportfw setfilters setxtaccess restartdhcp restartsno
        ipfirebkcfg ipfirerscfg installpackage installfcdsl ipsecctrl \
        setaliases ipfirebackup restartntpd \
        restartapplejuice setdate rebuildhosts \
-       restartsyslogd logwatch openvpnctrl
+       restartsyslogd logwatch openvpnctrl timecheckctrl
        # restartwireless
 
 install : all
@@ -78,5 +78,8 @@ restartwireless: restartwireless.c setuid.o ../install+setup/libsmooth/varval.o
 ipsecctrl: ipsecctrl.c setuid.o ../install+setup/libsmooth/varval.o
        $(COMPILE) -I../install+setup/libsmooth/ ipsecctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
 
+timecheckctrl: timecheckctrl.c setuid.o ../install+setup/libsmooth/varval.o
+       $(COMPILE) -I../install+setup/libsmooth/ timecheckctrl.c setuid.o ../install+setup/libsmooth/varval.o -o $@
+
 ipfirebackup: ipfirebackup.c setuid.o 
        $(COMPILE) -lcrypt ipfirebackup.c setuid.o -o $@

diff --git a/src/misc-progs/timecheckctrl.c b/src/misc-progs/timecheckctrl.c
new file mode 100644 (file)
index 0000000..f661783
--- /dev/null
+++ b/src/misc-progs/timecheckctrl.c
@@ -0,0 +1,25 @@
+/* SmoothWall helper program - smoothiedeath
+ *
+ * This program is distributed under the terms of the GNU General Public
+ * Licence.  See the file COPYING for details.
+ *
+ * (c) Lawrence Manning, 2001
+ * Simple program intended to be installed setuid(0) that can be used for
+ * starting shutdown.
+ * 
+ * $Id: ipcopdeath.c,v 1.2 2003/12/11 10:57:34 riddles Exp $
+ * 
+ */
+         
+#include <stdlib.h>
+#include "setuid.h"
+
+int main(void)
+{
+       if (!(initsetuid()))
+               exit(1);
+       
+       safe_system("/usr/local/bin/timecheck");
+       
+       return 0;
+}

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 42773338a8a883600ebc52dbe85487c2937b2db4..1120fd84886bdbf0848490cad398764351829707 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -89,7 +89,7 @@ sub updatecpugraph {
                "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t $tr{'cpu usage per'} $tr{$period}",
                "DEF:user=$rrdlog/cpu.rrd:user:AVERAGE",
                "DEF:system=$rrdlog/cpu.rrd:system:AVERAGE",
@@ -156,7 +156,7 @@ sub updatememgraph {
                "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t $tr{'memory usage per'} $tr{$period}",
                "DEF:used=$rrdlog/mem.rrd:memused:AVERAGE",
                "DEF:free=$rrdlog/mem.rrd:memfree:AVERAGE",
@@ -198,7 +198,7 @@ sub updatememgraph {
                "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-u 100", "-r",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t $tr{'swap usage per'} $tr{$period}",
                "DEF:used=$rrdlog/mem.rrd:swapused:AVERAGE",
                "DEF:free=$rrdlog/mem.rrd:swapfree:AVERAGE",
@@ -269,7 +269,7 @@ sub updatediskgraph {
                "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t $tr{'disk access per'} $tr{$period}",
                "DEF:read=$rrdlog/disk.rrd:readsect:AVERAGE",
                "DEF:write=$rrdlog/disk.rrd:writesect:AVERAGE",
@@ -350,7 +350,7 @@ sub updateifgraph {
                "--alt-y-grid", "-w 600", "-h 100",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t $tr{'traffic on'} $interface ($tr{'graph per'} $tr{$period})",
                "-v$tr{'bytes per second'}",
                "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE",
@@ -398,7 +398,7 @@ sub updatefwhitsgraph {
                "--alt-y-grid", "-w 600", "-h 200",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t firewall hits over the last $interval",
                "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
                "AREA:amount#6464FF:firewallhits",
@@ -418,7 +418,7 @@ sub updatefwhitsgraph {
                "--alt-y-grid", "-w 600", "-h 200",
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-t firewall hits over the last $interval",
                "DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
                "LINE2:amount#6464FF:firewallhits",
@@ -545,7 +545,7 @@ sub updatelqgraph {
                "--lazy", 
                "--color", "SHADEA#EAE9EE",
                "--color", "SHADEB#EAE9EE",
-               "--color", "BACK#EAE9EE",
+               "--color", "BACK#FFFFFF",
                "-v ms / pkts (% x10)",
                "DEF:roundtrip=$rrdlog/lq.rrd:roundtrip:AVERAGE",
                "DEF:loss=$rrdlog/lq.rrd:loss:AVERAGE",

diff --git a/src/scripts/updatelists.pl b/src/scripts/updatelists.pl
deleted file mode 100644 (file)
index 9b534d8..0000000
--- a/src/scripts/updatelists.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/perl\r
-\r
-use strict;\r
-use LWP::UserAgent;\r
-require "CONFIG_ROOT/general-functions.pl";\r
-\r
-my @this;\r
-my $return = &downloadlist();\r
-if($return && $return->is_success) {\r
-       unless(open(LIST, ">CONFIG_ROOT/patches/available")) {\r
-               die "Could not open available lists database.";\r
-       }\r
-       flock LIST, 2;\r
-       @this = split(/----START LIST----\n/,$return->content);\r
-       print LIST $this[1];\r
-       close(LIST);\r
-} else {\r
-       die "Could not download patches list.";\r
-}\r
-\r
-sub downloadlist {\r
-       unless(-e "CONFIG_ROOT/red/active") {\r
-               die "Not connected.";\r
-       }\r
-\r
-       my $downloader = LWP::UserAgent->new;\r
-       $downloader->timeout(5);\r
-\r
-       my %proxysettings;\r
-       &General::readhash("CONFIG_ROOT/proxy/settings", \%proxysettings);\r
-\r
-       if ($_=$proxysettings{'UPSTREAM_PROXY'}) {\r
-               my ($peer, $peerport) = (/^(?:[a-zA-Z ]+\:\/\/)?(?:[A-Za-z0-9\_\.\-]*?(?:\:[A-Za-z0-9\_\.\-]*?)?\@)?([a-zA-Z0-9\.\_\-]*?)(?:\:([0-9]{1,5}))?(?:\/.*?)?$/);\r
-               if ($proxysettings{'UPSTREAM_USER'}) {\r
-                       $downloader->proxy("http","http://$proxysettings{'UPSTREAM_USER'}:$proxysettings{'UPSTREAM_PASSWORD'}@"."$peer:$peerport/");\r
-               } else {\r
-                       $downloader->proxy("http","http://$peer:$peerport/");\r
-               }\r
-       }\r
-\r
-       return $downloader->get("http://www.ipcop.org/patches/${General::version}", 'Cache-Control', 'no-cache');\r
-}\r

diff --git a/src/scripts/updatesetup b/src/scripts/updatesetup
deleted file mode 100644 (file)
index ef9b23a..0000000
--- a/src/scripts/updatesetup
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-UPGRADEVERSION="1.4.x" # configured by ./make.sh newupdate
-PREVIOUSVERSION="1.4."$((`echo $UPGRADEVERSION | /usr/bin/cut -f3 -d '.'`-1))
-echo "This is the $UPGRADEVERSION update patch for IPCop $PREVIOUSVERSION installing."
-
-CURRENTVERSION=`perl -e "require '/var/ipfire/general-functions.pl';print \\$General::version;"`
-if [ "$CURRENTVERSION" != "$PREVIOUSVERSION" ]; then
-       echo "You are not running IPCop v$PREVIOUSVERSION for this patch to install."
-       echo "Aborting installation."
-       exit -1
-fi
-
-# general-functions might not be overwrited by patch...
-/bin/sed -i -e "s+= '1.4.*$+= '$UPGRADEVERSION';+" /var/ipfire/general-functions.pl
-
-/bin/tar -zxpf patch.tar.gz -C /
-
-#build cachelang file after all "lang/*.pl" updates
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-killall mingetty  #redisplay correct version
-echo "end of $UPGRADEVERSION update"