Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
13 files changed:
WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
WARNING: untranslated string: dead peer detection = Dead Peer Detection
WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
WARNING: untranslated string: dead peer detection = Dead Peer Detection
+WARNING: untranslated string: dnsforward forward_server = unknown string
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
-WARNING: untranslated string: dnsforward forward_server = Nameserver
+WARNING: untranslated string: dnsforward forward_server = unknown string
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
-WARNING: untranslated string: dnsforward forward_server = Nameserver
+WARNING: untranslated string: dnsforward forward_server = unknown string
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: Scan for Songs = unknown string
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: Scan for Songs = unknown string
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: captive = unknown string
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
WARNING: untranslated string: dhcp dns update algo = Algorithm:
WARNING: untranslated string: dhcp dns update secret = Secret:
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dhcp dns update algo = Algorithm:
WARNING: untranslated string: dhcp dns update secret = Secret:
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: eight hours = 8 Hours
WARNING: untranslated string: email config = Configuration
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: eight hours = 8 Hours
WARNING: untranslated string: email config = Configuration
WARNING: untranslated string: dhcp dns update secret = Secret:
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dns servers = DNS Servers
WARNING: untranslated string: dhcp dns update secret = Secret:
WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
WARNING: untranslated string: dns servers = DNS Servers
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnssec information = DNSSEC Information
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnssec information = DNSSEC Information
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
-WARNING: untranslated string: dnsforward forward_server = Nameserver
+WARNING: untranslated string: dnsforward forward_server = unknown string
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
WARNING: untranslated string: dnsforward configuration = DNS forward configuration
WARNING: untranslated string: dnsforward edit an entry = Edit an existing entry
WARNING: untranslated string: dnsforward entries = Current entries
-WARNING: untranslated string: dnsforward forward_server = Nameserver
+WARNING: untranslated string: dnsforward forward_server = unknown string
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: dnsforward zone = Zone
WARNING: untranslated string: dnssec aware = DNSSEC Aware
WARNING: untranslated string: dnssec disabled warning = WARNING: DNSSEC has been disabled
WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
WARNING: untranslated string: captive = unknown string
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
+WARNING: untranslated string: dnsforward forward_servers = Nameservers
WARNING: untranslated string: fwdfw all subnets = All subnets
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: fwdfw all subnets = All subnets
WARNING: untranslated string: fwhost cust geoipgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
-< dnsforward forward_server
+< dnsforward forward_servers
< dnsforward zone
< dnssec aware
< dnssec disabled warning
< dnsforward zone
< dnssec aware
< dnssec disabled warning
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
############################################################################
# Checking cgi-bin translations for language: fr #
############################################################################
+< dnsforward forward_servers
< ovpn warning rfc3280
< wlanap neighbor scan
< wlanap neighbor scan warning
< ovpn warning rfc3280
< wlanap neighbor scan
< wlanap neighbor scan warning
< dhcp dns update algo
< dhcp dns update secret
< dl client arch insecure
< dhcp dns update algo
< dhcp dns update secret
< dl client arch insecure
+< dnsforward forward_servers
< dnssec disabled warning
< eight hours
< email config
< dnssec disabled warning
< eight hours
< email config
< dh name is invalid
< dh parameter
< dl client arch insecure
< dh name is invalid
< dh parameter
< dl client arch insecure
+< dnsforward forward_servers
< dnssec aware
< dnssec disabled warning
< dnssec information
< dnssec aware
< dnssec disabled warning
< dnssec information
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
-< dnsforward forward_server
+< dnsforward forward_servers
< dnsforward zone
< dnssec aware
< dnssec disabled warning
< dnsforward zone
< dnssec aware
< dnssec disabled warning
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
< dnsforward configuration
< dnsforward edit an entry
< dnsforward entries
-< dnsforward forward_server
+< dnsforward forward_servers
< dnsforward zone
< dnssec aware
< dnssec disabled warning
< dnsforward zone
< dnssec aware
< dnssec disabled warning
############################################################################
< crypto error
< crypto warning
############################################################################
< crypto error
< crypto warning
+< dnsforward forward_servers
< fwdfw all subnets
< ovpn error dh
< ovpn error md5
< fwdfw all subnets
< ovpn error dh
< ovpn error md5
$cgiparams{'ENABLED'} = 'off';
$cgiparams{'ACTION'} = '';
$cgiparams{'ZONE'} = '';
$cgiparams{'ENABLED'} = 'off';
$cgiparams{'ACTION'} = '';
$cgiparams{'ZONE'} = '';
-$cgiparams{'FORWARD_SERVER'} = '';
+$cgiparams{'FORWARD_SERVERS'} = '';
$cgiparams{'REMARK'} ='';
&Header::getcgihash(\%cgiparams);
open(FILE, $filename) or die 'Unable to open config file.';
$cgiparams{'REMARK'} ='';
&Header::getcgihash(\%cgiparams);
open(FILE, $filename) or die 'Unable to open config file.';
$errormessage = $Lang::tr{'invalid domain name'};
}
$errormessage = $Lang::tr{'invalid domain name'};
}
- # Check if the settings for the forward server are valid.
- unless(&General::validip($cgiparams{'FORWARD_SERVER'})) {
- $errormessage = $Lang::tr{'invalid ip'};
+ my @forward_servers = split(/\,/, $cgiparams{'FORWARD_SERVERS'});
+ foreach my $forward_server (@forward_servers) {
+ # Check if the settings for the forward server are valid.
+ unless(&General::validip($forward_server)) {
+ $errormessage = "$Lang::tr{'invalid ip'}: $forward_server";
+ last;
+ }
}
# Go further if there was no error.
if ( ! $errormessage)
{
}
# Go further if there was no error.
if ( ! $errormessage)
{
+ # Save servers separated by |
+ $cgiparams{'FORWARD_SERVERS'} = join("|", @forward_servers);
+
# Check if a remark has been entered.
$cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
# Check if a remark has been entered.
$cgiparams{'REMARK'} = &Header::cleanhtml($cgiparams{'REMARK'});
if($cgiparams{'EDITING'} eq 'no') {
open(FILE,">>$filename") or die 'Unable to open config file.';
flock FILE, 2;
if($cgiparams{'EDITING'} eq 'no') {
open(FILE,">>$filename") or die 'Unable to open config file.';
flock FILE, 2;
- print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n";
+ print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'}\n";
} else {
open(FILE, ">$filename") or die 'Unable to open config file.';
flock FILE, 2;
} else {
open(FILE, ">$filename") or die 'Unable to open config file.';
flock FILE, 2;
{
$id++;
if ($cgiparams{'EDITING'} eq $id) {
{
$id++;
if ($cgiparams{'EDITING'} eq $id) {
- print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVER'},$cgiparams{'REMARK'}\n";
+ print FILE "$cgiparams{'ENABLED'},$cgiparams{'ZONE'},$cgiparams{'FORWARD_SERVERS'},$cgiparams{'REMARK'}\n";
} else { print FILE "$line"; }
}
}
} else { print FILE "$line"; }
}
}
my @temp = split(/\,/,$line);
$cgiparams{'ENABLED'} = $temp[0];
$cgiparams{'ZONE'} = $temp[1];
my @temp = split(/\,/,$line);
$cgiparams{'ENABLED'} = $temp[0];
$cgiparams{'ZONE'} = $temp[1];
- $cgiparams{'FORWARD_SERVER'} = $temp[2];
+ $cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2]));
$cgiparams{'REMARK'} = $temp[3];
}
}
$cgiparams{'REMARK'} = $temp[3];
}
}
<tr>
<td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}: <img src='/blob.gif' alt='*' /></td>
<tr>
<td width='20%' class='base'>$Lang::tr{'dnsforward forward_server'}: <img src='/blob.gif' alt='*' /></td>
- <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td>
+ <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td>
<table width='100%' class='tbl'>
<tr>
<th width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></th>
<table width='100%' class='tbl'>
<tr>
<th width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></th>
- <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></th>
+ <th width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_servers'}</b></th>
<th width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
<th width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th>
</tr>
<th width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th>
<th width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></th>
</tr>
my $gif = '';
my $gdesc = '';
my $toggle = '';
my $gif = '';
my $gdesc = '';
my $toggle = '';
+
+ # Format lists of servers
+ my $servers = join(", ", split(/\|/, $temp[2]));
+
if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) {
print "<tr>";
$col="bgcolor='${Header::colouryellow}'"; }
if($cgiparams{'ACTION'} eq $Lang::tr{'edit'} && $cgiparams{'ID'} eq $id) {
print "<tr>";
$col="bgcolor='${Header::colouryellow}'"; }
#
print <<END
<td align='center' $col>$temp[1]</td>
#
print <<END
<td align='center' $col>$temp[1]</td>
- <td align='center' $col>$temp[2]</td>
+ <td align='center' $col>$servers</td>
<td align='center' $col>$temp[3]</td>
<td align='center' $col>
<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
<td align='center' $col>$temp[3]</td>
<td align='center' $col>
<form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'>
'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung',
'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten',
'dnsforward entries' => 'Aktuelle Einträge',
'dnsforward configuration' => 'Einstellungen für DNS Weiterleitung',
'dnsforward edit an entry' => 'Existierenden Eintrag bearbeiten',
'dnsforward entries' => 'Aktuelle Einträge',
-'dnsforward forward_server' => 'DNS-Server',
+'dnsforward forward_servers' => 'DNS-Server',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC-Informationen verfügbar, aber nicht validierend',
'dnssec disabled warning' => 'WARNUNG: DNSSEC wurde deaktiviert',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC-Informationen verfügbar, aber nicht validierend',
'dnssec disabled warning' => 'WARNUNG: DNSSEC wurde deaktiviert',
'dnsforward configuration' => 'DNS forward configuration',
'dnsforward edit an entry' => 'Edit an existing entry',
'dnsforward entries' => 'Current entries',
'dnsforward configuration' => 'DNS forward configuration',
'dnsforward edit an entry' => 'Edit an existing entry',
'dnsforward entries' => 'Current entries',
-'dnsforward forward_server' => 'Nameserver',
+'dnsforward forward_servers' => 'Nameservers',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC Aware',
'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',
'dnsforward zone' => 'Zone',
'dnssec aware' => 'DNSSEC Aware',
'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',