diff options
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/firewall_shaper.php | 42 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper_layer7.php | 106 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper_queues.php | 20 | ||||
| -rw-r--r-- | usr/local/www/firewall_shaper_vinterface.php | 43 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper_wizards.php | 22 |
5 files changed, 117 insertions, 116 deletions
diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index 6ac8538..684ecd4 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -163,7 +163,7 @@ if ($_GET) { $q->SetInterface($interface); $output_form .= $q->build_form(); $output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\""; - $output_form .= " value=\"".$qname."\">"; + $output_form .= " value=\"".$qname."\" />"; $newjavascript = $q->build_javascript(); unset($q); $newqueue = true; @@ -352,22 +352,22 @@ if ($can_add || $addnewaltq) { $output_form .= "<a href=\"firewall_shaper.php?interface="; $output_form .= $interface; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } - $output_form .= "&action=add\">"; - $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\">"; + $output_form .= "&action=add\">"; + $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\" />"; $output_form .= "</a>"; $output_form .= "<a href=\"firewall_shaper.php?interface="; - $output_form .= $interface . "&queue="; + $output_form .= $interface . "&queue="; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } - $output_form .= "&action=delete\">"; + $output_form .= "&action=delete\">"; $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\""; if ($queue) - $output_form .= " value=\"" . gettext("Delete this queue") . "\">"; + $output_form .= " value=\"" . gettext("Delete this queue") . "\" />"; else - $output_form .= " value=\"" . gettext("Disable shaper on interface") . "\">"; + $output_form .= " value=\"" . gettext("Disable shaper on interface") . "\" />"; $output_form .= "</a>"; } $output_form .= "<br /></td></tr>"; @@ -380,13 +380,14 @@ $output = "<div id=\"shaperarea\" style=\"position:relative\">"; $output .= $output_form; //$pgtitle = "Firewall: Shaper: By Interface View"; - +$closehead = false; include("head.inc"); ?> - -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> +</head> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <?php if ($queue) echo $queue->build_javascript(); @@ -401,9 +402,9 @@ include("fbegin.inc"); <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper"> <tr><td> <?php $tab_array = array(); @@ -418,23 +419,23 @@ include("fbegin.inc"); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <?php if (count($altq_list_queues) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> <a href="firewall_shaper.php?action=resetall" > - <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn"> + <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn" /> </a> </td><td width="75%"> </td></tr> <?php endif; ?> <tr> - <td width="25%" valign="top" algin="left"> + <td width="25%" valign="top" align="left"> <?php echo $tree; ?> </td> <td width="75%" valign="top" align="center"> - <table> - <? + <table summary="output form"> + <?php echo $output; ?> </table> @@ -446,7 +447,6 @@ include("fbegin.inc"); </tr> </table> </form> -<?php include("fend.inc"); -?> +<?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php index 44c659f..17c674b 100755 --- a/usr/local/www/firewall_shaper_layer7.php +++ b/usr/local/www/firewall_shaper_layer7.php @@ -62,8 +62,8 @@ $shortcut_section = "trafficshaper"; $output_form = ""; $default_layer7shaper_msg = "<tr><td colspan=\"4\">"; -$default_layer7shaper_msg .= "<p><span class=\"vexpl\"><span class=\"red\"><strong>" . gettext("Note") . ":<br>"; -$default_layer7shaper_msg .= "</strong></span>" . gettext("You can add new layer7 protocol patterns by simply uploading the file") . " <a href=\"diag_patterns.php\">" . gettext("here") . ".</a><br>"; +$default_layer7shaper_msg .= "<span class=\"vexpl\"><span class=\"red\"><strong>" . gettext("Note") . ":<br/>"; +$default_layer7shaper_msg .= "</strong></span>" . gettext("You can add new layer7 protocol patterns by simply uploading the file") . " <a href=\"diag_patterns.php\">" . gettext("here") . ".</a><br/>"; $default_layer7shaper_msg .= "</td></tr>"; @@ -222,16 +222,14 @@ $tree .= "</ul>"; $output = "<div id=\"shaperarea\" style=\"position:relative\">"; $output .= $output_form; - +$closehead = false; include("head.inc"); ?> - -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> -<script language="javascript"> - +<script type="text/javascript"> +//<![CDATA[ var initial_count = new Array(); var rows_limit = 0; // Set to 0 to disable limitation @@ -358,7 +356,7 @@ function addRow(table_id) { var tFielsNum = rows_count - initial_count[table_id]; if (rows_limit!=0 && tFielsNum >= rows_limit) return false; - var remove = '<a onclick="removeRow(\''+table_id+'\',this.parentNode.parentNode)" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" /></a>'; + var remove = '<a onclick="removeRow(\''+table_id+'\',this.parentNode.parentNode)" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" alt="x" /></a>'; try { var newRow = tbl.insertRow(rows_count); @@ -386,11 +384,13 @@ function removeRow(tbl,row) { alert(ex); } } +//]]> </script> +</head> -<?php -include("fbegin.inc"); -?> +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> + +<?php include("fbegin.inc"); ?> <div id="inputerrors"></div> <?php if ($input_errors) print_input_errors($input_errors); ?> @@ -398,9 +398,9 @@ include("fbegin.inc"); <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed") . ".<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper layer7"> <tr><td> <?php $tab_array = array(); @@ -415,7 +415,7 @@ include("fbegin.inc"); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <?php if (count($layer7_rules_list) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> @@ -423,37 +423,37 @@ include("fbegin.inc"); <?php endif; ?> <tr> - <td width="25%" valign="top" algin="left"> + <td width="25%" valign="top" align="left"> <?php echo $tree; ?> <br/><br/> <a href="firewall_shaper_layer7.php?action=add"> - <img src="./themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("Create new l7 rules group"); ?>" width="17" height="17" border="0"> <?=gettext("Create new l7 rules group"); ?> + <img src="./themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("Create new l7 rules group"); ?>" width="17" height="17" border="0" alt="add" /> <?=gettext("Create new l7 rules group"); ?> </a><br/> </td> <td width="75%" valign="top" align="center"> - <table> - <? + <table summary="output form"> + <?php echo $output; ?> <!-- Layer 7 rules form --> <?php if($show_proto_form): ?> - <td width = "22%" valign = "top" class = "vncellreq"> - <div id = "addressnetworkport"> + <td width="22%" valign="top" class="vncellreq"> + <div id="addressnetworkport"> <?=gettext("Rule(s)"); ?> </div> </td> - <td width = "78%" class = "vtable"> - <table width="236" id = "maintable"> + <td width="78%" class="vtable"> + <table width="236" id="maintable" summary="main table"> <tbody> <tr> - <td colspan = "4"> - <div style = "font-size: 8pt; padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066;" - id = "itemhelp"> + <td colspan="4"> + <div style="font-size: 8pt; padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066;" + id="itemhelp"> <?=gettext("Add one or more rules"); ?> </div> </td> @@ -461,22 +461,22 @@ include("fbegin.inc"); <tr> <td> - <div style = "font-size: 8pt; padding:5px;" - id = "onecolumn"> + <div style="font-size: 8pt; padding:5px;" + id="onecolumn"> <?=gettext("Protocol"); ?> </div> </td> <td> - <div style = "font-size: 8pt; padding:5px;" - id = "twocolumn"> + <div style="font-size: 8pt; padding:5px;" + id="twocolumn"> <?=gettext("Structure"); ?> </div> </td> <td> - <div style = "font-size: 8pt; padding:5px;" - id = "threecolumn"> + <div style="font-size: 8pt; padding:5px;" + id="threecolumn"> <?=gettext("Behaviour"); ?> </div> </td> @@ -490,7 +490,7 @@ include("fbegin.inc"); <td> <select name="protocol[]" class="formselect" id="protocol" style="font-size:8pt"> <?php foreach($avail_protos as $proto): ?> - <option value="<?=$proto;?>" <?php if ($proto == $l7rule->GetRProtocol()) echo "selected"; ?>><?=$proto;?></option> + <option value="<?=$proto;?>" <?php if ($proto == $l7rule->GetRProtocol()) echo "selected=\"selected\""; ?>><?=$proto;?></option> <?php endforeach; ?> </select> </td> @@ -499,18 +499,18 @@ include("fbegin.inc"); <?php foreach($avail_structures as $struct) { if($struct == "queue") { if(!empty($avail_behaviours_altq)) { ?> - <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option> + <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected=\"selected\""; ?>><?=$struct;?></option> <?php } } else { if($struct == "limiter") { if(!empty($avail_behaviours_limiter)) { ?> - <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option> + <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected=\"selected\""; ?>><?=$struct;?></option> <?php } } else { if($struct == "action") { ?> - <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected"; ?>><?=$struct;?></option> + <option value="<?=$struct ?>" <?php if ($struct == $l7rule->GetRStructure()) echo "selected=\"selected\""; ?>><?=$struct;?></option> <?php } } } @@ -521,25 +521,25 @@ include("fbegin.inc"); <select name="behaviour[]" class="formselect" id="behaviour" style="width:80px; font-size:8pt"> <?php if($l7rule->GetRStructure() == "action"): ?> <?php foreach($avail_behaviours_action as $behaviour): ?> - <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> + <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected=\"selected\""; ?>><?=$behaviour;?></option> <?php endforeach; ?> </select> <?php endif; ?> <?php if($l7rule->GetRStructure() == "queue"): ?> <?php foreach($avail_behaviours_altq as $behaviour): ?> - <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> + <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected=\"selected\""; ?>><?=$behaviour;?></option> <?php endforeach; ?> </select> <?php endif; ?> <?php if($l7rule->GetRStructure() == "limiter"): ?> <?php foreach($avail_behaviours_limiter as $behaviour): ?> - <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected"; ?>><?=$behaviour;?></option> + <option value="<?=$behaviour ?>" <?php if ($behaviour == $l7rule->GetRBehaviour()) echo "selected=\"selected\""; ?>><?=$behaviour;?></option> <?php endforeach; ?> </select> <?php endif; ?> </td> <td> - <a onclick="removeRow('maintable',this.parentNode.parentNode); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" /></a> + <a onclick="removeRow('maintable',this.parentNode.parentNode); return false;" href="#"><img border="0" src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" alt="x" /></a> </td> </tr> @@ -548,32 +548,29 @@ include("fbegin.inc"); } //end if ?> </tbody> - - <tfoot> - </tfoot> </table> - <a onclick = "javascript:addRow('maintable'); return false;" href="#"> <img border = "0" - src = "/themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif" - alt = "" title = "<?=gettext("add another entry"); ?>" /> </a> + <a onclick="javascript:addRow('maintable'); return false;" href="#"> <img border="0" + src="/themes/<?=$g['theme']; ?>/images/icons/icon_plus.gif" + alt="" title="<?=gettext("add another entry"); ?>" /> </a> </td> </tr> <tr> - <td width = "22%" valign = "top"> + <td width="22%" valign="top"> </td> - <td width = "78%"> - <input id = "submit" - name = "submit" type = "submit" class = "formbtn" value = "<?=gettext("Save"); ?>" /> + <td width="78%"> + <input id="submit" + name="submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>" /> - <a href= "firewall_shaper_layer7.php"> - <input id = "cancelbutton" - name = "cancelbutton" type = "button" class = "formbtn" value = "<?=gettext("Cancel"); ?>" /></a> + <a href="firewall_shaper_layer7.php"> + <input id="cancelbutton" + name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" /></a> <?php if($container): ?> - <input id = "delete" type="submit" class="formbtn" name="delete" value="<?=gettext("Delete"); ?>"></a> + <input id="delete" type="submit" class="formbtn" name="delete" value="<?=gettext("Delete"); ?>" /></a> <?php endif ?> </td> </tr> @@ -589,7 +586,6 @@ include("fbegin.inc"); </table> </form> -<?php include("fend.inc"); -?> +<?php include("fend.inc"); ?> </body> </html> diff --git a/usr/local/www/firewall_shaper_queues.php b/usr/local/www/firewall_shaper_queues.php index 3974fa4..ee3e443 100755 --- a/usr/local/www/firewall_shaper_queues.php +++ b/usr/local/www/firewall_shaper_queues.php @@ -59,7 +59,7 @@ if (!is_array($qlist)) $tree = "<ul class=\"tree\" >"; foreach ($qlist as $queue => $qkey) { - $tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&action=show\" >"; + $tree .= "<li><a href=\"firewall_shaper_queues.php?queue={$queue}&action=show\" >"; if (isset($shaperIFlist[$queue])) $tree .= $shaperIFlist[$queue] . "</a></li>"; else @@ -171,11 +171,12 @@ if ($_POST['apply']) { $pgtitle = gettext("Firewall: Shaper: By Queues View"); $shortcut_section = "trafficshaper"; - +$closehead = false; include("head.inc"); ?> <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> +</head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> @@ -184,9 +185,9 @@ include("head.inc"); <form action="firewall_shaper_queues.php" method="post" name="iform" id="iform"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed") . ".<br/>" . gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper queues"> <tr><td> <?php $tab_array = array(); @@ -201,16 +202,16 @@ include("head.inc"); <tr> <td valign="top"> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <tr> - <td width="30%" valign="top" algin="left"> + <td width="30%" valign="top" align="left"> <?php echo $tree; ?> </td> <td width="70%" valign="top" align="center"> <?php if ($qname) echo "<pr class=\"pgtitle\">" . $qname . "</pr><br />"; - echo "<table align=\"center\" class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"4\" cellspacing=\"0\">"; + echo "<table align=\"center\" class=\"tabcont\" width=\"80%\" border=\"0\" cellpadding=\"4\" cellspacing=\"0\" summary=\"output form\">"; echo $output; echo "</table>"; ?> @@ -223,7 +224,6 @@ include("head.inc"); </tr> </table> </form> -<?php include("fend.inc"); -?> +<?php include("fend.inc"); ?> </body> -</html> +</html>
\ No newline at end of file diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php index 9893de1..3870e1c 100644 --- a/usr/local/www/firewall_shaper_vinterface.php +++ b/usr/local/www/firewall_shaper_vinterface.php @@ -152,7 +152,7 @@ if ($_GET) { $q = new dnqueue_class(); $q->SetPipe($pipe); $output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\""; - $output_form .= " value=\"".$pipe."\">"; + $output_form .= " value=\"".$pipe."\" />"; } else if ($addnewpipe) { $q = new dnpipe_class(); $q->SetQname($pipe); @@ -321,23 +321,23 @@ if ($can_add || $addnewaltq) { $output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe="; $output_form .= $pipe; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } - $output_form .= "&action=add\">"; - $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") ."\">"; + $output_form .= "&action=add\">"; + $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") ."\" />"; $output_form .= "</a>"; } $output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe="; $output_form .= $pipe; if ($queue) { - $output_form .= "&queue=" . $queue->GetQname(); + $output_form .= "&queue=" . $queue->GetQname(); } -$output_form .= "&action=delete\">"; +$output_form .= "&action=delete\">"; $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\""; if ($queue) - $output_form .= " value=\"" . gettext("Delete this queue") ."\">"; + $output_form .= " value=\"" . gettext("Delete this queue") ."\" />"; else - $output_form .= " value=\"" . gettext("Delete virtual interface") ."\">"; + $output_form .= " value=\"" . gettext("Delete virtual interface") ."\" />"; $output_form .= "</a>"; $output_form .= "</td></tr>"; $output_form .= "</div>"; @@ -347,14 +347,13 @@ else $output = "<div id=\"shaperarea\" style=\"position:relative\">"; $output .= $output_form; - +$closehead = false; include("head.inc"); ?> - -<body link="#0000CC" vlink="#0000CC" alink="#0000CC" > <link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> <script type="text/javascript" src="./tree/tree.js"></script> <script type="text/javascript"> +//<![CDATA[ function show_source_port_range() { document.getElementById("sprtable").style.display = ''; document.getElementById("sprtable1").style.display = ''; @@ -363,7 +362,11 @@ function show_source_port_range() { document.getElementById("sprtable4").style.display = 'none'; document.getElementById("showadvancedboxspr").innerHTML=''; } +//]]> </script> +</head> + +<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php if ($queue) @@ -380,9 +383,9 @@ include("fbegin.inc"); <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper limiter"> <tr><td> <?php $tab_array = array(); @@ -397,24 +400,24 @@ include("fbegin.inc"); <tr> <td> <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0"> + <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <?php if (count($dummynet_pipe_list) > 0): ?> <tr class="tabcont"><td width="25%" align="left"> </td><td width="75%"> </td></tr> <?php endif; ?> <tr> - <td width="25%" valign="top" algin="left"> + <td width="25%" valign="top" align="left"> <?php echo $tree; ?> <br/><br/> - <a href="firewall_shaper_vinterface.php?pipe=new&action=add"> - <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("Create new limiter");?>" width="17" height="17" border="0"><?=gettext("Create new limiter");?> + <a href="firewall_shaper_vinterface.php?pipe=new&action=add"> + <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("Create new limiter");?>" width="17" height="17" border="0" alt="add" /><?=gettext("Create new limiter");?> </a><br/> </td> <td width="75%" valign="top" align="center"> - <table> - <? + <table summary="output form"> + <?php echo $output; ?> </table> @@ -427,12 +430,14 @@ include("fbegin.inc"); </table> </form> <script type='text/javascript'> +//<![CDATA[ <?php $totalrows = 0; if (is_array($config['dnshaper']) && is_array($config['dnshaper']['queue'])) $totalrows = count($config['dnshaper']['queue']); echo "totalrows = {$totalrows}"; ?> +//]]> </script> <?php include("fend.inc"); ?> </body> diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php index 1db1add..455b932 100755 --- a/usr/local/www/firewall_shaper_wizards.php +++ b/usr/local/www/firewall_shaper_wizards.php @@ -79,23 +79,24 @@ $wizards = array(gettext("Single Lan multi Wan") => "traffic_shaper_wizard.xml", gettext("Dedicated Links") => "traffic_shaper_wizard_dedicated.xml", ); +$closehead = false; include("head.inc"); ?> +<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> +</head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC" > -<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" /> -<?php -include("fbegin.inc"); -?> + +<?php include("fbegin.inc"); ?> <?php if ($input_errors) print_input_errors($input_errors); ?> <form action="firewall_shaper_wizards.php" method="post" id="iform" name="iform"> <?php if ($savemsg) print_info_box($savemsg); ?> <?php if (is_subsystem_dirty('shaper')): ?><p> -<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br> +<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br/>".gettext("You must apply the changes in order for them to take effect."));?><br/></p> <?php endif; ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="traffic shaper wizard"> <tr><td> <?php $tab_array = array(); @@ -110,10 +111,10 @@ include("fbegin.inc"); <tr> <td> <div id="mainarea"> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area"> <tr> - <td class="listhdrr" width="25%" align="center" ><?=gettext("Wizard function");?></td> - <td class="listhdrr" width="75%" align="center"><?=gettext("Wizard Link");?></td> + <td class="listhdrr" width="25%" align="center" ><?=gettext("Wizard function");?></td> + <td class="listhdrr" width="75%" align="center"><?=gettext("Wizard Link");?></td> </tr> <?php foreach ($wizards as $key => $wizard): ?> <tr class="tabcont"><td class="listlr" style="background-color: #e0e0e0" width="25%" align="center"> @@ -128,7 +129,6 @@ include("fbegin.inc"); </tr> </table> </form> -<?php include("fend.inc"); -?> +<?php include("fend.inc"); ?> </body> </html> |
