webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Credits ueberarbeitet.

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


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@418 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-02-14 19:30:59 +00:00
parent 3a70a53840
commit 24249567ce
15 changed files with 354 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

346
config/cfgroot/header.pl
View File

@@ -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;

32
config/menu/00-menu.main Normal file
View File

@@ -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
};

42
config/menu/10-system.menu Normal file
View File

@@ -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,
};

62
config/menu/20-status.menu Normal file
View File

@@ -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,
};

50
config/menu/30-network.menu Normal file
View File

@@ -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,
};

32
config/menu/40-services.menu Normal file
View File

@@ -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'}",
};

42
config/menu/50-firewall.menu Normal file
View File

@@ -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,
};

20
config/menu/60-ipfire.menu Normal file
View File

@@ -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,
};

46
config/menu/70-log.menu Normal file
View File

@@ -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
};

22
html/cgi-bin/credits.cgi
View File

@@ -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();

2
langs/de/cgi-bin/de.pl
View File

@@ -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:',

3
lfs/configroot
View File

@@ -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

4
src/initscripts/init.d/connectioncheck
View File

@@ -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"

4
src/initscripts/init.d/red
View File

@@ -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');

2
src/scripts/connscheduler
View File

@@ -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 )
{