general-functions.pl: Fix for bug #12865 - Static IP address pools - Add network...

- The fix for bug #12428 removed spaces from the validhostname subroutine as hostnames are
   not supposed to have spaces
- This resulted in spaces no longer being allowed for the Static IP Address Pools names
- New subroutine created called validccdname. This allows letters, upper and lower case,
   numbers, spaces and dashes

Fixes: Bug #12865
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 6f49585dc6b4cae5818d1df54912458c464715f1..16a05cecf23b01d890f98490dc441edf67a0cccd 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -721,6 +721,21 @@ 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;