dns.cgi: Move grab_address_from_file function to general-functions.pl

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index aefcfb6878442555edc1b73cdaf5ceb8793c88ef..8450194ce1035c21df7edbf41f5f3946443fd2c5 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -1177,4 +1177,35 @@ sub number_cpu_cores() {
        return $cores;
 }
 
+# Tiny function to grab a single IP-address from a given file.
+sub grab_address_from_file($) {
+       my ($file) = @_;
+
+       my $address;
+
+       # Check if the given file exists.
+       if(-f $file) {
+               # Open the file for reading.
+               open(FILE, $file) or die "Could not read from $file. $!\n";
+
+               # Read the address from the file.
+               $address = <FILE>;
+
+               # Close filehandle.
+               close(FILE);
+
+               # Remove newlines.
+               chomp($address);
+
+               # Check if the obtained address is valid.
+               if (&validip($address)) {
+                       # Return the address.
+                       return $address;
+               }
+       }
+
+       # Return nothing.
+       return;
+}
+
 1;

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 8094a3a0a2cd68c40d77c7224d775a4cdbd5150d..450d5c4840d74334c5d1800fcbb985d9f6f85770 100755 (executable)
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -480,7 +480,7 @@ END
                # Loop through the array which stores the files.
                foreach my $file (@ISP_nameserver_files) {
                        # Grab the address of the nameserver.
-                       my $address = &grab_address_from_file($file);
+                       my $address = &General::grab_address_from_file($file);
 
                        # Check if we got an address.
                        if ($address) {
@@ -815,37 +815,6 @@ sub red_is_active () {
        }
 }
 
-# Tiny function to grab an IP-address of a given file.
-sub grab_address_from_file($) {
-       my ($file) = @_;
-
-       my $address;
-
-       # Check if the given file exists.
-       if(-f $file) {
-               # Open the file for reading.
-               open(FILE, $file) or die "Could not read from $file. $!\n";
-
-               # Read the address from the file.
-               $address = <FILE>;
-
-               # Close filehandle.
-               close(FILE);
-
-               # Remove newlines.
-               chomp($address);
-
-               # Check if the obtained address is valid.
-               if (&General::validip($address)) {
-                       # Return the address.
-                       return $address;
-               }
-       }
-
-       # Return nothing.
-       return;
-}
-
 # Function to check a given nameserver against propper work.
 sub check_nameserver($$$$) {
        my ($nameserver, $record, $proto, $tls_hostname) = @_;