Project

General

Profile

« Previous | Next » 

Revision 520ad1a4

Added by Ermal LUÇI almost 15 years ago

Do not show on the queue/limiters list the disabled entries.

View differences:

etc/inc/shaper.inc
380 380
	function &get_queue_list($q = null) {
381 381
		$qlist = array();
382 382

  
383
		if ($this->GetEnabled() <> "")
384
			return array(); /* Queue is disabled */
385

  
383 386
		$qlist[$this->GetQname()] = & $this;
384 387
		if (is_array($this->queues)) {
385 388
			foreach ($this->queues as $queue)
......
902 905
	}
903 906

  
904 907
        function &get_queue_list(&$qlist) {
908
		
909
		if ($this->GetEnabled() <> "")
910
			return array(); /* Queue is disabled */
911

  
905 912
		$qlist[$this->GetQname()] = & $this;
906 913
		if (is_array($this->subqueues)) {
907 914
			foreach ($this->subqueues as $queue)
......
2822 2829
	function &get_queue_list($q = null) {
2823 2830
		$qlist = array();
2824 2831

  
2832
		if ($this->GetEnabled() <> "")
2833
			return $qlist; /* Queue is disabled */
2834

  
2825 2835
		$qlist[$this->GetQname()] = $this->GetNumber();
2826 2836
		if (is_array($this->subqueues)) {
2827 2837
			foreach ($this->subqueues as $queue)
......
3126 3136
        }
3127 3137

  
3128 3138
        function &get_queue_list(&$qlist) {
3139
		if ($this->GetEnabled() <> "")
3140
			return array();
3141

  
3129 3142
        	$qlist[$this->GetQname()] = "?" .$this->GetNumber();
3130 3143
        }		
3131 3144

  
......
3835 3848
		return;
3836 3849

  
3837 3850
	foreach ($a_int as $key => $conf) {
3838
				$int = $conf['interface'];
3839
				$root =& new altq_root_queue();
3840
				$root->SetInterface($int);
3841
				$altq_list_queues[$root->GetInterface()] = &$root;
3842
				$root->ReadConfig($conf);
3851
		$int = $conf['interface'];
3852
		$root =& new altq_root_queue();
3853
		$root->SetInterface($int);
3854
		$altq_list_queues[$root->GetInterface()] = &$root;
3855
		$root->ReadConfig($conf);
3843 3856
		array_push($path, $key);
3844 3857
		$root->SetLink($path);
3845 3858
		if (is_array($conf['queue'])) {
......
3852 3865
				$root->add_queue($root->GetInterface(), $q, &$path, $input_errors);
3853 3866
				array_pop($path);
3854 3867
			} 	
3855
				}
3868
		}
3856 3869
		array_pop($path);
3857 3870
	}
3858 3871
}

Also available in: Unified diff