From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 20 Mar 2024 10:36:23 +0000 (+0100)
Subject: ovpnmain.cgi: Move function to check CCD names here
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=595b6f9ee7406e0d3f1307d3089d7ca0d0f9d24b;p=people%2Fms%2Fipfire-2.x.git

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 8ba6e3f79..86e9413d1 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -747,21 +747,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 3e3dcd2c0..c91638e09 100755
--- 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;
 	}