Project

General

Profile

« Previous | Next » 

Revision e0405a4b

Added by Ermal Luçi over 17 years ago

Fix Queues view on the shaper.

View differences:

usr/local/www/firewall_shaper_queues.php
52 52
read_altq_config();
53 53

  
54 54
$tree = "<ul class=\"tree\" >";
55
if (is_array($altq_list_queues)) {
56
	foreach ($GLOBALS['allqueue_list'] as $queue) {
57
        	$tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&action=show\" >{$queue}</a></li>";
58
        }
55
foreach ($GLOBALS['allqueue_list'] as $queue) {
56
	$tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&action=show\" >{$queue}</a></li>";
59 57
}
60 58
$tree .= "</ul>";
61 59

  
......
137 135
            unlink($d_shaperconfdirty_path);
138 136
}
139 137

  
140
/* if this is an AJAX caller then handle via JSON */
141
if(isAjax() && is_array($input_errors)) {
142
        input_errors2Ajax($input_errors);
143
        exit;
144
}
145

  
146
/* if ajax is calling, give them an update message */
147
if(isAjax())
148
        print_info_box_np($savemsg);
149

  
150 138
$pgtitle = "Firewall: Shaper: By Queues View";
151 139

  
152 140
include("head.inc");
......
154 142
<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
155 143
<script type="text/javascript" src="./tree/tree.js"></script>
156 144

  
157
<?
158
/* put your custom HTML head content here        */
159
/* using some of the $pfSenseHead function calls */
160
echo $pfSenseHead->getHTML();
161
?>
162 145
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
163 146
<?php include("fbegin.inc"); ?>
164 147
<div id="inputerrors"></div>
......
172 155
  <tr><td>
173 156
<?php
174 157
	$tab_array = array();
175
	$tab_array[0] = array("Shaper", false, "firewall_shaper.php");
176
	//$tab_array[1] = array("Level 2", true, "");
177
	$tab_array[1] = array("EZ Shaper wizard", false, "wizard.php?xml=traffic_shaper_wizard.xml");
158
	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
159
	$tab_array[1] = array("By Queue", true, "firewall_shaper_queues.ph");
160
	$tab_array[2] = array("EZ Shaper wizard", false, "wizard.php?xml=traffic_shaper_wizard.xml");
178 161
	display_top_tabs($tab_array);
179 162
?>
180 163
  </td></tr>
181 164
  <tr> 
182 165
    <td valign="top">
183 166
	<div id="mainarea">
184
              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
185
			<tr>
186
			<td width="30%" valign="top" algin="left">
187
		<?	$tab_ar = array();
188
        $tab_ar[0] = array("By Interface", false, "firewall_shaper.php");
189
        $tab_ar[1] = array("By Queues", true, "firewall_shaper_queues.php");
190
        display_top_tabs($tab_ar); 
191
                                echo $tree;
192
                        ?>
193
			</td></tr>
194
		</table>
195
			<td width="70%" valign="top" align="center">
196
			<table class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">
197
		<tr><td>
167
		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
168
		<tr>
169
		<td width="30%" valign="top" algin="left">
170
                <?      echo $tree; ?>
171
		</td>
172
		<td width="70%" valign="top" align="center">
198 173
			<? 
199 174
				if ($qname)
200 175
        				echo "<pr class=\"pgtitle\">" . $qname . "</pr><br />";
201
				echo "<table align=\"top\" class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"4\" cellspacing=\"0\">";
176
				echo "<table align=\"center\" class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"4\" cellspacing=\"0\">";
202 177
				echo $output;
203 178
				echo "</table>";
204 179
			?>	

Also available in: Unified diff