Forward Firewall: some exentions for remarks

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 0fbbad9b90a13dd1b0560c916a25f92c203c5520..90e1fb305c39fa788fe3d1ec6ca5455d4827b009 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -2080,13 +2080,13 @@ sub validremark
        if (length ($remark) < 1 || length ($remark) > 255) {
                return 0;}
        # Only valid characters are a-z, A-Z, 0-9 and -
-       if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;()_\/\s]*$/) {
+       if ($remark !~ /^[a-zäöüA-ZÖÄÜ0-9-.:;\|_()\/\s]*$/) {
                return 0;}
        # First character can only be a letter or a digit
        if (substr ($remark, 0, 1) !~ /^[a-zäöüA-ZÖÄÜ0-9]*$/) {
                return 0;}
        # Last character can only be a letter or a digit
-       if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9).]*$/) {
+       if (substr ($remark, -1, 1) !~ /^[a-zöäüA-ZÖÄÜ0-9.:;_)]*$/) {
                return 0;}
        return 1;
 }

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 25b25d450ef00c019997142b038a237f5a7b4cdb..9266766074dd67707d3c2cbcd125921568764250 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -998,7 +998,7 @@
 'fwhost err ipwithsub' => 'Bitte IP Adresse OHNE Subnetzmaske eingeben',
 'fwhost err partofnet' => 'Dieses Netzwerk ist Teil eines bereits existierenden Netzwerks', 
 'fwhost err port'              => 'Port muss gefüllt sein',
-'fwhost err remark'            => 'Bemerkung ungültig. Erlaubte Zeichen: a-z, A-Z, 0-9 Leerzeichen und Bindestrich',
+'fwhost err remark'            => 'Bemerkung ungültig. Erlaubte Zeichen: a-z, A-Z, 0-9 und -_();|.',
 'fwhost err srvexist'  => 'Dieser Dienst ist bereits in der Gruppe',
 'fwhost err srv exists'        => 'Ein Service mit diesem Namen existiert bereits',
 'fwhost err sub32'             => 'Bitte Host hinzufügen. Dieses Subnetz ist kein Netzwerk',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index c9a3a32c0fbfa7bdf3199a49f75b92749b9f9f0a..9e3f70c54ea39249785e61ed3fe83f0f0cfbba68 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1023,7 +1023,7 @@
 'fwhost err ipwithsub' => 'Please provide IP address WITHOUT subnetmask',
 'fwhost err partofnet' => 'This network is part of an already existing one', 
 'fwhost err port'              => 'Port is empty',
-'fwhost err remark'            => 'Remark invalid. Allowed: a-z, A-Z, 0-9 space and minus',
+'fwhost err remark'            => 'Remark invalid. Allowed: a-z, A-Z, 0-9 and -_();|.',
 'fwhost err srvexist'  => 'Dieser Dienst ist bereits in der Gruppe',
 'fwhost err srv exists'        => 'A Service with this name already exists',
 'fwhost err sub32'             => 'Please add single host. This subnet is no network',