Credits ueberarbeitet.

Menue Rewrite
Connectioncheck gefixt --> DSL/PPPoE works!

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index cedf81e19a8a2a42c9b1006d3ac24f80c2b5754b..937351e31b59990db59246fee5b5614c0d799816 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -122,364 +122,30 @@ sub is_modem {
 
 ### Initialize menu
 sub genmenu {
+
     my %subsystemhash = ();
     my $subsystem = \%subsystemhash;
 
-    $subsystem->{'10.home'} = {
-                               'caption' => $tr{'alt home'},
-                               'uri' => '/cgi-bin/index.cgi',
-                               'title' => "$tr{'alt home'}",
-                               'enabled' => 1,
-                               };
-    $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->{'40.ssh'} = {
-                               'caption' => $tr{'ssh access'},
-                               'uri' => '/cgi-bin/remote.cgi',
-                               'title' => "$tr{'ssh access'}",
-                               'enabled' => 1,
-                               };
-    $subsystem->{'50.gui'} = {
-                               'caption' => $tr{'gui settings'},
-                               'uri' => '/cgi-bin/gui.cgi',
-                               'title' => "$tr{'gui settings'}",
-                               'enabled' => 1,
-                               };
-    $subsystem->{'60.shutdown'} = {
-                               'caption' => $tr{'shutdown'},
-                               'uri' => '/cgi-bin/shutdown.cgi',
-                               'title' => "$tr{'shutdown'} / $tr{'reboot'}",
-                               'enabled' => 1,
-                               };
-    $subsystem->{'99.credits'} = {
-                               'caption' => $tr{'credits'},
-                               'uri' => '/cgi-bin/credits.cgi',
-                               'title' => "$tr{'credits'}",
-                               'enabled' => 1,
-                               };
-
     my %substatushash = ();
     my $substatus = \%substatushash;
-    $substatus->{'10.systemstatus'} = {
-                                'caption' => $tr{'sssystem status'},
-                                'uri' => '/cgi-bin/status.cgi',
-                                'title' => "$tr{'sssystem status'}",
-                                'enabled' => 1,
-                                };
-    $substatus->{'20.networkstatus'} = {
-                               'caption' => $tr{'ssnetwork status'},
-                               'uri' => '/cgi-bin/netstatus.cgi',
-                               'title' => "$tr{'ssnetwork status'}",
-                               'enabled' => 1,
-                               };
-    $substatus->{'30.systemgraphs'} = {
-                               'caption' => $tr{'system graphs'},
-                               'uri' => '/cgi-bin/graphs.cgi',
-                               'novars' => 1,
-                               'title' => "$tr{'system graphs'}",
-                               'enabled' => 1,
-                               };
-    $substatus->{'40.trafficgraphs'} = {
-                               'caption' => $tr{'sstraffic graphs'},
-                               'uri' => '/cgi-bin/graphs.cgi',
-                               'vars' => 'graph=network',
-                               'title' => "$tr{'sstraffic graphs'}",
-                               'enabled' => 1,
-                               };
-    $substatus->{'50.proxygraphs'} = {
-                               'caption' => $tr{'ssproxy graphs'},
-                               'uri' => '/cgi-bin/proxygraphs.cgi',
-                               'title' => "$tr{'ssproxy graphs'}",
-                               'enabled' => 1,
-                               };
-    $substatus->{'60.fwhits'} = {
-                                 'caption' => 'Firewall-Diagramme',
-                                 'uri' => '/cgi-bin/fwhits.cgi',
-                                 'title' => "Firewall-Diagramme",
-                                'enabled' => 1,
-                                 };
-    $substatus->{'70.hardwaregraphs'} = {
-                                 'caption' => "$tr{'hardware graphs'}",
-                                 'uri' => '/cgi-bin/hardwaregraphs.cgi',
-                                 'title' => "$tr{'hardware graphs'}",
-                                'enabled' => 1,
-                                 };
-    $substatus->{'80.connections'} = {
-                               'caption' => $tr{'connections'},
-                               'uri' => '/cgi-bin/connections.cgi',
-                               'title' => "$tr{'connections'}",
-                               'enabled' => 1,
-                               };
-    $substatus->{'90.nettraf'} = {
-                                 'caption' => $tr{'sstraffic'},
-                                 'uri' => '/cgi-bin/traffic.cgi',
-                                 'title' => "$tr{'sstraffic'}",
-                                'enabled' => 1,
-                                 };
-    $substatus->{'99.iptable'} = {
-                               'caption' => $tr{'iptable rules'},
-                               'uri' => '/cgi-bin/iptables.cgi',
-                               'title' => "$tr{'iptable rules'}",
-                               'enabled' => 1,
-                               };
 
     my %subnetworkhash = ();
     my $subnetwork = \%subnetworkhash;
 
-    $subnetwork->{'10.netconf'} = {'caption' => "$tr{'net config'}",
-                               'uri' => '/cgi-bin/netconfig.cgi',
-                               'title' => "$tr{'net config'}",
-                               'enabled' => 0,
-                               };
-    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
-                               'uri' => '/cgi-bin/proxy.cgi',
-                               'title' => "Webproxy",
-                               'enabled' => 1,
-                               };
-    $subnetwork->{'30.urlfilter'} = {'caption' => 'URL-Filter',
-                               'uri' => '/cgi-bin/urlfilter.cgi',
-                               'title' => "URL-Filter",
-                               'enabled' => 1,
-                               };
-    $subnetwork->{'40.dhcp'} = {'caption' => $tr{'dhcp server'},
-                                'uri' => '/cgi-bin/dhcp.cgi',
-                                'title' => "$tr{'dhcp server'}",
-                                'enabled' => 1,
-                                };
-    $subnetwork->{'50.scheduler'} = {
-                                'caption' => $tr{'connscheduler'},
-                                'uri' => '/cgi-bin/connscheduler.cgi',
-                                'title' => "$tr{'connscheduler'}",
-                                'enabled' => 1,
-                                };
-    $subnetwork->{'60.hosts'} = {
-                                'caption' => $tr{'edit hosts'},
-                                'uri' => '/cgi-bin/hosts.cgi',
-                                'title' => "$tr{'edit hosts'}",
-                                'enabled' => 1,
-                                };
-    $subnetwork->{'70.upload'} = {
-                                 'caption' => $tr{'upload'},
-                                 'uri' => '/cgi-bin/upload.cgi',
-                                 'title' => "$tr{'upload'}",
-                                 'enabled' => 0,
-                                 };
-    $subnetwork->{'80.aliases'} = {
-                                 'caption' => $tr{'aliases'},
-                                 'uri' => '/cgi-bin/aliases.cgi',
-                                 'title' => "$tr{'aliases'}",
-                                 'enabled' => 0,
-                                 };
-    $subnetwork->{'90.wakeonlan'} = {
-                                 'caption' => $tr{'WakeOnLan'},
-                                 'uri' => '/cgi-bin/wakeonlan.cgi',
-                                 'title' => "$tr{'WakeOnLan'}",
-                                 'enabled' => 1,
-                                 };
-
     my %subserviceshash = ();
     my $subservices = \%subserviceshash;
 
-
-    $subservices->{'10.openvpn'} = {
-                               'caption' => 'OpenVPN',
-                               'uri' => '/cgi-bin/ovpnmain.cgi',
-                               'title' => "$tr{'virtual private networking'}",
-                              'enabled' => 1,
-                               };
-    $subservices->{'20.ipsec'} = {
-                               'caption' => 'IPSec',
-                               'uri' => '/cgi-bin/vpnmain.cgi',
-                               'title' => "$tr{'virtual private networking'}",
-                               'enabled' => 1,
-                               };
-    $subservices->{'30.dyndns'} = {'caption' => $tr{'dynamic dns'},
-                               'uri' => '/cgi-bin/ddns.cgi',
-                               'title' => "$tr{'dynamic dns'}",
-                               'enabled' => 1,
-                               };
-    $subservices->{'40.time'} = {'caption' => $tr{'time server'},
-                               'uri' => '/cgi-bin/time.cgi',
-                               'title' => "$tr{'time server'}",
-                               'enabled' => 1,
-                               };
-    $subservices->{'50.qos'} = {'caption' => 'Quality of Service',
-                               'uri' => '/cgi-bin/qos.cgi',
-                               'title' => "Quality of Service",
-                               'enabled' => 1,
-                               };
-    $subservices->{'60.ids'} = {'caption' => $tr{'intrusion detection'},
-                               'enabled' => 1,
-                               'uri' => '/cgi-bin/ids.cgi',
-                               'title' => "$tr{'intrusion detection system'}",
-                               };
-
-
-
     my %subfirewallhash = ();
     my $subfirewall = \%subfirewallhash;
 
-    
-    $subfirewall->{'10.dnat'} = {
-                                'caption' => $tr{'ssport forwarding'},
-                                'uri' => '/cgi-bin/portfw.cgi',
-                                'title' => "$tr{'ssport forwarding'}",
-                                'enabled' => 1,
-                                };
-    $subfirewall->{'20.xtaccess'} = {
-                                'caption' => $tr{'external access'},
-                                'uri' => '/cgi-bin/xtaccess.cgi',
-                                'title' => "$tr{'external access'}",
-                                'enabled' => 1,
-                                };
-    $subfirewall->{'30.wireless'} = {
-                               'caption' => $tr{'blue access'},
-                               'uri' => '/cgi-bin/wireless.cgi',
-                               'title' => "$tr{'blue access'}",
-                               'enabled' => 1,
-                                };
-    $subfirewall->{'40.dmz'} = {
-                               'caption' => $tr{'ssdmz pinholes'},
-                               'uri' => '/cgi-bin/dmzholes.cgi',
-                               'title' => "$tr{'dmz pinhole configuration'}",
-                               'enabled' => 1,
-                                };
-    $subfirewall->{'50.outgoing'} = {
-                               'caption' => $tr{'outgoing firewall'},
-                               'uri' => '/cgi-bin/outgoingfw.cgi',
-                               'title' => "$tr{'outgoing firewall'}",
-                               'enabled' => 1,
-                               };
-    $subfirewall->{'60.upnp'} = {
-                               'caption' => 'UPnP',
-                               'uri' => '/cgi-bin/upnp.cgi',
-                               'title' => "Universal Plug and Play",
-                               'enabled' => 1,
-                               };
-    $subfirewall->{'70.fwopts'} = {
-                               'caption' => $tr{'options fw'},
-                               'uri' => '/cgi-bin/optionsfw.cgi',
-                               'title' => "$tr{'options fw'}",
-                               'enabled' => 1,
-                                };
-    
+    my %subipfirehash = ();
+    my $subipfire = \%subipfirehash;
+
     my %sublogshash = ();
     my $sublogs = \%sublogshash;
 
-    $sublogs->{'10.summary'} = {'caption' => $tr{'log summary'},
-                                'uri' => '/cgi-bin/logs.cgi/summary.dat',
-                                'title' => "$tr{'log summary'}",
-                                'enabled' => 1
-                                };
-    $sublogs->{'20.settings'} = {'caption' => $tr{'log settings'},
-                                'uri' => '/cgi-bin/logs.cgi/config.dat',
-                                'title' => "$tr{'log settings'}",
-                                'enabled' => 1
-                                };
-    $sublogs->{'30.proxy'} = {'caption' => $tr{'proxy logs'},
-                                'uri' => '/cgi-bin/logs.cgi/proxylog.dat',
-                                'title' => "$tr{'proxy logs'}",
-                                'enabled' => 1
-                                };
-    $sublogs->{'40.firewall'} = {'caption' => $tr{'firewall logs'},
-                                'uri' => '/cgi-bin/logs.cgi/firewalllog.dat',
-                                'title' => "$tr{'firewall logs'}",
-                                'enabled' => 1
-                                };
-    $sublogs->{'50.ids'} = {'caption' => $tr{'ids logs'},
-                               'uri' => '/cgi-bin/logs.cgi/ids.dat',
-                               'title' => "$tr{'ids logs'}",
-                               'enabled' => 1
-                               };
-    $sublogs->{'60.urlfilter'} = {
-                               'caption' => $tr{'urlfilter logs'},
-                               'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
-                               'title' => "$tr{'urlfilter log'}",
-                               'enabled' => 1,
-                               };
-    $sublogs->{'70.openvpn'} = {'caption' => $tr{'openvpn log'},
-                               'uri' => '/cgi-bin/logs.cgi/openvpn.dat',
-                               'title' => "$tr{'openvpn log'}",
-                               'enabled' => 1
-                               };
-    $sublogs->{'80.system'} = {'caption' => $tr{'system logs'},
-                               'uri' => '/cgi-bin/logs.cgi/log.dat',
-                               'title' => "$tr{'system logs'}",
-                               'enabled' => 1
-                               };
-    $sublogs->{'90.userlog'} = {'caption' => $tr{'user proxy logs'},
-                               'uri' => '/cgi-bin/logs.cgi/userlog.dat',
-                               'title' => "$tr{'user log'}",
-                               'enabled' => 1
-                               };
-
-    my %subipfirehash = ();
-    my $subipfire = \%subipfirehash;
-    $subipfire->{'10.pakfire'} = {'caption' => 'Pakfire',
-                                 'uri' => '/cgi-bin/pakfire.cgi',
-                                 'title' => "Pakfire",
-                                 'enabled' => 1,
-                                 };
-    $subipfire->{'20.asterisk'} = {'caption' => 'Asterisk',
-                                 'uri' => '/cgi-bin/asterisk.cgi',
-                                 'title' => "Asterisk",
-                                 'enabled' => 1,
-                                 };
-    $subipfire->{'30.samba'} = {'caption' => 'Samba',
-                                 'uri' => '/cgi-bin/samba.cgi',
-                                 'title' => "Samba",
-                                 'enabled' => 1,
-                                 };
-    $subipfire->{'99.help'} = {'caption' => $tr{'help'},
-                                 'uri' => '/cgi-bin/help.cgi',
-                                 'title' => "$tr{'help'}",
-                                 'enabled' => 1,
-                                 };
-
-
-
-    $menu->{'01.system'} = {'caption' => $tr{'alt system'},
-                               'enabled' => 1,
-                               'subMenu' => $subsystem
-                               };
-    $menu->{'02.status'} = {'caption' => $tr{'status'},
-                               'enabled' => 1,
-                               'subMenu' => $substatus
-                               };
-    $menu->{'03.network'} = {'caption' => $tr{'network'},
-                               'enabled' => 1,
-                               'subMenu' => $subnetwork
-                               };
-    $menu->{'04.services'} = {'caption' => $tr{'alt services'},
-                               'enabled' => 1,
-                               'subMenu' => $subservices
-                               };
-    $menu->{'05.firewall'} = {'caption' => $tr{'firewall'},
-                               'enabled' => 1,
-                               'subMenu' => $subfirewall
-                               };
-    $menu->{'06.proxy'} = {'caption' => $tr{'alt proxy'},
-                               'enabled' => 1,
-                               'subMenu' => $subproxy
-                               };
-    $menu->{'07.ipfire'} = {'caption' => 'IPFire',
-                               'enabled' => 1,
-                               'subMenu' => $subipfire
-                               };
-    $menu->{'08.logs'} = {'caption' => $tr{'alt logs'},
-                               'enabled' => 1,
-                               'subMenu' => $sublogs
-                               };
+    eval `/bin/cat /var/ipfire/menu.d/*.menu`;
+    eval `/bin/cat /var/ipfire/menu.d/*.main`;
 
     if (! blue_used() && ! orange_used()) {
        $menu->{'05.firewall'}{'subMenu'}->{'40.dmz'}{'enabled'} = 0;

diff --git a/config/menu/00-menu.main b/config/menu/00-menu.main
new file mode 100644 (file)
index 0000000..3ba58c4
--- /dev/null
+++ b/config/menu/00-menu.main
@@ -0,0 +1,32 @@
+    $menu->{'01.system'} = {'caption' => $tr{'alt system'},
+                               'enabled' => 1,
+                               'subMenu' => $subsystem
+                               };
+    $menu->{'02.status'} = {'caption' => $tr{'status'},
+                               'enabled' => 1,
+                               'subMenu' => $substatus
+                               };
+    $menu->{'03.network'} = {'caption' => $tr{'network'},
+                               'enabled' => 1,
+                               'subMenu' => $subnetwork
+                               };
+    $menu->{'04.services'} = {'caption' => $tr{'alt services'},
+                               'enabled' => 1,
+                               'subMenu' => $subservices
+                               };
+    $menu->{'05.firewall'} = {'caption' => $tr{'firewall'},
+                               'enabled' => 1,
+                               'subMenu' => $subfirewall
+                               };
+    $menu->{'06.proxy'} = {'caption' => $tr{'alt proxy'},
+                               'enabled' => 1,
+                               'subMenu' => $subproxy
+                               };
+    $menu->{'07.ipfire'} = {'caption' => 'IPFire',
+                               'enabled' => 1,
+                               'subMenu' => $subipfire
+                               };
+    $menu->{'08.logs'} = {'caption' => $tr{'alt logs'},
+                               'enabled' => 1,
+                               'subMenu' => $sublogs
+                               };

diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu
new file mode 100644 (file)
index 0000000..229687b
--- /dev/null
+++ b/config/menu/10-system.menu
@@ -0,0 +1,42 @@
+    $subsystem->{'10.home'} = {
+                               'caption' => $tr{'alt home'},
+                               'uri' => '/cgi-bin/index.cgi',
+                               'title' => "$tr{'alt home'}",
+                               'enabled' => 1,
+                               };
+    $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->{'40.ssh'} = {
+                               'caption' => $tr{'ssh access'},
+                               'uri' => '/cgi-bin/remote.cgi',
+                               'title' => "$tr{'ssh access'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'50.gui'} = {
+                               'caption' => $tr{'gui settings'},
+                               'uri' => '/cgi-bin/gui.cgi',
+                               'title' => "$tr{'gui settings'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'60.shutdown'} = {
+                               'caption' => $tr{'shutdown'},
+                               'uri' => '/cgi-bin/shutdown.cgi',
+                               'title' => "$tr{'shutdown'} / $tr{'reboot'}",
+                               'enabled' => 1,
+                               };
+    $subsystem->{'99.credits'} = {
+                               'caption' => $tr{'credits'},
+                               'uri' => '/cgi-bin/credits.cgi',
+                               'title' => "$tr{'credits'}",
+                               'enabled' => 1,
+                               };

diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
new file mode 100644 (file)
index 0000000..f9eddb7
--- /dev/null
+++ b/config/menu/20-status.menu
@@ -0,0 +1,62 @@
+    $substatus->{'10.systemstatus'} = {
+                                'caption' => $tr{'sssystem status'},
+                                'uri' => '/cgi-bin/status.cgi',
+                                'title' => "$tr{'sssystem status'}",
+                                'enabled' => 1,
+                                };
+    $substatus->{'20.networkstatus'} = {
+                               'caption' => $tr{'ssnetwork status'},
+                               'uri' => '/cgi-bin/netstatus.cgi',
+                               'title' => "$tr{'ssnetwork status'}",
+                               'enabled' => 1,
+                               };
+    $substatus->{'30.systemgraphs'} = {
+                               'caption' => $tr{'system graphs'},
+                               'uri' => '/cgi-bin/graphs.cgi',
+                               'novars' => 1,
+                               'title' => "$tr{'system graphs'}",
+                               'enabled' => 1,
+                               };
+    $substatus->{'40.trafficgraphs'} = {
+                               'caption' => $tr{'sstraffic graphs'},
+                               'uri' => '/cgi-bin/graphs.cgi',
+                               'vars' => 'graph=network',
+                               'title' => "$tr{'sstraffic graphs'}",
+                               'enabled' => 1,
+                               };
+    $substatus->{'50.proxygraphs'} = {
+                               'caption' => $tr{'ssproxy graphs'},
+                               'uri' => '/cgi-bin/proxygraphs.cgi',
+                               'title' => "$tr{'ssproxy graphs'}",
+                               'enabled' => 1,
+                               };
+    $substatus->{'60.fwhits'} = {
+                                 'caption' => 'Firewall-Diagramme',
+                                 'uri' => '/cgi-bin/fwhits.cgi',
+                                 'title' => "Firewall-Diagramme",
+                                'enabled' => 1,
+                                 };
+    $substatus->{'70.hardwaregraphs'} = {
+                                 'caption' => "$tr{'hardware graphs'}",
+                                 'uri' => '/cgi-bin/hardwaregraphs.cgi',
+                                 'title' => "$tr{'hardware graphs'}",
+                                'enabled' => 1,
+                                 };
+    $substatus->{'80.connections'} = {
+                               'caption' => $tr{'connections'},
+                               'uri' => '/cgi-bin/connections.cgi',
+                               'title' => "$tr{'connections'}",
+                               'enabled' => 1,
+                               };
+    $substatus->{'90.nettraf'} = {
+                                 'caption' => $tr{'sstraffic'},
+                                 'uri' => '/cgi-bin/traffic.cgi',
+                                 'title' => "$tr{'sstraffic'}",
+                                'enabled' => 1,
+                                 };
+    $substatus->{'99.iptable'} = {
+                               'caption' => $tr{'iptable rules'},
+                               'uri' => '/cgi-bin/iptables.cgi',
+                               'title' => "$tr{'iptable rules'}",
+                               'enabled' => 1,
+                               };

diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
new file mode 100644 (file)
index 0000000..785a2d8
--- /dev/null
+++ b/config/menu/30-network.menu
@@ -0,0 +1,50 @@
+    $subnetwork->{'10.netconf'} = {'caption' => "$tr{'net config'}",
+                               'uri' => '/cgi-bin/netconfig.cgi',
+                               'title' => "$tr{'net config'}",
+                               'enabled' => 0,
+                               };
+    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
+                               'uri' => '/cgi-bin/proxy.cgi',
+                               'title' => "Webproxy",
+                               'enabled' => 1,
+                               };
+    $subnetwork->{'30.urlfilter'} = {'caption' => 'URL-Filter',
+                               'uri' => '/cgi-bin/urlfilter.cgi',
+                               'title' => "URL-Filter",
+                               'enabled' => 1,
+                               };
+    $subnetwork->{'40.dhcp'} = {'caption' => $tr{'dhcp server'},
+                                'uri' => '/cgi-bin/dhcp.cgi',
+                                'title' => "$tr{'dhcp server'}",
+                                'enabled' => 1,
+                                };
+    $subnetwork->{'50.scheduler'} = {
+                                'caption' => $tr{'connscheduler'},
+                                'uri' => '/cgi-bin/connscheduler.cgi',
+                                'title' => "$tr{'connscheduler'}",
+                                'enabled' => 1,
+                                };
+    $subnetwork->{'60.hosts'} = {
+                                'caption' => $tr{'edit hosts'},
+                                'uri' => '/cgi-bin/hosts.cgi',
+                                'title' => "$tr{'edit hosts'}",
+                                'enabled' => 1,
+                                };
+    $subnetwork->{'70.upload'} = {
+                                 'caption' => $tr{'upload'},
+                                 'uri' => '/cgi-bin/upload.cgi',
+                                 'title' => "$tr{'upload'}",
+                                 'enabled' => 0,
+                                 };
+    $subnetwork->{'80.aliases'} = {
+                                 'caption' => $tr{'aliases'},
+                                 'uri' => '/cgi-bin/aliases.cgi',
+                                 'title' => "$tr{'aliases'}",
+                                 'enabled' => 0,
+                                 };
+    $subnetwork->{'90.wakeonlan'} = {
+                                 'caption' => $tr{'WakeOnLan'},
+                                 'uri' => '/cgi-bin/wakeonlan.cgi',
+                                 'title' => "$tr{'WakeOnLan'}",
+                                 'enabled' => 1,
+                                 };

diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu
new file mode 100644 (file)
index 0000000..fa1657e
--- /dev/null
+++ b/config/menu/40-services.menu
@@ -0,0 +1,32 @@
+    $subservices->{'10.ipsec'} = {
+                               'caption' => 'IPSec',
+                               'uri' => '/cgi-bin/vpnmain.cgi',
+                               'title' => "$tr{'virtual private networking'}",
+                               'enabled' => 1,
+                               };
+    $subservices->{'20.openvpn'} = {
+                               'caption' => 'OpenVPN',
+                               'uri' => '/cgi-bin/ovpnmain.cgi',
+                               'title' => "$tr{'virtual private networking'}",
+                              'enabled' => 1,
+                               };
+    $subservices->{'30.dyndns'} = {'caption' => $tr{'dynamic dns'},
+                               'uri' => '/cgi-bin/ddns.cgi',
+                               'title' => "$tr{'dynamic dns'}",
+                               'enabled' => 1,
+                               };
+    $subservices->{'40.time'} = {'caption' => $tr{'time server'},
+                               'uri' => '/cgi-bin/time.cgi',
+                               'title' => "$tr{'time server'}",
+                               'enabled' => 1,
+                               };
+    $subservices->{'50.qos'} = {'caption' => 'Quality of Service',
+                               'uri' => '/cgi-bin/qos.cgi',
+                               'title' => "Quality of Service",
+                               'enabled' => 1,
+                               };
+    $subservices->{'60.ids'} = {'caption' => $tr{'intrusion detection'},
+                               'enabled' => 1,
+                               'uri' => '/cgi-bin/ids.cgi',
+                               'title' => "$tr{'intrusion detection system'}",
+                               };

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
new file mode 100644 (file)
index 0000000..54c6e40
--- /dev/null
+++ b/config/menu/50-firewall.menu
@@ -0,0 +1,42 @@
+    $subfirewall->{'10.dnat'} = {
+                                'caption' => $tr{'ssport forwarding'},
+                                'uri' => '/cgi-bin/portfw.cgi',
+                                'title' => "$tr{'ssport forwarding'}",
+                                'enabled' => 1,
+                                };
+    $subfirewall->{'20.xtaccess'} = {
+                                'caption' => $tr{'external access'},
+                                'uri' => '/cgi-bin/xtaccess.cgi',
+                                'title' => "$tr{'external access'}",
+                                'enabled' => 1,
+                                };
+    $subfirewall->{'30.wireless'} = {
+                               'caption' => $tr{'blue access'},
+                               'uri' => '/cgi-bin/wireless.cgi',
+                               'title' => "$tr{'blue access'}",
+                               'enabled' => 1,
+                                };
+    $subfirewall->{'40.dmz'} = {
+                               'caption' => $tr{'ssdmz pinholes'},
+                               'uri' => '/cgi-bin/dmzholes.cgi',
+                               'title' => "$tr{'dmz pinhole configuration'}",
+                               'enabled' => 1,
+                                };
+    $subfirewall->{'50.outgoing'} = {
+                               'caption' => $tr{'outgoing firewall'},
+                               'uri' => '/cgi-bin/outgoingfw.cgi',
+                               'title' => "$tr{'outgoing firewall'}",
+                               'enabled' => 1,
+                               };
+    $subfirewall->{'60.upnp'} = {
+                               'caption' => 'UPnP',
+                               'uri' => '/cgi-bin/upnp.cgi',
+                               'title' => "Universal Plug and Play",
+                               'enabled' => 1,
+                               };
+    $subfirewall->{'70.fwopts'} = {
+                               'caption' => $tr{'options fw'},
+                               'uri' => '/cgi-bin/optionsfw.cgi',
+                               'title' => "$tr{'options fw'}",
+                               'enabled' => 1,
+                                };

diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu
new file mode 100644 (file)
index 0000000..37e332f
--- /dev/null
+++ b/config/menu/60-ipfire.menu
@@ -0,0 +1,20 @@
+    $subipfire->{'10.pakfire'} = {'caption' => 'Pakfire',
+                                 'uri' => '/cgi-bin/pakfire.cgi',
+                                 'title' => "Pakfire",
+                                 'enabled' => 1,
+                                 };
+    $subipfire->{'20.asterisk'} = {'caption' => 'Asterisk',
+                                 'uri' => '/cgi-bin/asterisk.cgi',
+                                 'title' => "Asterisk",
+                                 'enabled' => 1,
+                                 };
+    $subipfire->{'30.samba'} = {'caption' => 'Samba',
+                                 'uri' => '/cgi-bin/samba.cgi',
+                                 'title' => "Samba",
+                                 'enabled' => 1,
+                                 };
+    $subipfire->{'99.help'} = {'caption' => $tr{'help'},
+                                 'uri' => '/cgi-bin/help.cgi',
+                                 'title' => "$tr{'help'}",
+                                 'enabled' => 1,
+                                 };

diff --git a/config/menu/70-log.menu b/config/menu/70-log.menu
new file mode 100644 (file)
index 0000000..b3c1c44
--- /dev/null
+++ b/config/menu/70-log.menu
@@ -0,0 +1,46 @@
+    $sublogs->{'10.summary'} = {'caption' => $tr{'log summary'},
+                                'uri' => '/cgi-bin/logs.cgi/summary.dat',
+                                'title' => "$tr{'log summary'}",
+                                'enabled' => 1
+                                };
+    $sublogs->{'20.settings'} = {'caption' => $tr{'log settings'},
+                                'uri' => '/cgi-bin/logs.cgi/config.dat',
+                                'title' => "$tr{'log settings'}",
+                                'enabled' => 1
+                                };
+    $sublogs->{'30.proxy'} = {'caption' => $tr{'proxy logs'},
+                                'uri' => '/cgi-bin/logs.cgi/proxylog.dat',
+                                'title' => "$tr{'proxy logs'}",
+                                'enabled' => 1
+                                };
+    $sublogs->{'40.firewall'} = {'caption' => $tr{'firewall logs'},
+                                'uri' => '/cgi-bin/logs.cgi/firewalllog.dat',
+                                'title' => "$tr{'firewall logs'}",
+                                'enabled' => 1
+                                };
+    $sublogs->{'50.ids'} = {'caption' => $tr{'ids logs'},
+                               'uri' => '/cgi-bin/logs.cgi/ids.dat',
+                               'title' => "$tr{'ids logs'}",
+                               'enabled' => 1
+                               };
+    $sublogs->{'60.urlfilter'} = {
+                               'caption' => $tr{'urlfilter logs'},
+                               'uri' => '/cgi-bin/logs.cgi/urlfilter.dat',
+                               'title' => "$tr{'urlfilter log'}",
+                               'enabled' => 1,
+                               };
+    $sublogs->{'70.openvpn'} = {'caption' => $tr{'openvpn log'},
+                               'uri' => '/cgi-bin/logs.cgi/openvpn.dat',
+                               'title' => "$tr{'openvpn log'}",
+                               'enabled' => 1
+                               };
+    $sublogs->{'80.system'} = {'caption' => $tr{'system logs'},
+                               'uri' => '/cgi-bin/logs.cgi/log.dat',
+                               'title' => "$tr{'system logs'}",
+                               'enabled' => 1
+                               };
+    $sublogs->{'90.userlog'} = {'caption' => $tr{'user proxy logs'},
+                               'uri' => '/cgi-bin/logs.cgi/userlog.dat',
+                               'title' => "$tr{'user log'}",
+                               'enabled' => 1
+                               };

diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 352935b6e40da87fbc06c0b53823f61b44d75310..029e7770c28f3279a61cf7de6ab9d9c89a67b533 100644 (file)
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -26,20 +26,21 @@ require "${General::swroot}/header.pl";
 &Header::openbox('100%', 'left', $Lang::tr{'credits'});
 
 print <<END
-<br /><center><b>Besuchen sie uns auf <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a></b></center>
-<br /><center><b>Visit us on <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a></b></center>
+<br /><center><b><a href='http://www.ipfire.org/'>http://www.ipfire.org/</a></b></center>
 <p>
-<br /><center><b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers for this great piece of software.</b></center>
-
-<p><b>Credits:</b><br />
+<br /><center><b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.</b></center>
+<br /><center><b>We want to say thank you to all of the developers who ever contributed anything to IPFire.</b></center>
+<p>
+<p><b>Development:</b><br />
 Projektleiter - Michael Tremer
-(<a href='mailto:m.s.tremer\@gmail.com'>m.s.tremer\@gmail.com</a>)<br />
+(<a href='mailto:m.s.tremer\@gmail.com'>mitch\@ipfire.org</a>)<br />
 Projektmitglied &amp; Sponsor - Detlef Lampart
-(<a href='mailto:info\@delaco.de'>info\@delaco.de</a>)<br />
+(<a href='mailto:info\@delaco.de'>delaco\@ipfire.org</a>)<br />
 Projektmitglied &amp; Developer - Heiner Schmeling
-(<a href='mailto:cm\@ipfire.eu'>cm\@ipfire.eu</a>)<br />
+(<a href='mailto:cm\@ipfire.eu'>cm\@ipfire.org</a>)<br />
 Projektmitglied &amp; Supporter - Silvio Rechenbach
 (<a href='mailto:sr\@tne.de'>sr\@tne.de</a>)<br />
+Creative Mind - Benedikt Correll<br />
 Sponsor - Karsten Rechenbach
 (<a href='mailto:space\@devilboard.net'>space\@devilboard.net</a>)<br />
 Betatester - Sebastian Winter
@@ -49,7 +50,7 @@ END
 ;
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'GPL');
+&Header::openbox('100%', 'left', 'General Public License v2');
 print <<END;
 <pre>
                  GNU GENERAL PUBLIC LICENSE
