remote.cgi: Fix splitting output from ssh-keygen.

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

diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi
index 156ef2418c604f429f66390e9ef136aa267e1eaa..1e3760c2b339bc93828d51692dcb13edc97b5e52 100644 (file)
--- a/html/cgi-bin/netexternal.cgi
+++ b/html/cgi-bin/netexternal.cgi
@@ -20,11 +20,14 @@
 ###############################################################################
 
 use strict;
+use experimental 'smartmatch';
 
 # enable only the following on debugging purpose
 #use warnings;
 #use CGI::Carp 'fatalsToBrowser';
 
+use IO::Socket;
+
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
@@ -35,7 +38,7 @@ my %mainsettings = ();
 my %netsettings=();
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 &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);
 
 my @graphs=();
 my %dhcpinfo=();
@@ -83,8 +86,7 @@ if ( $querry[0] ne~ ""){
 
                        &General::readhash("${General::swroot}/dhcpc/dhcpcd-$netsettings{'RED_DEV'}.info", \%dhcpinfo);
 
-                       my $DNS1=`echo $dhcpinfo{'domain_name_servers'} | cut -f 1 -d " "`;
-                       my $DNS2=`echo $dhcpinfo{'domain_name_servers'} | cut -f 2 -d " "`;
+                       my ($DNS1, $DNS2) = split(/ /, $dhcpinfo{'domain_name_servers'});
 
                        my $lsetme=0;
                        my $leasetime="";
@@ -161,4 +163,4 @@ END
 
        &Header::closebigbox();
        &Header::closepage();
-}      
+}