ovpnmain.cgi: Move function to check CCD names here

This was in general-functions.pl for some reason.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index cc5d9fd812ea43e110ef8837ff15c5982888e816..33b5605e2e4a24023cdb4fe2c621bdffad73bbfa 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -758,21 +758,6 @@ sub validhostname
        return 1;
 }
 
-sub validccdname
-{
-       # Checks a ccdname for letters, numbers and spaces
-        my $ccdname = $_[0];
-
-       # ccdname should be at least one character in length
-       # but no more than 63 characters
-       if (length ($ccdname) < 1 || length ($ccdname) > 63) {
-               return 0;}
-       # Only valid characters are a-z, A-Z, 0-9, space and -
-       if ($ccdname !~ /^[a-zA-Z0-9 -]*$/) {
-               return 0;}
-       return 1;
-}
-
 sub validdomainname
 {
        my $part;

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index d041b9474195dba1735fa3e6fdb9661466f68b1b..33caa8c19009e8b3be413e546a8f1d070cf6621b 100644 (file)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -350,6 +350,28 @@ sub writeserverconf {
     close(CONF);
 }
 
+##
+## CCD Name
+##
+
+# Checks a ccdname for letters, numbers and spaces
+sub validccdname($) {
+       my $name = shift;
+
+       # name should be at least one character in length
+       # but no more than 63 characters
+       if (length ($name) < 1 || length ($name) > 63) {
+               return 0;
+       }
+
+       # Only valid characters are a-z, A-Z, 0-9, space and -
+       if ($name !~ /^[a-zA-Z0-9 -]*$/) {
+               return 0;
+       }
+
+       return 1;
+}
+
 sub delccdnet($) {
        my $name = shift;
 
@@ -406,7 +428,7 @@ sub addccdnet
                return
        }
 
-       if(!&General::validccdname($ccdname))
+       if(!&validccdname($ccdname))
        {
                $errormessage=$Lang::tr{'ccd err invalidname'};
                return;
@@ -451,7 +473,7 @@ sub modccdnet
        my %ccdhash=();
 
        # Check if the new name is valid.
-       if(!&General::validccdname($newname)) {
+       if(!&validccdname($newname)) {
                $errormessage=$Lang::tr{'ccd err invalidname'};
                return;
        }