qos.cgi: Use new perl system functions

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

diff --git a/html/cgi-bin/dnsforward.cgi b/html/cgi-bin/dnsforward.cgi
index d9807c90e6599c721bb3cbc29089f05a4049b627..e2843a81f9918e242c04bd4a8fb9995fb111b714 100644 (file)
--- a/html/cgi-bin/dnsforward.cgi
+++ b/html/cgi-bin/dnsforward.cgi
@@ -43,7 +43,7 @@ my $changed = 'no';
 my %color = ();
 my %mainsettings = ();
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
-&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+&General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color);
 
 &Header::showhttpheaders();
 
@@ -124,7 +124,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'add'})
                }
        }
        # Restart unbound
-       system('/usr/local/bin/unboundctrl restart >/dev/null');
+       &General::system('/usr/local/bin/unboundctrl', 'reload');
 }
 
 ###
@@ -142,7 +142,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'remove'})
        }
        close(FILE);
        # Restart unbound.
-       system('/usr/local/bin/unboundctrl restart >/dev/null');
+       &General::system('/usr/local/bin/unboundctrl', 'reload');
 }
 
 ###
@@ -169,7 +169,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'toggle enable disable'})
        }
        close(FILE);
        # Restart unbound.
-       system('/usr/local/bin/unboundctrl restart >/dev/null');
+       &General::system('/usr/local/bin/unboundctrl', 'reload');
 }
 
 ###
@@ -189,7 +189,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'edit'})
                        $cgiparams{'ZONE'} = $temp[1];
                        $cgiparams{'FORWARD_SERVERS'} = join(",", split(/\|/, $temp[2]));
                        $cgiparams{'REMARK'} = $temp[3];
-                       $cgiparams{'DISABLE_DNSSEC'} = $temp[4];
+                       $cgiparams{'DISABLE_DNSSEC'} = ($temp[4] eq "on") ? "on" : "off";
                }
        }
 }
@@ -250,7 +250,7 @@ print <<END
        </tr>
        <tr>
                <td width ='20%' class='base'>$Lang::tr{'dns forward disable dnssec'}:</td>
-               <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}' /></td>
+               <td><input type='checkbox' name='DISABLE_DNSSEC' $checked{'DISABLE_DNSSEC'}{'on'} /></td>
        </tr>
 </table>
 <br>
@@ -392,6 +392,8 @@ print <<END
                <td class='base'>$Lang::tr{'edit'}</td>
                <td>&nbsp; &nbsp; <img src='/images/delete.gif' alt='$Lang::tr{'remove'}' /></td>
                <td class='base'>$Lang::tr{'remove'}</td>
+               <td>&nbsp; &nbsp; <span style="background-color: $Header::colourred">&nbsp; &nbsp;</span></td>
+               <td class='base'>$Lang::tr{'dnsforward dnssec disabled'}</td>
        </tr>
 </table>
 END