@@ -391,7 +392,8 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.</pre>
+Public License instead of this License.
+</pre>
 END
 &Header::closebox();
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 8145bbea19f19864fdb39fe8de3402455eb88a2d..7baef61e2f61fd50c54917087c14876fc740f747 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -376,7 +376,7 @@
 'graph per' => 'Diagramm pro', 
 'green' => 'GRÜN', 
 'green interface' => 'Grünes Interface', 
-'gui settings' => 'Einstellungen der  Benutzeroberfläche', 
+'gui settings' => 'Benutzeroberfläche', 
 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.', 
 'hangup' => 'Trennen', 
 'hangup string' => 'Auflegen:', 

diff --git a/lfs/configroot b/lfs/configroot
index 27c2abd906ba6e8cdb9c6ae98b34e24e4b348212..a70dd4f710a66aa4ff0959b08aea1fa83ff2c5c7 100644 (file)
--- a/lfs/configroot
+++ b/lfs/configroot
@@ -53,7 +53,7 @@ $(TARGET) :
 
        # Create all directories
        for i in addon-lang alcatelusb auth backup ca certs cnx_pci connscheduler crls ddns dhcp dhcpc dmzholes \
-           eagle-usb eciadsl ethernet isdn key langs logging main mbmon modem net-traffic nfs optionsfw outgoing/bin patches pakfire portfw \
+           eagle-usb eciadsl ethernet isdn key langs logging main mbmon menu.d modem net-traffic nfs optionsfw outgoing/bin patches pakfire portfw \
            ppp private proxy/advanced qos/bin red remote snort time urlfilter/autoupdate urlfilter/bin upnp vpn wakeonlan wireless xtaccess ; do \
                mkdir -p $(CONFIG_ROOT)/$$i; \
        done
