Code style firewall shaper

1 files changed, 225 insertions, 194 deletions

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 0930af1..8c979ae 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -46,7 +46,7 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 
-if($_GET['reset'] <> "") {
+if ($_GET['reset'] <> "") {
 	mwexec("/usr/bin/killall -9 pfctl");
 	exit;
 }
@@ -55,37 +55,45 @@ $pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"), gettext("Limiter
 $shortcut_section = "trafficshaper-limiters";
 
 read_dummynet_config();
-/* 
+/*
  * The whole logic in these code maybe can be specified.
  * If you find a better way contact me :).
  */
 
 if ($_GET) {
-	if ($_GET['queue'])
-        	$qname = htmlspecialchars(trim($_GET['queue']));
-        if ($_GET['pipe'])
-                $pipe = htmlspecialchars(trim($_GET['pipe']));
-        if ($_GET['action'])
-                $action = htmlspecialchars($_GET['action']);
+	if ($_GET['queue']) {
+		$qname = htmlspecialchars(trim($_GET['queue']));
+	}
+	if ($_GET['pipe']) {
+		$pipe = htmlspecialchars(trim($_GET['pipe']));
+	}
+	if ($_GET['action']) {
+		$action = htmlspecialchars($_GET['action']);
+	}
 }
 if ($_POST) {
-	if ($_POST['name'])
-        	$qname = htmlspecialchars(trim($_POST['name']));
-	else if ($_POST['newname'])
-        	$qname = htmlspecialchars(trim($_POST['newname']));
-        if ($_POST['pipe'])
-        	$pipe = htmlspecialchars(trim($_POST['pipe']));
-	else
+	if ($_POST['name']) {
+		$qname = htmlspecialchars(trim($_POST['name']));
+	} else if ($_POST['newname']) {
+		$qname = htmlspecialchars(trim($_POST['newname']));
+	}
+	if ($_POST['pipe']) {
+		$pipe = htmlspecialchars(trim($_POST['pipe']));
+	} else {
 		$pipe = htmlspecialchars(trim($qname));
-	if ($_POST['parentqueue'])
+	}
+	if ($_POST['parentqueue']) {
 		$parentqueue = htmlspecialchars(trim($_POST['parentqueue']));
+	}
 }
 
 if ($pipe) {
 	$dnpipe = $dummynet_pipe_list[$pipe];
 	if ($dnpipe) {
 		$queue =& $dnpipe->find_queue($pipe, $qname);
-	} else $addnewpipe = true;
+	} else {
+		$addnewpipe = true;
+	}
 }
 
 $dontshow = false;
