Code style WWW pkg

The syntax of these all seems good. Because the 2.3-DEVELOPMENT master
does not currently have get_pkg_info implemented, the available packages
tab always says "Unable to retrieve package info...".
But I don't think I broke any code.
This is integrated with the little changes for startdisplayingat var in
pkg.php

1 files changed, 427 insertions, 342 deletions

diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 7a58d81..44cf3f5 100644
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -1,31 +1,31 @@
 <?php
 /* $Id$ */
 /*
-    pkg_edit.php
-    Copyright (C) 2013-2015 Electric Sheep Fencing, LP
-    Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com>
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-
-    2. Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
-
-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-    POSSIBILITY OF SUCH DAMAGE.
+	pkg_edit.php
+	Copyright (C) 2013-2015 Electric Sheep Fencing, LP
+	Copyright (C) 2004-2012 Scott Ullrich <sullrich@gmail.com>
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
 	pfSense_BUILDER_BINARIES:	/sbin/ifconfig
@@ -48,42 +48,47 @@ require_once("shaper.inc");
 require_once("pkg-utils.inc");
 
 /* dummy stubs needed by some code that was MFC'd */
-function pfSenseHeader($location) { header("Location: " . $location); }
+function pfSenseHeader($location) {
+	header("Location: " . $location);
+}
 
 function gentitle_pkg($pgname) {
 	global $pfSense_config;
 	return $pfSense_config['system']['hostname'] . "." . $pfSense_config['system']['domain'] . " - " . $pgname;
 }
 
