Geaendert:

  * Grauer Hintergrund der Hardware-Graphen geaendert.
  * Hardwaregraphen im geaendert.
  * Grub-Conf erweitert fuer Delaco.
  * Viele Sachen gefixt...

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 251c1e9491bcc243075075c09accb917899e7060..e3910fa7953a902654d5c0ee5e7529fe6f51a694 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -130,25 +130,31 @@ sub genmenu {
                                'title' => "$tr{'alt home'}",
                                'enabled' => 1,
                                };
-    $subsystem->{'20.passwords'} = {
+    $subsystem->{'20.dialup'} = {
+                               'caption' => $tr{'alt dialup'},
+                               'uri' => '/cgi-bin/pppsetup.cgi',
+                               'title' => "$tr{'alt dialup'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'30.passwords'} = {
                                'caption' => $tr{'sspasswords'},
                                'uri' => '/cgi-bin/changepw.cgi',
                                'title' => "$tr{'sspasswords'}",
                                'enabled' => 1,
                                };
-    $subsystem->{'30.ssh'} = {
+    $subsystem->{'40.ssh'} = {
                                'caption' => $tr{'ssh access'},
                                'uri' => '/cgi-bin/remote.cgi',
                                'title' => "$tr{'ssh access'}",
                                'enabled' => 1,
                                };
-    $subsystem->{'40.gui'} = {
+    $subsystem->{'50.gui'} = {
                                'caption' => $tr{'gui settings'},
                                'uri' => '/cgi-bin/gui.cgi',
                                'title' => "$tr{'gui settings'}",
                                'enabled' => 1,
                                };
-    $subsystem->{'50.shutdown'} = {
+    $subsystem->{'60.shutdown'} = {
                                'caption' => $tr{'shutdown'},
                                'uri' => '/cgi-bin/shutdown.cgi',
                                'title' => "$tr{'shutdown'} / $tr{'reboot'}",
@@ -201,10 +207,10 @@ sub genmenu {
                                  'title' => "Firewall-Diagramme",
                                 'enabled' => 1,
                                  };
-    $substatus->{'70.hddtemp'} = {
-                                 'caption' => "$tr{'harddisk temperature graphs'}",
-                                 'uri' => '/cgi-bin/hddgraph.cgi',
-                                 'title' => "$tr{'harddisk temperature graphs'}",
+    $substatus->{'70.hardwaregraphs'} = {
+                                 'caption' => "$tr{'hardware graphs'}",
+                                 'uri' => '/cgi-bin/hardwaregraphs.cgi',
+                                 'title' => "$tr{'hardware graphs'}",
                                 'enabled' => 1,
                                  };
     $substatus->{'80.connections'} = {
@@ -244,37 +250,31 @@ sub genmenu {
                                 'title' => "$tr{'dhcp server'}",
                                 'enabled' => 1,
                                 };
-    $subnetwork->{'40.dialup'} = {
-                                 'caption' => $tr{'alt dialup'},
-                                 'uri' => '/cgi-bin/pppsetup.cgi',
-                                 'title' => "$tr{'alt dialup'}",
-                                 'enabled' => 1,
-                                 };
-    $subnetwork->{'50.scheduler'} = {
-                                 'caption' => $tr{'scheduler'},
-                                 'uri' => '/cgi-bin/connscheduler.cgi',
-                                 'title' => "$tr{'scheduler'}",
-                                 'enabled' => 1,
-                                 };
-    $subnetwork->{'60.hosts'} = {
+    $subnetwork->{'40.scheduler'} = {
+                                'caption' => $tr{'scheduler'},
+                                'uri' => '/cgi-bin/connscheduler.cgi',
+                                'title' => "$tr{'scheduler'}",
+                                'enabled' => 1,
+                                };
+    $subnetwork->{'50.hosts'} = {
                                 'caption' => $tr{'edit hosts'},
                                 'uri' => '/cgi-bin/hosts.cgi',
                                 'title' => "$tr{'edit hosts'}",
                                 'enabled' => 1,
                                 };
-    $subnetwork->{'70.upload'} = {
+    $subnetwork->{'60.upload'} = {
                                  'caption' => $tr{'upload'},
                                  'uri' => '/cgi-bin/upload.cgi',
                                  'title' => "$tr{'upload'}",
                                  'enabled' => 0,
                                  };
-    $subnetwork->{'80.aliases'} = {
+    $subnetwork->{'70.aliases'} = {
                                  'caption' => $tr{'aliases'},
                                  'uri' => '/cgi-bin/aliases.cgi',
                                  'title' => "$tr{'aliases'}",
                                  'enabled' => 0,
                                  };
-    $subnetwork->{'90.wakeonlan'} = {
+    $subnetwork->{'80.wakeonlan'} = {
                                  'caption' => $tr{'WakeOnLan'},
                                  'uri' => '/cgi-bin/wakeonlan.cgi',
                                  'title' => "$tr{'WakeOnLan'}",
@@ -751,7 +751,7 @@ sub openpage {
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 END
 ;
-    if ($settings{'FX'} eq 'on') {
+    if ($settings{'FX'} ne 'off') {
     print <<END
     <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)">
     <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)">
@@ -822,6 +822,90 @@ END
     };
 }
 
+sub openpagewithoutmenu {
+    my $title = shift;
+    my $boh = shift;
+    my $extrahead = shift;
+
+    @URI=split ('\?',  $ENV{'REQUEST_URI'} );
+    &readhash("${swroot}/main/settings", \%settings);
+    &genmenu();
+
+    my $h2 = gettitle($menu);
+    my $helpuri = get_helpuri();
+
+    $title = "IPFire - $title";
+    if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') {
+        $title =  "$settings{'HOSTNAME'}.$settings{'DOMAINNAME'} - $title"; 
+    }
+
+    print <<END
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html>
+  <head>
+  <title>$title</title>
+
+    $extrahead
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+END
+;
+    if ($settings{'FX'} eq 'on') {
+    print <<END
+    <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)">
+    <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)">
+END
+;
+    }
+    print <<END
+    <link rel="shortcut icon" href="/favicon.ico" />
+    <style type="text/css">\@import url(/include/style.css);</style>
+    <style type="text/css">\@import url(/include/menu.css);</style>
+    <style type="text/css">\@import url(/include/content.css);</style>
+    <script language="javascript" type="text/javascript">
+      
+        function swapVisibility(id) {
+            el = document.getElementById(id);
+           if(el.style.display != 'block') {
+               el.style.display = 'block'
+           }
+           else {
+               el.style.display = 'none'
+           }
+        }
+    </script>
+
+  </head>
+  <body>
+<!-- IPFIRE HEADER -->
+
+<div id="main">
+
+<div id="header">
+       <img id="logo-product" src="/images/logo_ipfire.gif">
+   <div id="header-icons">
+           <a href="http://users.ipfire.eu/" target="_blank"><img border="0" src="/images/help.gif"></a>
+   </div>
+</div>
+
+END
+;
+print <<END
+<div id="content">
+  <table width="90%">
+    <tr>
+      <td valign="top">
+      <p><center><img src="/images/iptux.png" width='160px' height='160px'></center></p>
+      </td>
+        <td width="100%" valign="top">
+        <div id="page-content">
+            <h2>$h2</h2>
+END
+    ;
+}
+
 sub closepage () {
     my $status = &connectionstatus();
     $uptime = `/usr/bin/uptime`;

diff --git a/config/etc/profile b/config/etc/profile
index 87fe550ad5085351b93a918c8f97a59a017f20de..efb60d83a47366fbf8637b0a843c7a216abc6eb9 100644 (file)
--- a/config/etc/profile
+++ b/config/etc/profile
@@ -46,4 +46,4 @@ echo -n -e '\033%G'
 
 export LANG PS1
 # Enable colors for applications like mc....
-export TERM=xterm-color
+export TERM=linux

diff --git a/config/grub/grub.conf b/config/grub/grub.conf
index 1bd1cc0c31825e3d2ff826b302feb3ad40b03c8e..8c2152caa665fcefdb5827c0560b5fd3e5fded92 100644 (file)
--- a/config/grub/grub.conf
+++ b/config/grub/grub.conf
@@ -3,23 +3,63 @@ default saved
 foreground = 16064e
 background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire
+title IPFire (1024x768)
   root (hd0,0)
   kernel /vmlinuz root=ROOT panic=10 acpi=off vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire SMP
+title IPFire (800x600)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 acpi=off vga=788 splash=silent ro
+  initrd /initrd.splash
+  savedefault
+title IPFire (text)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 acpi=off ro
+  initrd /initrd.splash
+  savedefault
+title IPFire SMP (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire (ACPI enabled)
+title IPFire SMP (800x600)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off vga=788 splash=silent ro
+  initrd /initrd.splash
+  savedefault
+title IPFire SMP (text)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=off ro
+  initrd /initrd.splash
+  savedefault
+title IPFire (ACPI enabled) (1024x768)
   root (hd0,0)
   kernel /vmlinuz root=ROOT panic=10 vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
-title IPFire SMP (ACPI HT enabled)
+title IPFire (ACPI enabled) (800x600)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 vga=788 splash=silent ro
+  initrd /initrd.splash
+  savedefault
+title IPFire (ACPI enabled) (text)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 ro
+  initrd /initrd.splash
+  savedefault
+title IPFire SMP (ACPI HT enabled) (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=791 splash=silent ro
   initrd /initrd.splash
   savedefault
+title IPFire SMP (ACPI HT enabled) (800x600)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht vga=788 splash=silent ro
+  initrd /initrd.splash
+  savedefault
+title IPFire SMP (ACPI HT enabled) (text)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 acpi=ht ro
+  initrd /initrd.splash
+  savedefault

diff --git a/config/grub/scsigrub.conf b/config/grub/scsigrub.conf
index 4b8e72cbc5ccf3c7fdbebbc3802420b71bff6d5a..e0c601efac5897c95936bd4a0d086fa7bc929531 100644 (file)
--- a/config/grub/scsigrub.conf
+++ b/config/grub/scsigrub.conf
@@ -3,23 +3,63 @@ default saved
 foreground = 16064e
 background = ffffff
 splashimage (hd0,0)/grub/ipfire.xpm.gz
-title IPFire
+title IPFire (1024x768)
   root (hd0,0)
   kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
   initrd /ipfirerd.img
   savedefault
-title IPFire SMP
+title IPFire (800x600)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
+  initrd /ipfirerd.img
+  savedefault
+title IPFire (text)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc acpi=off rw
+  initrd /ipfirerd.img
+  savedefault
+title IPFire SMP (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
   savedefault
-title IPFire (ACPI enabled)
+title IPFire SMP (800x600)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off vga=788 splash=silent rw
+  initrd /ipfirerd-smp.img
+  savedefault
+title IPFire SMP (text)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=off rw
+  initrd /ipfirerd-smp.img
+  savedefault
+title IPFire (ACPI enabled) (1024x768)
   root (hd0,0)
   kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=791 splash=silent rw
   initrd /ipfirerd.img
   savedefault
-title IPFire SMP (ACPI HT enabled)
+title IPFire (ACPI enabled) (800x600)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc vga=788 splash=silent rw
+  initrd /ipfirerd.img
+  savedefault
+title IPFire (ACPI enabled) (text)
+  root (hd0,0)
+  kernel /vmlinuz root=ROOT panic=10 init=/linuxrc rw
+  initrd /ipfirerd.img
+  savedefault
+title IPFire SMP (ACPI HT enabled) (1024x768)
   root (hd0,0)
   kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=791 splash=silent rw
   initrd /ipfirerd-smp.img
   savedefault
+title IPFire SMP (ACPI HT enabled) (800x600)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht vga=788 splash=silent rw
+  initrd /ipfirerd-smp.img
+  savedefault
+title IPFire SMP (ACPI HT enabled) (text)
+  root (hd0,0)
+  kernel /vmlinuz-smp root=ROOT panic=10 init=/linuxrc acpi=ht rw
+  initrd /ipfirerd-smp.img
+  savedefault

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c696a6eea70e6b4350fd377e7b0a5c9fc2edb998..136fcb3e882f632bb809ea6d82a70809e33d5df0 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -1,4 +1,4 @@
-====== List of softwares used to build IPFire Version: 1.4 ======
+====== List of softwares used to build IPFire Version: 2.0 ======
   * 3c5x9setup-1.00
   * 3cp4218-2003-10-22
   * Archive-Tar-1.29

diff --git a/html/cgi-bin/changepw.cgi b/html/cgi-bin/changepw.cgi
index 037a8a543fad7371183e0c1076317284edc131e2..af9719d108617725c1fd6ac384ff80a70b34a714 100644 (file)
--- a/html/cgi-bin/changepw.cgi
+++ b/html/cgi-bin/changepw.cgi
@@ -61,7 +61,7 @@ if ($cgiparams{'ACTION_DIAL'} eq $Lang::tr{'save'})
                 }
                elsif (length($password1) >= 6)
                {
-                       system('/usr/bin/htpasswd', '-b', "${General::swroot}/auth/users", 'dial', "${password1}"); 
+                       system('/usr/bin/htpasswd', '-m', '-b', "${General::swroot}/auth/users", 'dial', "${password1}");
                        &General::log($Lang::tr{'dial user password has been changed'});
                }
                else {

diff --git a/html/cgi-bin/hddgraph.cgi b/html/cgi-bin/hardwaregraphs.cgi
similarity index 100%
rename from html/cgi-bin/hddgraph.cgi
rename to html/cgi-bin/hardwaregraphs.cgi

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 95f479dbbffde9093901781823e611025b749fdc..832cd1053b21bc8ed393080c45018cad3229c3b4 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1503,7 +1503,8 @@
 'scheduled actions' => 'Geplante Aktionen',
 'scheduler' => 'Scheduler',
 'select profile' => 'Wähle Profil',
-'up' => 'Hoch', 
+'up' => 'Hoch',
+'hardware graphs' => 'Hardware-Diagramme',
 
 ); 
 

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6598cad0cfc5d01d3ed68b1aebf8352f9bb41a6c..e027047a210a4aba9ce5ad907e1688ef54b9d035 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1536,6 +1536,7 @@
 'scheduled actions' => 'Scheduled actions',
 'scheduler' => 'Scheduler',
 'select profile' => 'Select profile',
-'up' => 'Up', 
+'up' => 'Up',
+'hardware graphs' => 'hardware graphs',
 
 );

diff --git a/lfs/apache b/lfs/apache
index effe2f93724e2c5e159549b55811c7c862bd4e4b..ec5b0dda481dca81752cee0777b223d42621da15 100644 (file)
--- a/lfs/apache
+++ b/lfs/apache
@@ -126,7 +126,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        chown -R root:root /home/httpd
        chmod -R 755 /home/httpd/cgi-bin
        chmod -R 644 /home/httpd/html
-       chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,images,include}
+       chmod 755 /home/httpd/html /home/httpd/html/{index.cgi,redirect.cgi,dial.cgi,images,include}
 
 
        # backup directory needs nobody:nobody permissions

diff --git a/lfs/configroot b/lfs/configroot
index ea44180cd3de14d24ce3673e62beec41c402efa0..46837f033e7ff4eeb6c5ef15c1caba4e9656e80c 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -62,7 +62,7 @@ $(TARGET) :
            dhcp/fixleases dhcp/advoptions dmzholes/config ethernet/aliases ethernet/settings \
            isdn/settings main/hosts main/settings optionsfw/settings outgoing/settings outgoing/rules pakfire/settings \
            portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
-           ppp/settings-5 ppp/settings proxy/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
+           ppp/settings-5 ppp/settings proxy/advanced/settings remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
            snort/settings vpn/config vpn/settings vpn/ipsec.conf \
            vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
                touch $(CONFIG_ROOT)/$$i; \

diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 813595968ea20f3b36189414043aee86522fdfba..b469d1c5f653bdc971a698b1b3cd7efcc784cd82 100644 (file)
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -21030,8 +21030,8 @@ home/httpd/cgi-bin/dial.cgi
 home/httpd/cgi-bin/dmzholes.cgi
 home/httpd/cgi-bin/graphs.cgi
 home/httpd/cgi-bin/gui.cgi
+home/httpd/cgi-bin/hardwaregraphs.cgi
 home/httpd/cgi-bin/hosts.cgi
-home/httpd/cgi-bin/hddgraph.cgi
 home/httpd/cgi-bin/ids.cgi
 home/httpd/cgi-bin/index.cgi
 home/httpd/cgi-bin/ipinfo.cgi

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 9c680a8996cdd5694c0e54396b3cbb1217d36a9a..8f9aa6761b4b3bdc280e2ea0d3c36cd367f52451 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -859,7 +859,7 @@ sub updatetempgraph
     "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
     "--color", "SHADEA#EAE9EE",
     "--color", "SHADEB#EAE9EE",
-    "--color", "BACK#EAE9EE",
+    "--color", "BACK#FFFFFF",
     "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
 
   $count = 1;
@@ -899,7 +899,7 @@ sub updatefangraph
     "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
     "--color", "SHADEA#EAE9EE",
     "--color", "SHADEB#EAE9EE",
-    "--color", "BACK#EAE9EE",
+    "--color", "BACK#FFFFFF",
     "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
 
   $count = 1;
@@ -939,7 +939,7 @@ sub updatevoltgraph
     "--alt-y-grid", "-w 600", "-h 100", "--alt-autoscale",
     "--color", "SHADEA#EAE9EE",
     "--color", "SHADEB#EAE9EE",
-    "--color", "BACK#EAE9EE",
+    "--color", "BACK#FFFFFF",
     "-t $tr{'mbmon temp'} ($tr{'graph per'} $tr{$period})" );
 
   $count = 1;