@@ -94,118 +102,131 @@ $output_form = "";
 
 if ($_GET) {
 	switch ($action) {
-	case "delete":
-		if ($queue) {
-			if (is_array($config['filter']['rule'])) {
-				foreach ($config['filter']['rule'] as $rule) {
-					if ($rule['dnpipe'] == $queue->GetQname() || $rule['pdnpipe'] == $queue->GetQname())
-						$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleting.");
+		case "delete":
+			if ($queue) {
+				if (is_array($config['filter']['rule'])) {
+					foreach ($config['filter']['rule'] as $rule) {
+						if ($rule['dnpipe'] == $queue->GetQname() || $rule['pdnpipe'] == $queue->GetQname()) {
+							$input_errors[] = gettext("This pipe/queue is referenced in filter rules, please remove references from there before deleting.");
+						}
+					}
 				}
+				if (!$input_errors) {
+					$queue->delete_queue();
+					if (write_config()) {
+						mark_subsystem_dirty('shaper');
+					}
+					header("Location: firewall_shaper_vinterface.php");
+					exit;
+				}
+				$output_form .= $queue->build_form();
+			} else {
+				$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
+				$output_form .= $dn_default_shaper_msg;
+				$dontshow = true;
 			}
-			if (!$input_errors) {
-				$queue->delete_queue();
-				if (write_config())
+			break;
+		case "resetall":
+			foreach ($dummynet_pipe_list as $dn) {
+				$dn->delete_queue();
+			}
+			unset($dummynet_pipe_list);
+			$dummynet_pipe_list = array();
+			unset($config['dnshaper']['queue']);
+			unset($queue);
+			unset($pipe);
+			$can_add = false;
+			$can_enable = false;
+			$dontshow = true;
+			foreach ($config['filter']['rule'] as $key => $rule) {
+				if (isset($rule['dnpipe'])) {
+					unset($config['filter']['rule'][$key]['dnpipe']);
+				}
+				if (isset($rule['pdnpipe'])) {
+					unset($config['filter']['rule'][$key]['pdnpipe']);
+				}
+			}
+			if (write_config()) {
+				$retval = 0;
+				$retval = filter_configure();
+				$savemsg = get_std_save_message($retval);
+
+				if (stristr($retval, "error") <> true) {
+					$savemsg = get_std_save_message($retval);
+				} else {
+					$savemsg = $retval;
+				}
+			} else {
+				$savemsg = gettext("Unable to write config.xml (Access Denied?)");
+			}
+			$output_form = $dn_default_shaper_message;
+
+			break;
+		case "add":
+			if ($dnpipe) {
+				$q = new dnqueue_class();
+				$q->SetPipe($pipe);
+				$output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\"";
+				$output_form .= " value=\"".$pipe."\" />";
+			} else if ($addnewpipe) {
+				$q = new dnpipe_class();
+				$q->SetQname($pipe);
+			} else {
+				$input_errors[] = gettext("Could not create new queue/discipline!");
+			}
+
+			if ($q) {
+				$output_form .= $q->build_form();
+				$newjavascript = $q->build_javascript();
+				unset($q);
+				$newqueue = true;
+			}
+			break;
+		case "show":
+			if ($queue) {
+			   $output_form .= $queue->build_form();
+			} else {
+				$input_errors[] = gettext("Queue not found!");
+			}
+			break;
+		case "enable":
+			if ($queue) {
+				$queue->SetEnabled("on");
+				$output_form .= $queue->build_form();
+				$queue->wconfig();
+				if (write_config()) {
 					mark_subsystem_dirty('shaper');
-				header("Location: firewall_shaper_vinterface.php");
-				exit;
+				}
+			} else {
+				$input_errors[] = gettext("Queue not found!");
 			}
-			$output_form .= $queue->build_form();
-		} else {
-			$input_errors[] = sprintf(gettext("No queue with name %s was found!"),$qname);
+			break;
+		case "disable":
+			if ($queue) {
+				$queue->SetEnabled("");
+				$output_form .= $queue->build_form();
+				$queue->wconfig();
+				if (write_config()) {
+					mark_subsystem_dirty('shaper');
+				}
+			} else {
+				$input_errors[] = gettext("Queue not found!");
+			}
+			break;
+		default:
 			$output_form .= $dn_default_shaper_msg;
 			$dontshow = true;
-		}
-		break;
-	case "resetall":
-		foreach ($dummynet_pipe_list as $dn)
-			$dn->delete_queue();
-		unset($dummynet_pipe_list);
-		$dummynet_pipe_list = array();
-		unset($config['dnshaper']['queue']);
-		unset($queue);
-		unset($pipe);
-		$can_add = false;
-		$can_enable = false;
-		$dontshow = true;
-		foreach ($config['filter']['rule'] as $key => $rule) {
-			if (isset($rule['dnpipe']))
-				unset($config['filter']['rule'][$key]['dnpipe']);
-			if (isset($rule['pdnpipe']))
-				unset($config['filter']['rule'][$key]['pdnpipe']);
-		}
-		if (write_config()) {
-			$retval = 0;
-			$retval = filter_configure();
-			$savemsg = get_std_save_message($retval);
-
-			if (stristr($retval, "error") <> true)
-				$savemsg = get_std_save_message($retval);
-			else
-				$savemsg = $retval;
-		} else
-			$savemsg = gettext("Unable to write config.xml (Access Denied?)");
-		$output_form = $dn_default_shaper_message;
-
-		break;
-	case "add":
-		if ($dnpipe) {
-			$q = new dnqueue_class();
-			$q->SetPipe($pipe);
-			$output_form .= "<input type=\"hidden\" name=\"parentqueue\" id=\"parentqueue\"";
-			$output_form .= " value=\"".$pipe."\" />";
-		} else if ($addnewpipe) {
-			$q = new dnpipe_class();
-			$q->SetQname($pipe);
-		} else 
-			$input_errors[] = gettext("Could not create new queue/discipline!");
-
-		if ($q) {
-			$output_form .= $q->build_form();
-			$newjavascript = $q->build_javascript();
-			unset($q);
-			$newqueue = true;
-		}
-		break;
-	case "show":
-		if ($queue)  
-                       $output_form .= $queue->build_form();
-		else
-			$input_errors[] = gettext("Queue not found!");
-		break;
-	case "enable":
-		if ($queue) {
-			$queue->SetEnabled("on");
-			$output_form .= $queue->build_form();
-			$queue->wconfig();
-			if (write_config())
-				mark_subsystem_dirty('shaper');
-		} else
-			$input_errors[] = gettext("Queue not found!");
-		break;
-	case "disable":
-		if ($queue) {
-			$queue->SetEnabled("");
-			$output_form .= $queue->build_form();
-			$queue->wconfig();
-			if (write_config())
-				mark_subsystem_dirty('shaper');
-		} else
-			$input_errors[] = gettext("Queue not found!");
-		break;
-	default:
-		$output_form .= $dn_default_shaper_msg;
-		$dontshow = true;
-		break;
+			break;
 	}
 } else if ($_POST) {
 	unset($input_errors);
 
 	if ($addnewpipe) {
-		if (!empty($dummynet_pipe_list[$qname]))
+		if (!empty($dummynet_pipe_list[$qname])) {
 			$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
-		else {
+		} else {
 			$dnpipe =& new dnpipe_class();
-			
+
 			$dnpipe->ReadConfig($_POST);
 			$dnpipe->validate_input($_POST, $input_errors);
 			if (!$input_errors) {
@@ -213,10 +234,11 @@ if ($_GET) {
 				$dnpipe->SetNumber($number);
 				unset($tmppath);
 				$tmppath[] = $dnpipe->GetQname();
-				$dnpipe->SetLink($tmppath);	
+				$dnpipe->SetLink($tmppath);
 				$dnpipe->wconfig();
-				if (write_config())
+				if (write_config()) {
 					mark_subsystem_dirty('shaper');
+				}
 				$can_enable = true;
 				$can_add = true;
 			}
@@ -226,9 +248,9 @@ if ($_GET) {
 			$newjavascript = $dnpipe->build_javascript();
 		}
 	} else if ($parentqueue) { /* Add a new queue */
-		if (!empty($dummynet_pipe_list[$qname]))
+		if (!empty($dummynet_pipe_list[$qname])) {
 			$input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter");
-		else if ($dnpipe) {
+		} else if ($dnpipe) {
 			$tmppath =& $dnpipe->GetLink();
 			array_push($tmppath, $qname);
 			$tmp =& $dnpipe->add_queue($pipe, $_POST, $tmppath, $input_errors);
@@ -243,43 +265,44 @@ if ($_GET) {
 			}
 			read_dummynet_config();
 			$output_form .= $tmp->build_form();
-		} else
+		} else {
 			$input_errors[] = gettext("Could not add new queue.");
+		}
 	} else if ($_POST['apply']) {
-			write_config();
+		write_config();
+
+		$retval = 0;
+		$retval = filter_configure();
+		$savemsg = get_std_save_message($retval);
 
-			$retval = 0;
-			$retval = filter_configure();
+		if (stristr($retval, "error") <> true) {
 			$savemsg = get_std_save_message($retval);
-			
-			if (stristr($retval, "error") <> true)
-					$savemsg = get_std_save_message($retval);
-			else
-					$savemsg = $retval;
+		} else {
+			$savemsg = $retval;
+		}
 
- 		/* XXX: TODO Make dummynet pretty graphs */ 
+		/* XXX: TODO Make dummynet pretty graphs */
 		//	enable_rrd_graphing();
 
-			clear_subsystem_dirty('shaper');
-			
-			if ($queue) {
-				$output_form .= $queue->build_form();
-				$dontshow = false;
-			}
-			else {
-				$output_form .= $dn_default_shaper_message;
-				$dontshow = true;
-			}
+		clear_subsystem_dirty('shaper');
 
+		if ($queue) {
+			$output_form .= $queue->build_form();
+			$dontshow = false;
+		} else {
+			$output_form .= $dn_default_shaper_message;
+			$dontshow = true;
+		}
 	} else if ($queue) {
-                $queue->validate_input($_POST, $input_errors);
-                if (!$input_errors) {
+		$queue->validate_input($_POST, $input_errors);
+		if (!$input_errors) {
 			$queue->update_dn_data($_POST);
 			$queue->wconfig();
-			if (write_config())
+			if (write_config()) {
 				mark_subsystem_dirty('shaper');
+			}
 			$dontshow = false;
-                } 
+		}
 		read_dummynet_config();
 		$output_form .= $queue->build_form();
 	} else  {
@@ -292,21 +315,23 @@ if ($_GET) {
 }
 
 if ($queue) {
-                        if ($queue->GetEnabled())
-                                $can_enable = true;
-                        else
-                                $can_enable = false;
-                        if ($queue->CanHaveChildren()) { 
-                       		$can_add = true;
-                        } else
-                                $can_add = false;
+	if ($queue->GetEnabled()) {
+		$can_enable = true;
+	} else {
+		$can_enable = false;
+	}
+	if ($queue->CanHaveChildren()) {
+		$can_add = true;
+	} else {
+		$can_add = false;
+	}
 }
 
 $tree = "<ul class=\"tree\" >";
 if (is_array($dummynet_pipe_list)) {
-        foreach ($dummynet_pipe_list as $tmpdn) {
-                $tree .= $tmpdn->build_tree();
-        }
+	foreach ($dummynet_pipe_list as $tmpdn) {
+		$tree .= $tmpdn->build_tree();
+	}
 }
 $tree .= "</ul>";
 
@@ -319,7 +344,7 @@ $output_form .= "</td><td valign=\"top\" class=\"vncellreq\" width=\"78%\">";
 $output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"formbtn\" />";
 if ($can_add || $addnewaltq) {
 	$output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe=";
-	$output_form .= $pipe; 
+	$output_form .= $pipe;
 	if ($queue) {
 		$output_form .= "&amp;queue=" . $queue->GetQname();
 	}
@@ -334,16 +359,17 @@ if ($queue) {
 }
 $output_form .= "&amp;action=delete\">";
 $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\"";
-if ($queue)
+if ($queue) {
 	$output_form .= " value=\"" . gettext("Delete this queue") ."\" />";
-else
+} else {
 	$output_form .= " value=\"" . gettext("Delete Limiter") ."\" />";
-$output_form .= "</a>";  
+}
+$output_form .= "</a>";
 $output_form .= "</td></tr>";
 $output_form .= "</table>";
-} 
-else 
+} else {
 	$output_form .= "</table>";
+}
 
 $output = "<table summary=\"output form\">";
 $output .= $output_form;
@@ -355,7 +381,7 @@ include("head.inc");
 <script type="text/javascript">
 //<![CDATA[
 function show_source_port_range() {
-        document.getElementById("sprtable").style.display = '';
+	document.getElementById("sprtable").style.display = '';
 	document.getElementById("sprtable1").style.display = '';
 	document.getElementById("sprtable2").style.display = '';
 	document.getElementById("sprtable5").style.display = '';
@@ -369,12 +395,13 @@ function show_source_port_range() {
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 
 <?php
-if ($queue)
+if ($queue) {
 	echo $queue->build_javascript();
-else
+} else {
 	echo $newjavascript;
+}
 
-include("fbegin.inc"); 
+include("fbegin.inc");
 ?>
 <div id="inputerrors"></div>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
@@ -386,7 +413,7 @@ include("fbegin.inc");
 <?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" summary="traffic shaper limiter">
-  <tr><td>
+	<tr><td>
 <?php
 	$tab_array = array();
 	$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
@@ -396,36 +423,39 @@ include("fbegin.inc");
 	$tab_array[4] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
-  </td></tr>
-  <tr>
-    <td>
-	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" summary="main area">
+	</td></tr>
+	<tr>
+		<td>
+			<div id="mainarea">
+				<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>
+					<tr class="tabcont">
+						<td width="25%" align="left"></td>
+						<td width="75%"> </td>
+					</tr>
 <?php endif; ?>
-			<tr>
-			<td width="25%" valign="top" align="left">
-			<?php
-				echo $tree; 
-			?>
-			<br /><br />
-			<a href="firewall_shaper_vinterface.php?pipe=new&amp;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" />&nbsp;<?=gettext("Create new limiter");?>
-			</a><br />
-			</td>
-			<td width="75%" valign="top" align="center">
-			<div id="shaperarea" style="position:relative">
-			<?php
-				echo $output;
-			?>	
+					<tr>
+						<td width="25%" valign="top" align="left">
+							<?php
+								echo $tree;
+							?>
+							<br /><br />
+							<a href="firewall_shaper_vinterface.php?pipe=new&amp;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" />&nbsp;<?=gettext("Create new limiter");?>
+							</a>
+							<br />
+						</td>
+						<td width="75%" valign="top" align="center">
+							<div id="shaperarea" style="position:relative">
+								<?php
+									echo $output;
+								?>
+							</div>
+						</td>
+					</tr>
+				</table>
 			</div>
-
-		      </td></tr>
-                    </table>
-		</div>
-	  </td>
+		</td>
 	</tr>
 </table>
 </form>
@@ -433,8 +463,9 @@ include("fbegin.inc");
 //<![CDATA[
 <?php
 	$totalrows = 0;
-	if (is_array($config['dnshaper']) && is_array($config['dnshaper']['queue'])) 
+	if (is_array($config['dnshaper']) && is_array($config['dnshaper']['queue'])) {
 		$totalrows = count($config['dnshaper']['queue']);
+	}
 	echo "totalrows = {$totalrows}";
 ?>
 //]]>