-function domTT_title($title_msg){
-	if (!empty($title_msg)){
+function domTT_title($title_msg) {
+	if (!empty($title_msg)) {
 		$title_msg=preg_replace("/\s+/"," ",$title_msg);
-        $title_msg=preg_replace("/'/","\'",$title_msg);
+		$title_msg=preg_replace("/'/","\'",$title_msg);
 		return "onmouseout=\"this.style.color = ''; domTT_mouseout(this, event);\" onmouseover=\"domTT_activate(this, event, 'content', '{$title_msg}', 'trail', true, 'delay', 0, 'fade', 'both', 'fadeMax', 93, 'delay',300,'styleClass', 'niceTitle');\"";
 	}
 }
 
 $xml = htmlspecialchars($_GET['xml']);
-if($_POST['xml']) $xml = htmlspecialchars($_POST['xml']);
+if ($_POST['xml']) {
+	$xml = htmlspecialchars($_POST['xml']);
+}
 
 $xml_fullpath = realpath('/usr/local/pkg/' . $xml);
 
 if ($xml == "" || $xml_fullpath === false ||
     substr($xml_fullpath, 0, strlen('/usr/local/pkg/')) != '/usr/local/pkg/') {
-            print_info_box_np(gettext("ERROR: No valid package defined."));
-            die;
+	print_info_box_np(gettext("ERROR: No valid package defined."));
+	die;
 } else {
-            $pkg = parse_xml_config_pkg($xml_fullpath, "packagegui");
+	$pkg = parse_xml_config_pkg($xml_fullpath, "packagegui");
 }
 
-if($pkg['include_file'] <> "") {
+if ($pkg['include_file'] <> "") {
 	require_once($pkg['include_file']);
 }
 
-if (!isset($pkg['adddeleteeditpagefields']))
+if (!isset($pkg['adddeleteeditpagefields'])) {
 	$only_edit = true;
-else
+} else {
 	$only_edit = false;
+}
 
 $package_name = $pkg['menu'][0]['name'];
 $section      = $pkg['menu'][0]['section'];
@@ -93,38 +98,45 @@ $title        = $pkg['title'];
 $pgtitle      = $title;
 
 $id = $_GET['id'];
-if (isset($_POST['id']))
+if (isset($_POST['id'])) {
 	$id = htmlspecialchars($_POST['id']);
+}
 
 // Not posting?  Then user is editing a record. There must be a valid id
 // when editing a record.
-if(!$id && !$_POST)
+if (!$id && !$_POST) {
 	$id = "0";
+}
 
-if(!is_numeric($id)) {
+if (!is_numeric($id)) {
 	header("Location: /");
 	exit;
 }
 
-if($pkg['custom_php_global_functions'] <> "")
-        eval($pkg['custom_php_global_functions']);
+if ($pkg['custom_php_global_functions'] <> "") {
+	eval($pkg['custom_php_global_functions']);
+}
 
 // grab the installedpackages->package_name section.
-if($config['installedpackages'] && !is_array($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']))
+if ($config['installedpackages'] && !is_array($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'])) {
 	$config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'] = array();
+}
 
 // If the first entry in the array is an empty <config/> tag, kill it.
-if ($config['installedpackages'] && (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) 
-	&& ($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0] == ""))
+if ($config['installedpackages'] && (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0)
+    && ($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0] == "")) {
 	array_shift($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']);
+}
 
 $a_pkg = &$config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'];
 
-if($_GET['savemsg'] <> "")
+if ($_GET['savemsg'] <> "") {
 	$savemsg = htmlspecialchars($_GET['savemsg']);
+}
 
-if($pkg['custom_php_command_before_form'] <> "")
+if ($pkg['custom_php_command_before_form'] <> "") {
 	eval($pkg['custom_php_command_before_form']);
+}
 
 if ($_POST) {
 	$firstfield = "";
@@ -135,33 +147,38 @@ if ($_POST) {
 	$reqfieldsn = array();
 	foreach ($pkg['fields']['field'] as $field) {
 		if (($field['type'] == 'input') && isset($field['required'])) {
-			if($field['fieldname'])
+			if ($field['fieldname']) {
 				$reqfields[] = $field['fieldname'];
-			if($field['fielddescr'])
+			}
+			if ($field['fielddescr']) {
 				$reqfieldsn[] = $field['fielddescr'];
+			}
 		}
 	}
 	do_input_validation($_POST, $reqfields, $reqfieldsn, $input_errors);
 
-	if ($pkg['custom_php_validation_command'])
+	if ($pkg['custom_php_validation_command']) {
 		eval($pkg['custom_php_validation_command']);
+	}
 
-	if($_POST['act'] == "del") {
-		if($pkg['custom_delete_php_command']) {
-		    if($pkg['custom_php_command_before_form'] <> "")
-			    eval($pkg['custom_php_command_before_form']);
-		    eval($pkg['custom_delete_php_command']);
+	if ($_POST['act'] == "del") {
+		if ($pkg['custom_delete_php_command']) {
+			if ($pkg['custom_php_command_before_form'] <> "") {
+				eval($pkg['custom_php_command_before_form']);
+			}
+			eval($pkg['custom_delete_php_command']);
 		}
 		write_config($pkg['delete_string']);
 		// resync the configuration file code if defined.
-		if($pkg['custom_php_resync_config_command'] <> "") {
-			if($pkg['custom_php_command_before_form'] <> "")
+		if ($pkg['custom_php_resync_config_command'] <> "") {
+			if ($pkg['custom_php_command_before_form'] <> "") {
 				eval($pkg['custom_php_command_before_form']);
+			}
 			eval($pkg['custom_php_resync_config_command']);
 		}
 	} else {
-		if(!$input_errors && $pkg['custom_add_php_command']) {
-			if($pkg['donotsave'] <> "" or $pkg['preoutput'] <> "") {
+		if (!$input_errors && $pkg['custom_add_php_command']) {
+			if ($pkg['donotsave'] <> "" or $pkg['preoutput'] <> "") {
 			?>
 
 <?php include("head.inc"); ?>
@@ -169,29 +186,34 @@ if ($_POST) {
 <?php include("fbegin.inc"); ?>
 <?php
 			}
-			if($pkg['preoutput']) echo "<pre>";
+			if ($pkg['preoutput']) {
+				echo "<pre>";
+			}
 			eval($pkg['custom_add_php_command']);
-			if($pkg['preoutput']) echo "</pre>";
+			if ($pkg['preoutput']) {
+				echo "</pre>";
+			}
 		}
 	}
 
 	// donotsave is enabled.  lets simply exit.
-	if(empty($pkg['donotsave'])) {
+	if (empty($pkg['donotsave'])) {
 
-		// store values in xml configration file.
+		// store values in xml configuration file.
 		if (!$input_errors) {
 			$pkgarr = array();
 			foreach ($pkg['fields']['field'] as $fields) {
-				switch($fields['type']){
+				switch ($fields['type']) {
 					case "rowhelper":
 						// save rowhelper items.
 						#$rowhelpername=($fields['fieldname'] ? $fields['fieldname'] : "row");
 						$rowhelpername="row";
-						foreach($fields['rowhelper']['rowhelperfield'] as $rowhelperfield)
-							foreach($_POST as $key => $value){
+						foreach ($fields['rowhelper']['rowhelperfield'] as $rowhelperfield) {
+							foreach ($_POST as $key => $value) {
 								if (preg_match("/^{$rowhelperfield['fieldname']}(\d+)$/",$key,$matches))
 									$pkgarr[$rowhelpername][$matches[1]][$rowhelperfield['fieldname']]=$value;
 							}
+						}
 						break;
 					default:
 						$fieldname  = $fields['fieldname'];
@@ -201,49 +223,55 @@ if ($_POST) {
 							$fieldvalue = implode(',', $_POST[$fieldname]);
 						} else {
 							$fieldvalue = trim($_POST[$fieldname]);
-							if ($fields['encoding'] == 'base64')
+							if ($fields['encoding'] == 'base64') {
 								$fieldvalue = base64_encode($fieldvalue);
+							}
 						}
-						if($fieldname)
+						if ($fieldname) {
 							$pkgarr[$fieldname] = $fieldvalue;
+						}
 					}
 			}
 
-			if (isset($id) && $a_pkg[$id])
+			if (isset($id) && $a_pkg[$id]) {
 				$a_pkg[$id] = $pkgarr;
-			else
+			} else {
 				$a_pkg[] = $pkgarr;
+			}
 
 			write_config($pkg['addedit_string']);
 			// late running code
-			if($pkg['custom_add_php_command_late'] <> "") {
-			    eval($pkg['custom_add_php_command_late']);
+			if ($pkg['custom_add_php_command_late'] <> "") {
+				eval($pkg['custom_add_php_command_late']);
 			}
 
-			if (isset($pkg['filter_rules_needed']))
+			if (isset($pkg['filter_rules_needed'])) {
 				filter_configure();
+			}
 
 			// resync the configuration file code if defined.
-			if($pkg['custom_php_resync_config_command'] <> "") {
-			    eval($pkg['custom_php_resync_config_command']);
+			if ($pkg['custom_php_resync_config_command'] <> "") {
+				eval($pkg['custom_php_resync_config_command']);
 			}
 
 			parse_package_templates();
 
 			/* if start_command is defined, restart w/ this */
-			if($pkg['start_command'] <> "")
-			    exec($pkg['start_command'] . ">/dev/null 2&>1");
+			if ($pkg['start_command'] <> "") {
+				exec($pkg['start_command'] . ">/dev/null 2&>1");
+			}
 
 			/* if restart_command is defined, restart w/ this */
-			if($pkg['restart_command'] <> "")
-			    exec($pkg['restart_command'] . ">/dev/null 2&>1");
-
-			if($pkg['aftersaveredirect'] <> "") {
-			    pfSenseHeader($pkg['aftersaveredirect']);
-			} elseif(!$pkg['adddeleteeditpagefields']) {
-			    pfSenseHeader("pkg_edit.php?xml={$xml}&amp;id=0");
-			} elseif(!$pkg['preoutput']) {
-			    pfSenseHeader("pkg.php?xml=" . $xml);
+			if ($pkg['restart_command'] <> "") {
+				exec($pkg['restart_command'] . ">/dev/null 2&>1");
+			}
+
+			if ($pkg['aftersaveredirect'] <> "") {
+				pfSenseHeader($pkg['aftersaveredirect']);
+			} elseif (!$pkg['adddeleteeditpagefields']) {
+				pfSenseHeader("pkg_edit.php?xml={$xml}&amp;id=0");
+			} elseif (!$pkg['preoutput']) {
+				pfSenseHeader("pkg.php?xml=" . $xml);
 			}
 			exit;
 		} else {
@@ -254,12 +282,12 @@ if ($_POST) {
 	}
 }
 
-if($pkg['title'] <> "") {
+if ($pkg['title'] <> "") {
 	$edit = ($only_edit ? '' : ": " .  gettext("Edit"));
 	$title = $pkg['title'] . $edit;
-}
-else
+} else {
 	$title = gettext("Package Editor");
+}
 
 $pgtitle = $title;
 
@@ -268,9 +296,9 @@ if ($pkg['custom_php_after_head_command']) {
 	include("head.inc");
 	eval($pkg['custom_php_after_head_command']);
 	echo "</head>\n";
-}
-else
+} else {
 	include("head.inc");
+}
 
 ?>
 
@@ -281,35 +309,35 @@ else
 <script type="text/javascript" src="/javascript/autosuggest.js?rev=1"></script>
 <script type="text/javascript" src="/javascript/suggestions.js"></script>
 
-<?php if($pkg['fields']['field'] <> "") { ?>
+<?php if ($pkg['fields']['field'] <> "") { ?>
 <script type="text/javascript">
 //<![CDATA[
 	//Everything inside it will load as soon as the DOM is loaded and before the page contents are loaded
 	jQuery(document).ready(function() {
-		
+
 		//Sortable function
 		jQuery('#mainarea table tbody').sortable({
 			items: 'tr.sortable',
 			cursor: 'move',
 			distance: 10,
 			opacity: 0.8,
-			helper: function(e,ui){  
-				ui.children().each(function(){  
-					jQuery(this).width(jQuery(this).width());  
+			helper: function(e,ui) {
+				ui.children().each(function() {
+					jQuery(this).width(jQuery(this).width());
 				});
-			return ui;  
+			return ui;
 			},
 		});
-		
+
 		//delete current line jQuery function
 		jQuery('#maintable td .delete').live('click', function() {
 			//do not remove first line
-			if (jQuery("#maintable tr").length > 2){
+			if (jQuery("#maintable tr").length > 2) {
 				jQuery(this).parent().parent().remove();
 				return false;
 			}
-	    });
-	    
+		});
+
 		//add new line jQuery function
 		jQuery('#mainarea table .add').click(function() {
 			//get table size and assign as new id
@@ -318,7 +346,7 @@ else
 			//apply new id to created line rowhelperid
 			jQuery("table#maintable tr:last").after("<tr>"+new_row+"<\/tr>");
 			return false;
-	    });
+		});
 		// Call enablechange function
 		enablechange();
 	});
@@ -356,7 +384,7 @@ else
 			}
 
 			if (isset($field['checkenablefields'])) {
-				foreach(explode(',', $field['checkenablefields']) as $checkenablefield) {
+				foreach (explode(',', $field['checkenablefields']) as $checkenablefield) {
 					echo "\t\tif (jQuery('form[name=\"iform\"] input[name=\"{$checkenablefield}\"]').length > 0) {\n";
 					echo "\t\t\tjQuery('form[name=\"iform\"] input[name=\"{$checkenablefield}\"]').prop('checked',false);\n";
 					echo "\t\t}\n";
@@ -367,7 +395,7 @@ else
 		}
 	}
 	?>
-}
+	}
 //]]>
 </script>
 <?php } ?>
@@ -385,23 +413,29 @@ else
 <?php
 if ($pkg['tabs'] <> "") {
 	$tab_array = array();
-	foreach($pkg['tabs']['tab'] as $tab) {
-		if($tab['tab_level'])
+	foreach ($pkg['tabs']['tab'] as $tab) {
+		if ($tab['tab_level']) {
 			$tab_level = $tab['tab_level'];
-		else
+		} else {
 			$tab_level = 1;
-		if(isset($tab['active'])) {
+		}
+		if (isset($tab['active'])) {
 			$active = true;
 		} else {
 			$active = false;
 		}
-		if(isset($tab['no_drop_down']))
+		if (isset($tab['no_drop_down'])) {
 			$no_drop_down = true;
+		}
 		$urltmp = "";
-		if($tab['url'] <> "") $urltmp = $tab['url'];
-		if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml'];
+		if ($tab['url'] <> "") {
+			$urltmp = $tab['url'];
+		}
+		if ($tab['xml'] <> "") {
+			$urltmp = "pkg_edit.php?xml=" . $tab['xml'];
+		}
 
- 		$addresswithport = getenv("HTTP_HOST");
+		$addresswithport = getenv("HTTP_HOST");
 		$colonpos = strpos($addresswithport, ":");
 		if ($colonpos !== False) {
 			//my url is actually just the IP address of the pfsense box
@@ -413,14 +447,14 @@ if ($pkg['tabs'] <> "") {
 		$url = str_replace('$myurl', $myurl, $urltmp);
 
 		$tab_array[$tab_level][] = array(
-						$tab['text'],
-						$active,
-						$url
-					);
-    	}
+			$tab['text'],
+			$active,
+			$url
+		);
+	}
 
 	ksort($tab_array);
-	foreach($tab_array as $tabid => $tab) {
+	foreach ($tab_array as $tabid => $tab) {
 		echo '<tr><td>';
 		display_top_tabs($tab, $no_drop_down, $tabid);
 		echo '</td></tr>';
@@ -432,10 +466,12 @@ if ($pkg['tabs'] <> "") {
 <?php
 	$cols = 0;
 	$savevalue = gettext("Save");
-	if($pkg['savetext'] <> "") $savevalue = $pkg['savetext'];
-	/* If a package's XML has <advanced_options/> configured, then setup 
+	if ($pkg['savetext'] <> "") { {
+		$savevalue = $pkg['savetext'];
+	}
+	/* If a package's XML has <advanced_options/> configured, then setup
 	 * the table rows for the fields that have <advancedfield/> set.
-	 * These fields will be placed below other fields in a seprate area titled 'Advanced Features'.
+	 * These fields will be placed below other fields in a separate area titled 'Advanced Features'.
 	 * These advanced fields are not normally configured and generally left to default to 'default settings'.
 	 */
 
@@ -443,124 +479,132 @@ if ($pkg['tabs'] <> "") {
 		$adv_filed_count = 0;
 		$advanced = "<td>&nbsp;</td>";
 		$advanced .= "<tr><td colspan=\"2\" class=\"listtopic\">". gettext("Advanced features") . "<br /></td></tr>\n";
-		}		
+	}
 	foreach ($pkg['fields']['field'] as $pkga) {
-		if ($pkga['type'] == "sorting") 
+		if ($pkga['type'] == "sorting") {
 			continue;
+		}
 
 		if ($pkga['type'] == "listtopic") {
 			$input = "<tr id='td_{$pkga['fieldname']}'><td>&nbsp;</td></tr>";
 			$input .= "<tr id='tr_{$pkga['fieldname']}'><td colspan=\"2\" class=\"listtopic\">{$pkga['name']}<br /></td></tr>\n";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
 				$adv_filed_count++;
-				}
-			else
+			} else {
 				echo $input;
+			}
 			continue;
 		}
 
-		if($pkga['combinefields']=="begin"){
+		if ($pkga['combinefields']=="begin") {
 			$input="<tr valign='top' id='tr_{$pkga['fieldname']}'>";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
-			else
-			  	echo $input;
+			} else {
+				echo $input;
 			}
+		}
 
 		$size = "";
-		if (isset($pkga['dontdisplayname'])){
+		if (isset($pkga['dontdisplayname'])) {
 			$input="";
-			if(!isset($pkga['combinefields']))
+			if (!isset($pkga['combinefields'])) {
 				$input .= "<tr valign='top' id='tr_{$pkga['fieldname']}'>";
-			if(isset($pkga['usecolspan2']))
+			}
+			if (isset($pkga['usecolspan2'])) {
 				$colspan="colspan='2'";
-			else
+			} else {
 				$input .= "<td width='22%' class='vncell{$req}'>&nbsp;</td>";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+			}
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
 				$adv_filed_count++;
-				}
-			else
+			} else {
 				echo $input;
 			}
-		else if (!isset($pkga['placeonbottom'])){
+		} else if (!isset($pkga['placeonbottom'])) {
 			unset($req);
-			if (isset($pkga['required']))
+			if (isset($pkga['required'])) {
 				$req = 'req';
+			}
 			$input= "<tr><td valign='top' width=\"22%\" class=\"vncell{$req}\">";
 			$input .= fixup_string($pkga['fielddescr']);
 			$input .= "</td>";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
 				$adv_filed_count++;
-				}
-			else 
+			} else {
 				echo $input;
+			}
 		}
-		if($pkga['combinefields']=="begin"){
+		if ($pkga['combinefields']=="begin") {
 			$input="<td class=\"vncell\"><table summary=\"advanced\">";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
-			else
-			  	echo $input;
+			} else {
+				echo $input;
 			}
+		}
 
 		$class=(isset($pkga['combinefields']) ? '' : 'class="vtable"');
-		if (!isset($pkga['placeonbottom'])){
+		if (!isset($pkga['placeonbottom'])) {
 			$input="<td valign='top' {$colspan} {$class}>";
-			if(isset($pkga['advancedfield']) && isset($adv_filed_count)){
+			if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 				$advanced .= $input;
 				$adv_filed_count++;
-				}
-			else
+			} else {
 				echo $input;
+			}
 		}
 
 		// if user is editing a record, load in the data.
 		$fieldname = $pkga['fieldname'];
 		if ($get_from_post) {
 			$value = $_POST[$fieldname];
-			if (is_array($value)) $value = implode(',', $value);
+			if (is_array($value)) {
+				$value = implode(',', $value);
+			}
 		} else {
-			if (isset($id) && $a_pkg[$id])
+			if (isset($id) && $a_pkg[$id]) {
 				$value = $a_pkg[$id][$fieldname];
-			else
+			} else {
 				$value = $pkga['default_value'];
+			}
 		}
-		switch($pkga['type']){
+		switch ($pkga['type']) {
 			case "input":
 				$size = ($pkga['size'] ? " size='{$pkga['size']}' " : "");
 				$input = "<input {$size} id='{$pkga['fieldname']}' name='{$pkga['fieldname']}' class='formfld unknown' value=\"" . htmlspecialchars($value) ."\" />\n";
 				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input ."</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "password":
 				$size = ($pkga['size'] ? " size='{$pkga['size']}' " : "");
 				$input = "<input " . $size . " id='" . $pkga['fieldname'] . "' type='password' name='" . $pkga['fieldname'] . "' class='formfld pwd' value=\"" . htmlspecialchars($value) . "\" />\n";
 				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input ."</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "info":
 				$input = fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input ."</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "select":
@@ -579,15 +623,15 @@ if ($pkg['tabs'] <> "") {
 				foreach ($pkga['options']['option'] as $opt) {
 					$selected = (in_array($opt['value'], $items) ? 'selected="selected"' : '');
 					$input .= "\t<option value=\"{$opt['value']}\" {$selected}>{$opt['name']}</option>\n";
-					}
+				}
 				$input .= "</select>\n<br />\n" . fixup_string($pkga['description']) . "\n";
-                if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
 					$advanced .= "</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "select_source":
@@ -604,7 +648,7 @@ if ($pkg['tabs'] <> "") {
 				$onchange = (isset($pkga['onchange']) ? "onchange=\"{$pkga['onchange']}\"" : '');
 				$input = "<select id='{$pkga['fieldname']}' {$multiple} {$size} {$onchange} name=\"{$fieldname}\">\n";
 
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']) .$input;
 					$advanced .= "</div>\n";
@@ -615,74 +659,79 @@ if ($pkg['tabs'] <> "") {
 				eval("\$pkg_source_txt = &$source_url;");
 				$input="";
 				#check if show disable option is present on xml
-				if(isset($pkga['show_disable_value'])){
-					array_push($pkg_source_txt, array(($pkga['source_name']? $pkga['source_name'] : $pkga['name'])=> $pkga['show_disable_value'],
-													  ($pkga['source_value']? $pkga['source_value'] : $pkga['value'])=> $pkga['show_disable_value']));
-					}
+				if (isset($pkga['show_disable_value'])) {
+					array_push($pkg_source_txt,
+						array(($pkga['source_name']? $pkga['source_name'] : $pkga['name'])=> $pkga['show_disable_value'], ($pkga['source_value']? $pkga['source_value'] : $pkga['value'])=> $pkga['show_disable_value']));
+				}
 				foreach ($pkg_source_txt as $opt) {
 					$source_name =($pkga['source_name']? $opt[$pkga['source_name']] : $opt[$pkga['name']]);
 					$source_value =($pkga['source_value'] ? $opt[$pkga['source_value']] : $opt[$pkga['value']]);
-					$selected = (in_array($source_value, $items)? 'selected="selected"' : '' );
+					$selected = (in_array($source_value, $items)? 'selected="selected"' : '');
 					$input  .= "\t<option value=\"{$source_value}\" $selected>{$source_name}</option>\n";
-					}
+				}
 				$input .= "</select>\n<br />\n" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$advanced .= $input;
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "vpn_selection" :
 				$input = "<select id='{$pkga['fieldname']}' name='{$vpn['name']}'>\n";
 				foreach ($config['ipsec']['phase1'] as $vpn) {
 					$input .= "\t<option value=\"{$vpn['descr']}\">{$vpn['descr']}</option>\n";
-					}
+				}
 				$input .= "</select>\n";
 				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
 					$advanced .= "</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "checkbox":
 				$checkboxchecked =($value == "on" ? " checked=\"checked\"" : "");
 				$onchange = (isset($pkga['onchange']) ? "onchange=\"{$pkga['onchange']}\"" : '');
-				if (isset($pkga['enablefields']) || isset($pkga['checkenablefields']))
+				if (isset($pkga['enablefields']) || isset($pkga['checkenablefields'])) {
 					$onclick = ' onclick="javascript:enablechange();"';
+				}
 				$input = "<input id='{$pkga['fieldname']}' type='checkbox' name='{$pkga['fieldname']}' {$checkboxchecked} {$onclick} {$onchange} />\n";
 				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
 
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
 					$advanced .= "</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "textarea":
-				if($pkga['rows'])
+				if ($pkga['rows']) {
 					$rows = " rows='{$pkga['rows']}' ";
-				if($pkga['cols'])
+				}
+				if ($pkga['cols']) {
 					$cols = " cols='{$pkga['cols']}' ";
-				if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value))
+				}
+				if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value)) {
 					$value = base64_decode($value);
-				$wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : '');		  
+				}
+				$wrap =($pkga['wrap'] == "off" ? 'wrap="off" style="white-space:nowrap;"' : '');
 				$input = "<textarea {$rows} {$cols} name='{$pkga['fieldname']}'{$wrap}>{$value}</textarea>\n";
 				$input .= "<br />" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
 					$advanced .= "</div>\n";
-					}
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "aliases":
@@ -694,17 +743,22 @@ if ($pkg['tabs'] <> "") {
 				$aliasesaddr = "";
 				$value = "value='{$value}'";
 
-				if(isset($a_aliases)) {
-					if(!empty($pkga['typealiases'])) {
-						foreach($a_aliases as $alias)
-							if($alias['type'] == $pkga['typealiases']) {
-								if($addrisfirst == 1) $aliasesaddr .= ",";
+				if (isset($a_aliases)) {
+					if (!empty($pkga['typealiases'])) {
+						foreach ($a_aliases as $alias) {
+							if ($alias['type'] == $pkga['typealiases']) {
+								if ($addrisfirst == 1)  {
+									$aliasesaddr .= ",";
+								}
 								$aliasesaddr .= "'" . $alias['name'] . "'";
 								$addrisfirst = 1;
 							}
+						}
 					} else {
-						foreach($a_aliases as $alias) {
-							if($addrisfirst == 1) $aliasesaddr .= ",";
+						foreach ($a_aliases as $alias) {
+							if ($addrisfirst == 1) {
+								$aliasesaddr .= ",";
+							}
 							$aliasesaddr .= "'" . $alias['name'] . "'";
 							$addrisfirst = 1;
 						}
@@ -723,50 +777,55 @@ if ($pkg['tabs'] <> "") {
 
 				echo $input;
 				echo $script;
-                                break;
+				break;
 
 			case "interfaces_selection":
 				$ips=array();
 				$interface_regex=(isset($pkga['hideinterfaceregex']) ? $pkga['hideinterfaceregex'] : "nointerfacestohide");
-				if (is_array($config['interfaces']))
-					foreach ($config['interfaces'] as $iface_key=>$iface_value){
-						if (isset($iface_value['enable']) && ! preg_match("/$interface_regex/",$iface_key)){
+				if (is_array($config['interfaces'])) {
+					foreach ($config['interfaces'] as $iface_key=>$iface_value) {
+						if (isset($iface_value['enable']) && !preg_match("/$interface_regex/",$iface_key)) {
 							$iface_description=($iface_value['descr'] !="" ? strtoupper($iface_value['descr']) : strtoupper($iface_key));
-							if (isset($pkga['showips']))
+							if (isset($pkga['showips'])) {
 								$iface_description .= " address";
-							$ips[]=array('ip'=> $iface_key, 'description'=> $iface_description);
 							}
+							$ips[]=array('ip'=> $iface_key, 'description'=> $iface_description);
+						}
 					}
-				if (is_array($config['virtualip']) && isset($pkga['showvirtualips']))
-					foreach ($config['virtualip']['vip'] as $vip){
-						if (! preg_match("/$interface_regex/",$vip['interface']))
-						$vip_description=($vip['descr'] !="" ? " ({$vip['descr']}) " : " ");
-						  switch ($vip['mode']){
+				}
+				if (is_array($config['virtualip']) && isset($pkga['showvirtualips'])) {
+					foreach ($config['virtualip']['vip'] as $vip) {
+						if (!preg_match("/$interface_regex/",$vip['interface'])) {
+							$vip_description=($vip['descr'] !="" ? " ({$vip['descr']}) " : " ");
+						}
+						switch ($vip['mode']) {
 							case "ipalias":
 							case "carp":
-									$ips[]=array(   'ip'=> $vip['subnet'],'description' => "{$vip['subnet']} $vip_description");
+								$ips[]=array('ip'=> $vip['subnet'],'description' => "{$vip['subnet']} $vip_description");
 								break;
 							case "proxyarp":
-								if ($vip['type']=="network"){
+								if ($vip['type']=="network") {
 									$start = ip2long32(gen_subnet($vip['subnet'], $vip['subnet_bits']));
 									$end = ip2long32(gen_subnet_max($vip['subnet'], $vip['subnet_bits']));
 									$len = $end - $start;
-									for ($i = 0; $i <= $len; $i++)
+									for ($i = 0; $i <= $len; $i++) {
 										$ips[]= array('ip'=>long2ip32($start+$i),'description'=> long2ip32($start+$i)." from {$vip['subnet']}/{$vip['subnet_bits']} {$vip_description}");
 									}
-								else{
+								} else {
 									$ips[]= array('ip'=>$vip['subnet'],'description'=> "{$vip['subnet']} $vip_description");
-									}
+								}
 								break;
-							}
+						}
 					}
+				}
 				sort($ips);
-				if (isset($pkga['showlistenall']))
+				if (isset($pkga['showlistenall'])) {
 					array_unshift($ips,array('ip'=> 'All', 'description'=> 'Listen on All interfaces/ip addresses '));
-				if (! preg_match("/$interface_regex/","loopback")){
+				}
+				if (!preg_match("/$interface_regex/","loopback")) {
 					$iface_description=(isset($pkga['showips']) ? "127.0.0.1 (loopback)" : "loopback");
 					array_push($ips,array('ip'=> 'lo0', 'description'=> $iface_description));
-					}
+				}
 
 				#show interfaces array on gui
 				$size = ($pkga['size'] ? "size=\"{$pkga['size']}\"" : '');
@@ -775,65 +834,72 @@ if ($pkg['tabs'] <> "") {
 				if (isset($pkga['multiple'])) {
 					$fieldname .= '[]';
 					$multiple = 'multiple="multiple"';
-					}
+				}
 				$input = "<select id='{$pkga['fieldname']}' name=\"{$fieldname}\" {$size} {$multiple}>\n";
-				if(is_array($value))
+				if (is_array($value)) {
 					$values = $value;
-				else
+				} else {
 					$values  =  explode(',',  $value);
-				foreach($ips as $iface){
+				}
+				foreach ($ips as $iface) {
 					$selected = (in_array($iface['ip'], $values) ? 'selected="selected"' : '');
 					$input .= "<option value=\"{$iface['ip']}\" {$selected}>{$iface['description']}</option>\n";
-					}
+				}
 				$input .= "</select>\n<br />" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$advanced .= $input;
-				else
+				} else {
 					echo $input;
+				}
 				break;
 
 			case "radio":
 				$input = "<input type='radio' id='{$pkga['fieldname']}' name='{$pkga['fieldname']}' value='{$value}' />";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$advanced .= $input;
-				else
+				} else {
 					echo $input;
-					break;
+				}
+				break;
 
 			case "button":
 				$input = "<input type='submit' id='{$pkga['fieldname']}' name='{$pkga['fieldname']}' class='formbtn' value='{$pkga['fieldname']}' />\n";
-				if(isset($pkga['placeonbottom']))
+				if (isset($pkga['placeonbottom'])) {
 					$pkg_buttons .= $input;
-				else
+				} else {
 					echo $input ."\n<br />" . fixup_string($pkga['description']) . "\n";
+				}
 				break;
 
 			case "schedule_selection":
 				$input = "<select id='{$pkga['fieldname']}' name='{$pkga['fieldname']}'>\n";
 				$schedules = array();
 				$schedules[] = "none";
-				if(is_array($config['schedules']['schedule'])) {
+				if (is_array($config['schedules']['schedule'])) {
 					foreach ($config['schedules']['schedule'] as $schedule) {
-						if ($schedule['name'] <> "")
+						if ($schedule['name'] <> "") {
 							$schedules[] = $schedule['name'];
+						}
 					}
 				}
-				foreach($schedules as $schedule) {
+				foreach ($schedules as $schedule) {
 					$selected = ($value == $schedule ? "selected=\"selected\"" : "");
-					if($schedule == "none")
+					if ($schedule == "none") {
 						$input .= "<option value=\"\" {$selected}>{$schedule}</option>\n";
-					else
+					} else {
 						$input .= "<option value=\"{$schedule}\" {$selected}>{$schedule}</option>\n";
+					}
 				}
 				$input .= "</select>\n<br />\n" . fixup_string($pkga['description']) . "\n";
-				if(isset($pkga['advancedfield']) && isset($adv_filed_count)) {
+				if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 					$js_array[] = $pkga['fieldname'];
 					$advanced .= display_advanced_field($pkga['fieldname']).$input;
 					$advanced .= "</div>\n";
-				} else
+				} else {
 					echo $input;
+				}
 				break;
-				
+
 			case "rowhelper":
 				#$rowhelpername=($fields['fieldname'] ? $fields['fieldname'] : "row");
 				$rowhelpername="row";
@@ -843,7 +909,7 @@ if ($pkg['tabs'] <> "") {
 				<?php
 					$rowcounter = 0;
 					$fieldcounter = 0;
-					foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
+					foreach ($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
 						echo "rowname[{$fieldcounter}] = \"{$rowhelper['fieldname']}\";\n";
 						echo "rowtype[{$fieldcounter}] = \"{$rowhelper['type']}\";\n";
 						echo "rowsize[{$fieldcounter}] = \"{$rowhelper['size']}\";\n";
@@ -855,24 +921,27 @@ if ($pkg['tabs'] <> "") {
 				<table id="maintable" summary="main table">
 				<tr id='<?="tr_{$pkga['fieldname']}";?>'>
 				<?php
-					foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
-					  echo "<td ".domTT_title($rowhelper['description'])."><b>" . fixup_string($rowhelper['fielddescr']) . "</b></td>\n";
+					foreach ($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
+						echo "<td ".domTT_title($rowhelper['description'])."><b>" . fixup_string($rowhelper['fielddescr']) . "</b></td>\n";
 					}
 
 					$rowcounter = 0;
 					$trc = 0;
 
 					//Use assigned $a_pkg or create an empty array to enter loop
-					if(isset($a_pkg[$id][$rowhelpername]))
+					if (isset($a_pkg[$id][$rowhelpername])) {
 						$saved_rows=$a_pkg[$id][$rowhelpername];
-					else
+					} else {
 						$saved_rows[]=array();
+					}
 
-					foreach($saved_rows as $row) {
+					foreach ($saved_rows as $row) {
 						echo "</tr>\n<tr class=\"sortable\" id=\"id_{$rowcounter}\">\n";
-						foreach($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
+						foreach ($pkga['rowhelper']['rowhelperfield'] as $rowhelper) {
 							unset($value);
-							if($rowhelper['value'] <> "") $value = $rowhelper['value'];
+							if ($rowhelper['value'] <> "") {
+								$value = $rowhelper['value'];
+							}
 							$fieldname = $rowhelper['fieldname'];
 							// if user is editing a record, load in the data.
 							if (isset($id) && $a_pkg[$id]) {
@@ -882,33 +951,35 @@ if ($pkg['tabs'] <> "") {
 							$type = $rowhelper['type'];
 							$description = $rowhelper['description'];
 							$fieldname = $rowhelper['fieldname'];
-							if($type == "option")
+							if ($type == "option") {
 								$options = &$rowhelper['options']['option'];
-							if($rowhelper['size']) 
+							}
+							if ($rowhelper['size']) {
 								$size = $rowhelper['size'];
-							else if ($pkga['size'])
+							} else if ($pkga['size']) {
 								$size = $pkga['size'];
-							else
+							} else {
 								$size = "8";
+							}
 							display_row($rowcounter, $value, $fieldname, $type, $rowhelper, $size);
 
 							$text = "";
 							$trc++;
-							}
+						}
 						$rowcounter++;
 						echo "<td>";
 						#echo "<a onclick=\"removeRow(this); return false;\" href=\"#\"><img border=\"0\" src=\"./themes/".$g['theme']."/images/icons/icon_x.gif\" alt=\"remove\" /></a>";
 						echo "<a class='delete' href=\"#\"><img border='0' src='./themes/{$g['theme']}/images/icons/icon_x.gif' alt='delete' /></a>";
 						echo "</td>\n";
-						}
+					}
 				?>
 				</tr>
 				<tbody></tbody>
 				</table>
-	
+
 				<!-- <br /><a onclick="javascript:addRowTo('maintable'); return false;" href="#"><img border="0" src="./themes/<?#= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>-->
 				<br /><a class="add" href="#"><img border="0" src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="add" /></a>
-				<br /><?php if($pkga['description'] != "") echo $pkga['description']; ?>
+				<br /><?php if ($pkga['description'] != "") echo $pkga['description']; ?>
 				<script type="text/javascript">
 				//<![CDATA[
 				field_counter_js = <?= $fieldcounter ?>;
@@ -918,58 +989,62 @@ if ($pkg['tabs'] <> "") {
 				//typesel_change();
 				//]]>
 				</script>
-		
+
 				<?php
 				break;
-		    }
+		}
 		#check typehint value
-	   	if($pkga['typehint'])
-	   		echo " " . $pkga['typehint'];
-	   	#check combinefields options
-     	if (isset($pkga['combinefields'])){
-     		$input="</td>";
-			if ($pkga['combinefields']=="end")
-           		$input.="</table></td></tr>";
-      		}
-     	else{
+		if ($pkga['typehint']) {
+			echo " " . $pkga['typehint'];
+		}
+		#check combinefields options
+		if (isset($pkga['combinefields'])) {
+			$input="</td>";
+			if ($pkga['combinefields']=="end") {
+				$input.="</table></td></tr>";
+			}
+		} else {
 			$input= "</td></tr>";
-			if($pkga['usecolspan2'])
+			if ($pkga['usecolspan2']) {
 				$input.= "</tr><br />";
-	     	}
-   	 	if(isset($pkga['advancedfield']) && isset($adv_filed_count))
+			}
+		}
+		if (isset($pkga['advancedfield']) && isset($adv_filed_count)) {
 			$advanced .= "{$input}\n";
-		else
+		} else {
 			echo "{$input}\n";
+		}
 		#increment counter
 		$i++;
-  		}
+	}
 
-  	#print advanced settings if any after reading all fields
-	if (isset($advanced) && $adv_filed_count > 0)
+	#print advanced settings if any after reading all fields
+	if (isset($advanced) && $adv_filed_count > 0) {
 		echo $advanced;
-  
+	}
+
 	?>
-  <tr>
-	<td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="22%" valign="top">&nbsp;</td>
-    <td width="78%">
-    <div id="buttons">
-		<?php
-		if($pkg['note'] != ""){
-			echo "<p><span class=\"red\"><strong>" . gettext("Note") . ":</strong></span> {$pkg['note']}</p>";
-			}
-		//if (isset($id) && $a_pkg[$id]) // We'll always have a valid ID in our hands
-		echo "<input name='id' type='hidden' value=\"" . htmlspecialchars($id) . "\" />";
-		echo "<input name='Submit' type='submit' class='formbtn' value=\"" . htmlspecialchars($savevalue) . "\" />\n{$pkg_buttons}\n";
-		if (!$only_edit){
-			echo "<input class=\"formbtn\" type=\"button\" value=\"".gettext("Cancel")."\" onclick=\"window.location.href='" . $_SERVER['HTTP_REFERER'] . "'\" />";
-			}
-		?>
-	</div>
-    </td>
-  </tr>
+	<tr>
+		<td>&nbsp;</td>
+	</tr>
+	<tr>
+		<td width="22%" valign="top">&nbsp;</td>
+		<td width="78%">
+			<div id="buttons">
+			<?php
+				if ($pkg['note'] != "") {
+					echo "<p><span class=\"red\"><strong>" . gettext("Note") . ":</strong></span> {$pkg['note']}</p>";
+				}
+				//if (isset($id) && $a_pkg[$id]) // We'll always have a valid ID in our hands
+				echo "<input name='id' type='hidden' value=\"" . htmlspecialchars($id) . "\" />";
+				echo "<input name='Submit' type='submit' class='formbtn' value=\"" . htmlspecialchars($savevalue) . "\" />\n{$pkg_buttons}\n";
+				if (!$only_edit) {
+					echo "<input class=\"formbtn\" type=\"button\" value=\"".gettext("Cancel")."\" onclick=\"window.location.href='" . $_SERVER['HTTP_REFERER'] . "'\" />";
+				}
+			?>
+			</div>
+		</td>
+	</tr>
 
 </table>
 </div></td></tr>
@@ -983,7 +1058,7 @@ if ($pkg['tabs'] <> "") {
 	if ($pkg['advanced_options'] == "enabled") {
 		echo "<script type=\"text/javascript\">\n";
 		echo "//<![CDATA[\n";
-		foreach($js_array as $advfieldname) {
+		foreach ($js_array as $advfieldname) {
 			echo "function show_" . $advfieldname . "() {\n";
 			echo "\tjQuery('#showadv_{$advfieldname}').empty();\n";
 			echo "\tjQuery('#show_{$advfieldname}').css('display', 'block');\n";
@@ -1005,7 +1080,7 @@ if ($pkg['tabs'] <> "") {
 function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) {
 	global $text, $config;
 	echo "<td>\n";
-	switch($type){
+	switch ($type) {
 		case "input":
 			echo "<input size='{$size}' name='{$fieldname}{$trc}' id='{$fieldname}{$trc}' class='formfld unknown' value=\"" . htmlspecialchars($value) . "\" />\n";
 			break;
@@ -1019,10 +1094,10 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) {
 			echo "<textarea rows='2' cols='12' id='{$fieldname}{$trc}' class='formfld unknown' name='{$fieldname}{$trc}'>{$value}</textarea>\n";
 		case "select":
 			echo "<select style='height:22px;'  id='{$fieldname}{$trc}' name='{$fieldname}{$trc}' {$title}>\n";
-			foreach($rowhelper['options']['option'] as $rowopt) {
+			foreach ($rowhelper['options']['option'] as $rowopt) {
 				$text .= "<option value='{$rowopt['value']}'>{$rowopt['name']}</option>";
 				echo "<option value='{$rowopt['value']}'".($rowopt['value'] == $value?" selected=\"selected\"":"").">{$rowopt['name']}</option>\n";
-				}
+			}
 			echo "</select>\n";
 			break;
 		case "interfaces_selection":
@@ -1035,35 +1110,38 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) {
 			echo "<select style='height:22px;' id='{$fieldname}{$trc}' name='{$fieldname}{$trc}' {$size} {$multiple}>\n";
 			$ifaces = get_configured_interface_with_descr();
 			$additional_ifaces = $rowhelper['add_to_interfaces_selection'];
-			if (!empty($additional_ifaces))
+			if (!empty($additional_ifaces)) {
 				$ifaces = array_merge($ifaces, explode(',', $additional_ifaces));
-			if(is_array($value))
+			}
+			if (is_array($value)) {
 				$values = $value;
-			else
+			} else {
 				$values  =  explode(',',  $value);
+			}
 			$ifaces["lo0"] = "loopback";
 			echo "<option><name></name><value></value></option>/n";
-			foreach($ifaces as $ifname => $iface) {
+			foreach ($ifaces as $ifname => $iface) {
 				$text .="<option value=\"{$ifname}\">$iface</option>";
 				echo "<option value=\"{$ifname}\" ".(in_array($ifname, $values) ? 'selected="selected"' : '').">{$iface}</option>\n";
-				}
+			}
 			echo "</select>\n";
 			break;
 		case "select_source":
 			echo "<select style='height:22px;' id='{$fieldname}{$trc}' name='{$fieldname}{$trc}'>\n";
-			if(isset($rowhelper['show_disable_value']))
+			if (isset($rowhelper['show_disable_value'])) {
 				echo "<option value='{$rowhelper['show_disable_value']}'>{$rowhelper['show_disable_value']}</option>\n";
+			}
 			$source_url = $rowhelper['source'];
 			eval("\$pkg_source_txt = &$source_url;");
-			foreach($pkg_source_txt as $opt) {
+			foreach ($pkg_source_txt as $opt) {
 				$source_name = ($rowhelper['source_name'] ? $opt[$rowhelper['source_name']] : $opt[$rowhelper['name']]);
 				$source_value = ($rowhelper['source_value'] ? $opt[$rowhelper['source_value']] : $opt[$rowhelper['value']]);
 				$text .= "<option value='{$source_value}'>{$source_name}</option>";
 				echo "<option value='{$source_value}'".($source_value == $value?" selected=\"selected\"":"").">{$source_name}</option>\n";
-				}
+			}
 			echo "</select>\n";
-			break;		
-		}
+			break;
+	}
 	echo "</td>\n";
 }
 
@@ -1072,12 +1150,15 @@ function fixup_string($string) {
 	// fixup #1: $myurl -> http[s]://ip_address:port/
 	$https = "";
 	$port = $config['system']['webguiport'];
-	if($port <> "443" and $port <> "80")
+	if ($port <> "443" and $port <> "80") {
 		$urlport = ":" . $port;
-	else
+	} else {
 		$urlport = "";
+	}
 
-	if($config['system']['webgui']['protocol'] == "https") $https = "s";
+	if ($config['system']['webgui']['protocol'] == "https") {
+		$https = "s";
+	}
 	$myurl = "http" . $https . "://" . getenv("HTTP_HOST") . $urlport;
 	$newstring = str_replace("\$myurl", $myurl, $string);
 	$string = $newstring;
@@ -1100,52 +1181,56 @@ function fixup_string($string) {
 function parse_package_templates() {
 	global $pkg, $config;
 	$rows = 0;
-	if($pkg['templates']['template'] <> "")
-	    foreach($pkg['templates']['template'] as $pkg_template_row) {
+	if ($pkg['templates']['template'] <> "") {
+		foreach ($pkg['templates']['template'] as $pkg_template_row) {
 			$filename = $pkg_template_row['filename'];
 			$template_text = $pkg_template_row['templatecontents'];
 			$firstfield = "";
 			/* calculate total row helpers count and */
 			/* change fields defined as fieldname_fieldvalue to their value */
 			foreach ($pkg['fields']['field'] as $fields) {
-				switch($fields['type']){
+				switch ($fields['type']) {
 					case "rowhelper":
-					// save rowhelper items.
-					$row_helper_total_rows = 0;
-					$row_helper_data = "";
-					foreach($fields['rowhelper']['rowhelperfield'] as $rowhelperfield)
-						foreach($_POST as $key => $value){
-							if (preg_match("/^{$rowhelperfield['fieldname']}(\d+)$/",$key,$matches)){
-								$row_helper_total_rows++;
-								$row_helper_data .= $value;
-								$sep = "";
-								ereg($rowhelperfield['fieldname'] . "_fieldvalue\[(.*)\]", $template_text, $sep);
-								foreach ($sep as $se) $separator = $se;
-								if($separator <> "") {
-							    	$row_helper_data = ereg_replace("  ", $separator, $row_helper_data);
-							    	$template_text = ereg_replace("\[{$separator}\]", "", $template_text);
+						// save rowhelper items.
+						$row_helper_total_rows = 0;
+						$row_helper_data = "";
+						foreach ($fields['rowhelper']['rowhelperfield'] as $rowhelperfield) {
+							foreach ($_POST as $key => $value) {
+								if (preg_match("/^{$rowhelperfield['fieldname']}(\d+)$/",$key,$matches)) {
+									$row_helper_total_rows++;
+									$row_helper_data .= $value;
+									$sep = "";
+									ereg($rowhelperfield['fieldname'] . "_fieldvalue\[(.*)\]", $template_text, $sep);
+									foreach ($sep as $se) {
+										$separator = $se;
+									}
+									if ($separator <> "") {
+										$row_helper_data = ereg_replace("  ", $separator, $row_helper_data);
+										$template_text = ereg_replace("\[{$separator}\]", "", $template_text);
 									}
-								$template_text = str_replace($rowhelperfield['fieldname'] . "_fieldvalue", $row_helper_data, $template_text);
+									$template_text = str_replace($rowhelperfield['fieldname'] . "_fieldvalue", $row_helper_data, $template_text);
 								}
 							}
-					break;
-				default:
-					$fieldname  = $fields['fieldname'];
-					$fieldvalue = $_POST[$fieldname];
-					$template_text = str_replace($fieldname . "_fieldvalue", $fieldvalue, $template_text);
+						}
+						break;
+					default:
+						$fieldname  = $fields['fieldname'];
+						$fieldvalue = $_POST[$fieldname];
+						$template_text = str_replace($fieldname . "_fieldvalue", $fieldvalue, $template_text);
 				}
 			}
-		/* replace $domain_total_rows with total rows */
-		$template_text = str_replace("$domain_total_rows", $row_helper_total_rows, $template_text);
+			/* replace $domain_total_rows with total rows */
+			$template_text = str_replace("$domain_total_rows", $row_helper_total_rows, $template_text);
 
-		/* replace cr's */
-		$template_text = str_replace("\\n", "\n", $template_text);
+			/* replace cr's */
+			$template_text = str_replace("\\n", "\n", $template_text);
 
-		/* write out new template file */
-		$fout = fopen($filename,"w");
-		fwrite($fout, $template_text);
-		fclose($fout);
-	    }
+			/* write out new template file */
+			$fout = fopen($filename,"w");
+			fwrite($fout, $template_text);
+			fclose($fout);
+		}
+	}
 }
 
 /* Return html div fields */