Changeset 884 for trunk

Timestamp:

06/16/16 17:55:53 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Allow comma-separated entries and dash-based range entries in the VLAN field

File:

• trunk/cgi-bin/main.cgi (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -1020 +1020 @@
     $webvar{vlan} =~ s/^\s+//;
     $webvar{vlan} =~ s/\s+$//;
+    # Then any surrounding a comma
+    $webvar{vlan} =~ s/\s*,\s*/,/g;
     # ...  ve make it ze configurable thingy!
     if ($IPDB::numeric_vlan) {
-      if ($webvar{vlan} !~ /^\d+$/) {
+      if ($webvar{vlan} !~ /^[\d,-]+$/) {
         $page->param(err => "VLANs must be numeric");
         return;
       }
     } else {
-      if ($webvar{vlan} !~ /^[\w\d_.-]+$/) {
+      if ($webvar{vlan} !~ /^[\w\d_.,-]+$/) {
         $page->param(err => "VLANs must be alphanumeric");
         return;