@@ -82,6 +82,7 @@ $(TARGET) :
        cp $(DIR_SRC)/config/cfgroot/connscheduler-lib.pl       $(CONFIG_ROOT)/connscheduler/lib.pl
        cp $(DIR_SRC)/config/cfgroot/connscheduler.conf         $(CONFIG_ROOT)/connscheduler
        cp $(DIR_SRC)/config/cfgroot/mbmon-settings             $(CONFIG_ROOT)/mbmon/settings
+       cp $(DIR_SRC)/config/menu/*                                     $(CONFIG_ROOT)/menu.d/
        cp $(DIR_SRC)/config/cfgroot/modem-defaults             $(CONFIG_ROOT)/modem/defaults
        cp $(DIR_SRC)/config/cfgroot/modem-settings             $(CONFIG_ROOT)/modem/settings
        cp $(DIR_SRC)/config/cfgroot/net-traffic-lib.pl         $(CONFIG_ROOT)/net-traffic/net-traffic-lib.pl

diff --git a/src/initscripts/init.d/connectioncheck b/src/initscripts/init.d/connectioncheck
index 7e2cae53f18182bbd5e44c2c4dd9bf1180cab7bb..893f249e0d4b39138d8686402f7432cf5985aef5 100644 (file)
--- a/src/initscripts/init.d/connectioncheck
+++ b/src/initscripts/init.d/connectioncheck
@@ -42,7 +42,7 @@ case "$1" in
                        /etc/rc.d/init.d/red start
                        exit
                fi
-               # give 5 s more at pppd to be visible  with ps ax after 'rc.red start' end
+               # give 5 s more at pppd to be visible  with ps ax after 'red start' end
                if [ "$RCREDSTART" = '' ]; then
                        TIMETOSTART=1
                fi
@@ -83,7 +83,7 @@ case "$1" in
        # this attempt to connect fail, so retry
 
        #Don't erase keepconnected because it is used to watch user actions
-       /bin/touch /var/ipfire/red/redial
+       /usr/bin/touch /var/ipfire/red/redial
        /etc/rc.d/init.d/red stop
        while ( /bin/ps ax | /bin/grep -q [p]ppd ); do
                msg "waiting pppd exit"

diff --git a/src/initscripts/init.d/red b/src/initscripts/init.d/red
index 30d06595dcb29f77f3c77acc68e95e5e88d3fc53..60bd45d8679866757b3859adf1c2d736fff03a45 100644 (file)
--- a/src/initscripts/init.d/red
+++ b/src/initscripts/init.d/red
@@ -515,6 +515,7 @@ sub doisdndial
 
 sub dopppoedial
 {
+       system("mknod /dev/ppp c 108 0 2>/dev/null");
        if ($pppsettings{'METHOD'} ne 'PPPOE_PLUGIN') {
                my @pppcommand = ('/usr/sbin/pppd', 'pty');
                my @pppoecommand = ('/usr/sbin/pppoe', '-p','/var/run/pppoe.pid','-I',
@@ -604,6 +605,7 @@ sub dopptpdial
 {
        my %pptpdhcpc;
        my $routerip = $pppsettings{'ROUTERIP'} ? $pppsettings{'ROUTERIP'} : "10.0.0.138";
+       system("mknod /dev/ppp c 108 0 2>/dev/null");
        if ( $pppsettings{'METHOD'} eq 'DHCP' && open(FILE, "${General::swroot}/red/device")) {
                my $device = <FILE>;
                close FILE;
@@ -682,6 +684,7 @@ sub dofritzdsldial
                        $controller=1; # fcdslslusb
                }
        }
+       system("mknod /dev/ppp c 108 0 2>/dev/null");
        my @pppcommand = ('/usr/sbin/pppd');
        my @capiplugin;
 
@@ -733,6 +736,7 @@ sub dofritzdsldial
 sub doatmdial
 {
        my $ENCAP;
+       system("mknod /dev/ppp c 108 0 2>/dev/null");
        if ($pppsettings {'PROTOCOL'} eq 'RFC2364') {
                system ('/sbin/modprobe pppoatm');
                my @pppcommand = ('/usr/sbin/pppd');

diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler
index 17dc629262f76049a3ef1ed0aa3ad933fb1dc321..58d96905d6daa625addc811a3c24d9652d8369c0 100644 (file)
--- a/src/scripts/connscheduler
+++ b/src/scripts/connscheduler
@@ -146,7 +146,7 @@ sub profile
   # Method to change Profile from pppsetup.cgi
        unlink("${General::swroot}/ppp/settings");
        link("${General::swroot}/ppp/settings-$profile", "${General::swroot}/ppp/settings");
-       system ("/bin/touch", "${General::swroot}/ppp/updatesettings");
+       system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings");
 
   if ( $restart_red == 1 )
   {