$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.';
$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) || &General::validfqdn($forward_server)) {
+ $errormessage = "$Lang::tr{'invalid ip or hostname'}: $forward_server";
+ last;
+ }
}
# 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'});
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;
{
$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"; }
}
}
$cgiparams{'ID'} = $cgiparams{'EDITING'};
}
}
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound
+ system('/usr/local/bin/unboundctrl restart >/dev/null');
}
###
unless ($cgiparams{'ID'} eq $id) { print FILE "$line"; }
}
close(FILE);
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound.
+ system('/usr/local/bin/unboundctrl restart >/dev/null');
}
###
}
}
close(FILE);
- # Restart dnsmasq.
- system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+ # Restart unbound.
+ system('/usr/local/bin/unboundctrl restart >/dev/null');
}
###
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];
}
}
print <<END
<table width='100%'>
<tr>
- <td width='20%' class='base'><font>$Lang::tr{'dnsforward zone'}:</font></td>
+ <td width='20%' class='base'>$Lang::tr{'dnsforward zone'}: <img src='/blob.gif' alt='*' /></td>
<td><input type='text' name='ZONE' value='$cgiparams{'ZONE'}' size='24' /></td>
<td width='30%' class='base'>$Lang::tr{'enabled'}<input type='checkbox' name='ENABLED' $checked{'ENABLED'}{'on'} /></td>
</tr>
<tr>
- <td width='20%' class='base'><font>$Lang::tr{'dnsforward forward_server'}:</font></td>
- <td><input type='text' name='FORWARD_SERVER' value='$cgiparams{'FORWARD_SERVER'}' size='24' /></td>
+ <td width='20%' class='base'>$Lang::tr{'dnsforward forward_servers'}: <img src='/blob.gif' alt='*' /></td>
+ <td><input type='text' name='FORWARD_SERVERS' value='$cgiparams{'FORWARD_SERVERS'}' size='24' /></td>
</tr>
</table>
<table width='100%'>
<tr>
- <td width ='20%' class='base'><font class='boldbase'>$Lang::tr{'remark'}:</font> <img src='/blob.gif' alt='*' /></td>
+ <td width ='20%' class='base'>$Lang::tr{'remark'}:</td>
<td><input type='text' name='REMARK' value='$cgiparams{'REMARK'}' size='40' maxlength='50' /></td>
</tr>
</table>
-
+<br>
<hr>
<table width='100%'>
<tr>
- <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> <font class='base'>$Lang::tr{'this field may be blank'}</font></td>
- <td width='40%' align='center'>
+ <td class='base' width='55%'><img src='/blob.gif' alt ='*' align='top' /> $Lang::tr{'required field'}</td>
+ <td width='40%' align='right'>
<input type='hidden' name='ACTION' value='$Lang::tr{'add'}' />
<input type='submit' name='SUBMIT' value='$buttontext' />
</td>
#
&Header::openbox('100%', 'left', $Lang::tr{'dnsforward entries'});
print <<END
-<table width='100%'>
+<table width='100%' class='tbl'>
<tr>
- <td width='35%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward zone'}</b></td>
- <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'dnsforward forward_server'}</b></td>
- <td width='30%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></td>
- <td width='5%' class='boldbase' colspan='3' align='center'><b>$Lang::tr{'action'}</b></td>
+ <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_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>
END
;
# Re-read entries and highlight selected item for editing.
#
my $id = 0;
+my $col="";
foreach my $line (@current)
{
$id++;
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 bgcolor='${Header::colouryellow}'>\n"; }
+ print "<tr>";
+ $col="bgcolor='${Header::colouryellow}'"; }
elsif ($id % 2) {
- print "<tr bgcolor='$color{'color22'}'>\n"; }
+ print "<tr>";
+ $col="bgcolor='$color{'color22'}'"; }
else {
- print "<tr bgcolor='$color{'color20'}'>\n"; }
+ print "<tr>";
+ $col="bgcolor='$color{'color20'}'"; }
if ($temp[0] eq 'on') { $gif='on.gif'; $toggle='off'; $gdesc=$Lang::tr{'click to disable'};}
else { $gif='off.gif'; $toggle='on'; $gdesc=$Lang::tr{'click to enable'}; }
# Display edit page.
#
print <<END
- <td align='center'>$temp[1]</td>
- <td align='center'>$temp[2]</td>
- <td align='center'>$temp[3]</td>
- <td align='center'>
+ <td align='center' $col>$temp[1]</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'}'>
<input type='image' name='$Lang::tr{'toggle enable disable'}' src='/images/$gif' title='$gdesc' alt='$gdesc' />
<input type='hidden' name='ID' value='$id' />
<input type='hidden' name='ACTION' value='$Lang::tr{'toggle enable disable'}' />
</form>
</td>
- <td align='center'>
+ <td align='center' $col>
<form method='post' name='frmb$id' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'edit'}' src='/images/edit.gif' title='$Lang::tr{'edit'}' alt='$Lang::tr{'edit'}' />
<input type='hidden' name='ID' value='$id' />
<input type='hidden' name='ACTION' value='$Lang::tr{'edit'}' />
</form>
</td>
- <td align='center'>
+ <td align='center' $col>
<form method='post' name='frmc$id' action='$ENV{'SCRIPT_NAME'}'>
<input type='image' name='$Lang::tr{'remove'}' src='/images/delete.gif' title='$Lang::tr{'remove'}' alt='$Lang::tr{'remove'}' />
<input type='hidden' name='ID' value='$id' />