diff options
| author | Ermal <eri@pfsense.org> | 2011-03-22 18:19:49 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-03-22 18:19:49 +0000 |
| commit | 6be14e38fdebf095e91845a92dae5374b90ef502 (patch) | |
| tree | ebdfb17242cb9ddb7a9445b7c9a2ddcddda2d2bb /etc | |
| parent | 66fc1f14ee447c8b31620e799b5fd2f54b4a583d (diff) | |
| download | pfsense-6be14e38fdebf095e91845a92dae5374b90ef502.zip pfsense-6be14e38fdebf095e91845a92dae5374b90ef502.tar.gz | |
Unbreak adding subqueues to limiters. Correct some text in the way.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/shaper.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 4b24f9b..493e278 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -2770,10 +2770,8 @@ class dummynet_class { $reqdfieldsn[] = "Bandwidth"; $reqdfields[] = "bandwidthtype"; $reqdfieldsn[] = "Bandwidthtype"; - if (!empty($data['newname'])) { - $reqdfields[] = "newname"; - $reqdfieldsn[] = "Name"; - } + $reqdfields[] = "newname"; + $reqdfieldsn[] = "Name"; shaper_do_input_validation($data, $reqdfields, $reqdfieldsn, $input_errors); @@ -2785,7 +2783,9 @@ class dummynet_class { $input_errors[] = "Buckets must be an integer between 16 and 65535."; if ($data['qlimit'] && (!is_numeric($data['qlimit']))) $input_errors[] = "Queue limit must be an integer"; - if (!preg_match("/^[a-zA-Z0-9_-]+$/", $data['name'])) + if (!empty($data['newname']) && !preg_match("/^[a-zA-Z0-9_-]+$/", $data['newname'])) + $input_errors[] = "Queue names must be alphanumeric and _ or - only."; + if (!empty($data['name']) && !preg_match("/^[a-zA-Z0-9_-]+$/", $data['name'])) $input_errors[] = "Queue names must be alphanumeric and _ or - only."; } } @@ -3255,7 +3255,7 @@ class dnqueue_class extends dummynet_class { $form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; if ($this->GetEnabled() == "on") $form .= " CHECKED"; - $form .= " ><span class=\"vexpl\"> Enable/Disable queue and its children</span>"; + $form .= " ><span class=\"vexpl\"> Enable/Disable queue</span>"; $form .= "</td></tr>"; $form .= "<tr><td valign=\"center\" class=\"vncellreq\"><br><span class=\"vexpl\">Name</span></td>"; $form .= "<td class=\"vncellreq\">"; |
