Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Traffic Shaper GUI text typos #796

Merged
merged 1 commit into from Sep 3, 2013

Conversation

Projects
None yet
2 participants
Contributor

phil-davis commented Sep 3, 2013

and note the Queue Limit is a number of packets (not packets per second)

Traffic Shaper GUI text typos
and note the Queue Limit is a number of packets (not packets per second)

@phil-davis phil-davis commented on the diff Sep 3, 2013

etc/inc/shaper.inc
$input_errors[] = "Bandwidth cannot be negative.";
- if ($data['qlimit'] && (!is_numeric($data['qlimit'])))
- $input_errors[] = "Qlimit must be an integer.";
- if ($data['qlimit'] < 0)
- $input_errors[] = "Qlimit must be an positive.";
@phil-davis

phil-davis Sep 3, 2013

Contributor

These above 4 lines were duplicated a little further down. The error messages were coming out twice on the GUI. So these lines are deleted.

@phil-davis phil-davis commented on the diff Sep 3, 2013

etc/inc/shaper.inc
@@ -3047,6 +3043,8 @@ class dnpipe_class extends dummynet_class {
if (!empty($data["bandwidth{$i}"])) {
if (!is_numeric($data["bandwidth{$i}"]))
$input_errors[] = sprintf(gettext("Bandwidth for schedule %s must be an integer."), $data["bwsched{$i}"]);
+ else if (($data["burst{$i}"] != "") && (!is_numeric($data["burst{$i}"])))
+ $input_errors[] = sprintf(gettext("Burst for schedule %s must be an integer."), $data["bwsched{$i}"]);
@phil-davis

phil-davis Sep 3, 2013

Contributor

Hmmm - these extra lines came from the code in the 2.1 branch. Somehow they are not in the master branch, but they should be IMHO.

Contributor

phil-davis commented Sep 3, 2013

This shaper.inc should/can also be applied exactly the same to 2.1 branch. It tidies up minor stuff I noticed while playing with the shaper today.

cbuechler pushed a commit that referenced this pull request Sep 3, 2013

Merge pull request #796 from phil-davis/master
Traffic Shaper GUI text typos

@cbuechler cbuechler merged commit faf4b1f into pfsense:master Sep 3, 2013

cbuechler pushed a commit that referenced this pull request Sep 3, 2013

Merge pull request #796 from phil-davis/master
Traffic Shaper GUI text typos
Contributor

cbuechler commented Sep 3, 2013

Thanks, also merged to RELENG_2_1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment