Project

General

Profile

« Previous | Next » 

Revision cabb34e4

Added by Chris Buechler about 9 years ago

Clean up limiter text. Remove old commented out bit.

View differences:

src/etc/inc/shaper.inc
3315 3315

  
3316 3316
		if ($data['plr'] && (!is_numeric($data['plr']) ||
3317 3317
		    ($data['plr'] < 0) || ($data['plr'] > 1))) {
3318
			$input_errors[] = gettext("Plr must be a value between 0 and 1.");
3318
			$input_errors[] = gettext("Packet Loss Rate must be a value between 0 and 1.");
3319 3319
		}
3320 3320
		if ($data['buckets'] && (!is_numeric($data['buckets']) ||
3321 3321
		    ($data['buckets'] < 16) || ($data['buckets'] > 65535))) {
......
3332 3332
		}
3333 3333
		if (isset($data['maskbits']) && ($data['maskbits'] <> "")) {
3334 3334
			if ((!is_numeric($data['maskbits'])) || ($data['maskbits'] <= 0) || ($data['maskbits'] > 32)) {
3335
				$input_errors[] = gettext("IPV4 bit mask must be blank or numeric value between 1 and 32.");
3335
				$input_errors[] = gettext("IPv4 bit mask must be blank or numeric value between 1 and 32.");
3336 3336
			}
3337 3337
		}
3338 3338
		if (isset($data['maskbitsv6']) && ($data['maskbitsv6'] <> "")) {
3339 3339
			if ((!is_numeric($data['maskbitsv6'])) || ($data['maskbitsv6'] <= 0) || ($data['maskbitsv6'] > 128)) {
3340
				$input_errors[] = gettext("IPV6 bit mask must be blank or numeric value between 1 and 128.");
3340
				$input_errors[] = gettext("IPv6 bit mask must be blank or numeric value between 1 and 128.");
3341 3341
			}
3342 3342
		}
3343 3343
	}
......
3879 3879

  
3880 3880
		$bandwidth = $this->GetBandwidth();
3881 3881

  
3882
		// Delete a row
3883
//		if(isset($_GET['delbwrow']) && (count($bandwidth) > 0))
3884
//			unset($bandwidth[$_GET['delbwrow']]);
3885

  
3886
		// Add a row
3887
//		if($_GET['newbwrow']) {
3888
//			array_push($bandwidth, array(count($bandwidth) => array('bw' => '', 'burst' => '', 'bwscale' => 'Kb', 'bwsched' => 'none') ));
3889
//		}
3890

  
3891 3882
		if (is_array($bandwidth)) {
3892 3883
				$section->addInput(new Form_StaticText(
3893 3884
				'Bandwidth',
......
3913 3904
			null,
3914 3905
			$mask['bits'],
3915 3906
			array_combine(range(32, 1, -1), range(32, 1, -1))
3916
		))->setHelp('IPV4 mask bits' . '<br />' . '255.255.255.255/?');
3907
		))->setHelp('IPv4 mask bits' . '<br />' . '255.255.255.255/?');
3917 3908

  
3918 3909
		$group->add(new Form_Select(
3919 3910
			'maskbitsv6',
3920 3911
			null,
3921 3912
			$mask['bitsv6'],
3922 3913
			array_combine(range(128, 1, -1), range(128, 1, -1))
3923
		))->setHelp('IPV6 mask bits' . '<br />' . '<span style="font-family:consolas">ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/?</span>');
3914
		))->setHelp('IPv6 mask bits' . '<br />' . '<span style="font-family:consolas">ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/?</span>');
3924 3915

  
3925 3916
		$section->add($group);
3926 3917

  
......
4217 4208
			null,
4218 4209
			$mask['bits'],
4219 4210
			array_combine(range(32, 1, -1), range(32, 1, -1))
4220
		))->setHelp('IPV4 mask bits' . '<br />' . '255.255.255.255/?');
4211
		))->setHelp('IPv4 mask bits' . '<br />' . '255.255.255.255/?');
4221 4212

  
4222 4213
		$group->add(new Form_Select(
4223 4214
			'maskbitsv6',
4224 4215
			null,
4225 4216
			$mask['bitsv6'],
4226 4217
			array_combine(range(128, 1, -1), range(128, 1, -1))
4227
		))->setHelp('IPV6 mask bits' . '<br />' . '<span style="font-family:consolas">ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/?</span>');
4218
		))->setHelp('IPv6 mask bits' . '<br />' . '<span style="font-family:consolas">ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/?</span>');
4228 4219

  
4229 4220
		$section->add($group);
4230 4221

  

Also available in: Unified diff