ipsec: Drop delayed restart setting

[ipfire-2.x.git] / html / cgi-bin / dnsforward.cgi

diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index 1439828af258d600147a039b6604a8cf775ff0b7..0439817b9a8cb540054b3653dab0a337e10087c8 100644 (file)
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -50,7 +50,7 @@ my %mainsettings = ();
 $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.';
@@ -67,14 +67,21 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                $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'});
 
@@ -82,7 +89,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                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;
@@ -91,7 +98,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                        {
                                $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"; }
                        }
                }
@@ -106,8 +113,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                        $cgiparams{'ID'} = $cgiparams{'EDITING'};
                }
        }
-       # Restart dnsmasq.
-       system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+       # Restart unbound
+       system('/usr/local/bin/unboundctrl restart >/dev/null');
 }
 
 ###
@@ -124,8 +131,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'})
                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');
 }
 
 ###
@@ -148,8 +155,8 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'})
                }
        }
        close(FILE);
-       # Restart dnsmasq.
-       system('/usr/local/bin/dnsmasqctrl restart >/dev/null');
+       # Restart unbound.
+       system('/usr/local/bin/unboundctrl restart >/dev/null');
 }
 
 ###
@@ -167,7 +174,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
                        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];
                }
        }
@@ -207,30 +214,30 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'}) {
 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'}:&nbsp;<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'}:&nbsp;<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>&nbsp;<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' />&nbsp;<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' />&nbsp;$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>
@@ -255,7 +262,7 @@ print <<END
 <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>
@@ -284,7 +291,10 @@ foreach my $line (@current)
        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}'"; }
@@ -303,7 +313,7 @@ foreach my $line (@current)
 #
 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'}'>