Merge remote branch 'mainline/master' into 3_interfaces

23 files changed, 174 insertions, 77 deletions

diff --git a/usr/local/www/classes/maintable.inc b/usr/local/www/classes/maintable.inc
index d3d9995..2396a0d 100644
--- a/usr/local/www/classes/maintable.inc
+++ b/usr/local/www/classes/maintable.inc
@@ -116,7 +116,7 @@ class MainTable {
 				} else {
 					$cl = 'listr';
 				}
-				echo "  <td class=\"{$cl}\" onClick=\"fr_toggle({$cur_row})\" id=\"frd{$cur_row}\" ondblclick=\"document.location=\'{$this->edit_uri}?id={$cur_row}\'\">\n";
+				echo "  <td class=\"{$cl}\" onClick=\"fr_toggle({$cur_row})\" id=\"frd{$cur_row}\" ondblclick=\"document.location='{$this->edit_uri}?id={$cur_row}'\">\n";
 				if (is_array($row[$this->cname[$col]])) {
 					foreach ($row[$this->cname[$col]] as $data) {
 						echo "    {$data}<br/>\n";
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index 75ec782..d0dd0b0 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -85,7 +85,7 @@ if ($_GET['act'] == "del") {
 						<?php if (count($sad)): ?>
 						<tr>
 							<td nowrap class="listhdrr">Source</td>
-							<td nowrap class="listhdrr">Destination</a></td>
+							<td nowrap class="listhdrr">Destination</td>
 							<td nowrap class="listhdrr">Protocol</td>
 							<td nowrap class="listhdrr">SPI</td>
 							<td nowrap class="listhdrr">Enc. alg.</td>
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 4874ac9..c775aaa 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -156,7 +156,7 @@ $status_menu[] = array("DHCP Leases", "/status_dhcp_leases.php");
 $status_menu[] = array("Filter Reload", "/status_filter_reload.php");
 $status_menu[] = array("Interfaces", "/status_interfaces.php");
 $status_menu[] = array("IPsec", "/diag_ipsec.php");
-$status_menu[] = array("Load Balancer", "/status_slbd_pool.php");
+$status_menu[] = array("Load Balancer", "/status_lb_pool.php");
 $status_menu[] = array("OpenVPN", "/status_openvpn.php");
 if ($g['platform'] == "pfSense")
 	$status_menu[] = array("Package Logs", "/diag_pkglogs.php");
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index c4f21c1..b0abc50 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -305,37 +305,35 @@ include("head.inc");
   <tr>
     <td>
 	<div id="mainarea">
-              <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">
-              <tr>
-                  <td class="vtable"><p>
-                      <input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>>
-                      <strong><?=gettext("Automatic outbound NAT rule generation (IPsec passthrough)");?></strong></p>
+              <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tr><td align="right"><b>Mode:</b></td>
+                  <td>
+                      &nbsp;&nbsp;<input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>>
+                      <strong><?=gettext("Automatic outbound NAT rule generation<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(IPsec passthrough included)");?></strong>
                   </td>
-                </tr>
-                <tr>
-                  <td class="vtable"><p>
-                      <input name="advancedoripsec" type="radio" id="advancedoutbound" value="advancedoutboundnat" <?php if (isset($config['nat']['advancedoutbound']['enable'])) echo "checked";?>>
-                      <strong><?=gettext("Manual Outbound NAT rule generation (Advanced Outbound NAT (AON))");?></strong></p></td>
-                </tr>
-                <tr>
-                  <td> <input name="save" type="submit" class="formbtn" value="Save">
+
+                  <td>
+                      &nbsp;&nbsp;<input name="advancedoripsec" type="radio" id="advancedoutbound" value="advancedoutboundnat" <?php if (isset($config['nat']['advancedoutbound']['enable'])) echo "checked";?>>
+                      <strong><?=gettext("Manual Outbound NAT rule generation<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(AON - Advanced Outbound NAT)");?></strong></td>
+                  <td valign="middle" align="left">
+					<input name="save" type="submit" class="formbtn" value="Save">
+					&nbsp;<br/>&nbsp;
                   </td>
                 </tr>
-                <tr>
-                  <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br>
-                      </strong></span>If advanced outbound NAT is enabled, no outbound NAT
-                      rules will be automatically generated any longer. Instead, only the mappings
-                      you specify below will be used. With advanced outbound NAT disabled,
-                      a mapping is automatically created for each interface's subnet
-                      (except WAN).  If you use target addresses other than the WAN interface's
-		      IP address, then depending on the way your WAN connection is setup, you
-	              may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br>
-                      <br>
-                      You may enter your own mappings below.</p>
-                    </td>
-                </tr>
+				<tr>
+					<td colspan="5">
+						&nbsp;
+					</td>
+				</tr>
+				<tr>
+					<td  class="vtable" colspan="5">
+						&nbsp;
+					</td>
+				</tr>
               </table>
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+				<tr><td colspan="5"><b>&nbsp;Mappings:</b></td></tr>
+				<tr><td>&nbsp;</td></tr>
                 <tr id="frheader">
                   <td width="3%" class="list">&nbsp;</td>
                   <td width="3%" class="list">&nbsp;</td>
@@ -455,6 +453,19 @@ include("head.inc");
                       </tr>
                     </table></td>
                 </tr>
+                <tr>
+                  <td colspan="12">
+					<p><span class="vexpl"><span class="red"><strong>Note:<br>
+                      </strong></span>If advanced outbound NAT is enabled, no outbound NAT
+                      rules will be automatically generated any longer. Instead, only the mappings
+                      you specify below will be used. With advanced outbound NAT disabled,
+                      a mapping is automatically created for each interface's subnet
+                      (except WAN).  If you use target addresses other than the WAN interface's
+		      IP address, then depending on the way your WAN connection is setup, you
+	              may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br>
+                    </td>
+                </tr>
+
               </table>
 	    </div>
 </td>
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index b9888e6..cd358da 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -98,6 +98,38 @@ if ($_POST['if'])
 
 $ifdescs = get_configured_interface_with_descr();
 
+// Drag and drop reordering
+if($_REQUEST['dragdroporder']) {
+	// First create a new ruleset array and tmp arrays
+	$a_filter_unorder = array();
+	$a_filter_order = array();
+	$a_filter_order_tmp = array();
+	// Pointer to id of item being reordered
+	$found = 0;
+	$drag_order = $_REQUEST['dragtable'];
+	// Next traverse through rules building a new order for interface
+	for ($i = 0; isset($a_filter[$i]); $i++) {
+		if($a_filter[$i]['interface'] <> $_REQUEST['if']) 
+			$a_filter_unorder[] = $a_filter[$i];
+		else 
+			$a_filter_order_tmp[] = $a_filter[$i];
+	}
+	// Reorder rules with the posted order
+	for ($i = 0; $i<count($drag_order); $i++) 
+		$a_filter_order[] = $a_filter_order_tmp[$drag_order[$i]];
+	unset($config['filter']['rule']);
+	// Overwrite filter rules with newly created items
+	$config['filter']['rule'] = $a_filter_order;
+	foreach($a_filter_unorder as $aa) 
+		$config['filter']['rule'][] = $aa;
+	// Write configuration
+	$config = write_config("Drag and drop firewall rules ordering update.");
+	// Redirect back to page
+	mark_subsystem_dirty('filter');
+	Header("Location: firewall_rules.php?if=" . $_REQUEST['if']);
+	exit;
+}
+
 /* add group interfaces */
 if (is_array($config['ifgroups']['ifgroupentry']))
 	foreach($config['ifgroups']['ifgroupentry'] as $ifgen)
@@ -163,6 +195,10 @@ if ($_GET['act'] == "del") {
 	}
 }
 
+// Handle save msg if defined
+if($_REQUEST['savemsg']) 
+	$savemsg = htmlentities($_REQUEST['savemsg']);
+
 if (isset($_POST['del_x'])) {
 	/* delete selected rules */
 	if (is_array($_POST['rule']) && count($_POST['rule'])) {
@@ -245,12 +281,17 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <form action="firewall_rules.php" method="post">
+
 <script type="text/javascript" language="javascript" src="/javascript/row_toggle.js">
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('filter')): ?><p>
 <?php print_info_box_np("The firewall rule configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <?php endif; ?>
+<div id="loading" style="visibity:hidden">
+	<img src="/themes/<?=$g['theme']?>/images/misc/loader.gif"> Loading, please wait...
+	<p/>&nbsp;
+</div>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
   <?php
@@ -368,6 +409,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 				  </td>
 				</tr>
 <?php endif; ?>
+				<tbody id="dragtable" width="100%">
 				<?php $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++):
 					$filterent = $a_filter[$i];
 					if ($filterent['interface'] != $if && !isset($filterent['floating']))
@@ -589,7 +631,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';">
                     <?=$textss;?><?php if (isset($config['interfaces'][$filterent['gateway']]['descr'])) echo htmlspecialchars($config['interfaces'][$filterent['gateway']]['descr']); else  echo htmlspecialchars(pprint_port($filterent['gateway'])); ?><?=$textse;?>
                   </td>
-<td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><?=$textss;?>
+				  <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><?=$textss;?>
                           <?php
 							if (isset($filterent['ackqueue']) && isset($filterent['defaultqueue'])) {
 								$desc = $filterent['ackqueue'] ;
@@ -622,6 +664,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 				  </td>
 				</tr>
 			  <?php $nrules++; endfor; ?>
+			  </tbody>
 			  <?php if ($nrules == 0): ?>
               <td class="listt"></td>
 			  <td class="listt"></td>
@@ -693,13 +736,21 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                 </tr>
 		<tr>
 		  <td colspan="10">
-  <p>
-  <strong><span class="red">Hint:<br>
-  </span></strong>Rules are evaluated on a first-match basis (i.e.
+  &nbsp;<p/>
+  <strong>
+	<span class="red">Hint:</span>
+  </strong><br>
+	<ul>
+  <li>Rules are evaluated on a first-match basis (i.e.
   the action of the first rule to match a packet will be executed).
   This means that if you use block rules, you'll have to pay attention
   to the rule order. Everything that isn't explicitly passed is blocked
-  by default.</p>
+  by default.
+</li>
+<li>
+  You may drag and drop rules using your mouse to reorder the rule ordering.
+</li>
+</ul>
 		 </td>
 	        </tr>
               </table>
@@ -708,6 +759,32 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
   </tr>
 </table>
   <input type="hidden" name="if" value="<?=$if;?>">
+  <script type="text/javascript">
+	var number_of_rules = <?=$nrules?>;
+<?php $nrules = 0; for ($i = 0; isset($a_filter[$i]); $i++): ?>
+	Sortable.create("dragtable", { 
+		tag:"tr", 
+		format:"fr([0-9999999])",
+		containment:["dragtable"], 
+		onChange:function(affected) {
+			document.body.style.cursor = 'move';
+		},
+		onUpdate:function(container) { 
+			document.body.style.cursor = 'move';
+			updateOrder(Sortable.serialize('dragtable', 'tr'));
+		} 
+	});
+<?php endfor; ?>
+	function updateOrder(order) {
+		if(document.getElementById("redboxtable"))
+			$('redboxtable').hide();
+		$('loading').show();
+		document.body.style.cursor = 'wait';
+		document.location = 'firewall_rules.php?if=<?=$if?>&dragdroporder=true&' + Sortable.serialize('dragtable', 'tr');
+		return;
+	}
+	$('loading').hide();
+  </script>
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 342b689..277ad26 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -168,7 +168,8 @@ if (isset($id) && $a_filter[$id]) {
 
 	//schedule support
 	$pconfig['sched'] = $a_filter[$id]['sched'];
-	$pconfig['associated-rule-id'] = $a_filter[$id]['associated-rule-id'];
+	if (!isset($_GET['dup']))
+		$pconfig['associated-rule-id'] = $a_filter[$id]['associated-rule-id'];
 
 } else {
 	/* defaults */
@@ -643,9 +644,10 @@ include("head.inc");
 							$interfaces["enc0"] = "IPsec";
 					/* add openvpn/tun interfaces */
 					if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"])
-       					$interfaces["openvpn"] = "OpenVPN";
+						$interfaces["openvpn"] = "OpenVPN";
+					$selected_interfaces = explode(",", $pconfig['interface']);
 					foreach ($interfaces as $iface => $ifacename): ?>
-						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && (strcasecmp($pconfig['interface'], $iface) == 0)) echo "selected"; ?>><?=gettext($ifacename);?></option>
+						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=gettext($ifacename);?></option>
 <?php 				endforeach; ?>
 				</select>
 				<br />
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 851fdec..44680aa 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -302,8 +302,12 @@ function print_info_box_np($msg, $name="apply",$value="Apply changes") {
 		eval($toeval);
 	}	
 		
+	if(!$savebutton) {
+		$savebutton = '<td class="infoboxsave"><input value="Close" type="button" onClick="$(\'redboxtable\').hide();"></td>';
+	}
+
 	echo <<<EOFnp
-	<table class='infobox'>
+	<table class='infobox' id='redboxtable'>
 		<tr>
 			<td>
 				<div class='infoboxnp' id='redbox'>
@@ -319,6 +323,9 @@ function print_info_box_np($msg, $name="apply",$value="Apply changes") {
 						</tr>
 					</table>
 				</div>
+				<div>
+					<p/>
+				</div>
 			</td>
 		</tr>
 	</table>
@@ -327,15 +334,12 @@ function print_info_box_np($msg, $name="apply",$value="Apply changes") {
 		Rounded("div#redbox","all","#FFF","{$nifty_redbox}","smooth");
 		Rounded("td#blackbox","all","#FFF","{$nifty_blackbox}","smooth");
 	</script>
-	<br/>
 EOFnp;
 
 }
 
 function print_info_box($msg) {
-	echo "<p>";
 	print_info_box_np($msg);
-	echo "</p>";
 }
 
 function get_std_save_message($ok) {
@@ -996,4 +1000,4 @@ function rule_popup($src,$srcport,$dst,$dstport){
   	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index f8f11ed..bb990b7 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -226,8 +226,8 @@ $helppages = array(
 	'load_balancer_relay_protocol_edit.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
 	'load_balancer_virtual_server.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
 	'load_balancer_virtual_server_edit.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
-	'status_slbd_pool.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
-	'status_slbd_vs.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
+	'status_lb_pool.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
+	'status_lb_vs.php' => 'http://doc.pfsense.org/index.php/Category:Load_balancing',
 
 
 	/* From here down are packages. Not checking these as strictly, 
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index b71ec30..7df2c3f 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -52,6 +52,7 @@ require_once("filter.inc");
 require_once("shaper.inc");
 require_once("rrd.inc");
 require_once("vpn.inc");
+require_once("xmlparse_attr.inc");
 
 if ($_REQUEST['if']) {
 	$if = $_REQUEST['if'];
diff --git a/usr/local/www/load_balancer_monitor.php b/usr/local/www/load_balancer_monitor.php
index 2f0f372..86f7530 100755
--- a/usr/local/www/load_balancer_monitor.php
+++ b/usr/local/www/load_balancer_monitor.php
@@ -86,8 +86,8 @@ if ($_GET['act'] == "del") {
 }
 
 $pgtitle = array("Services", "Load Balancer","Monitor");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php
index c3b269f..934be05 100755
--- a/usr/local/www/load_balancer_monitor_edit.php
+++ b/usr/local/www/load_balancer_monitor_edit.php
@@ -188,8 +188,8 @@ if ($_POST) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Monitor","Edit");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_pool.php b/usr/local/www/load_balancer_pool.php
index 4742ab1..bc97d85 100755
--- a/usr/local/www/load_balancer_pool.php
+++ b/usr/local/www/load_balancer_pool.php
@@ -95,8 +95,8 @@ for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Pool");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_pool_edit.php b/usr/local/www/load_balancer_pool_edit.php
index 5936d35..f34a31a 100755
--- a/usr/local/www/load_balancer_pool_edit.php
+++ b/usr/local/www/load_balancer_pool_edit.php
@@ -138,8 +138,8 @@ if ($_POST) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Pool","Edit");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_relay_action.php b/usr/local/www/load_balancer_relay_action.php
index 36b4b8f..5e73cfb 100755
--- a/usr/local/www/load_balancer_relay_action.php
+++ b/usr/local/www/load_balancer_relay_action.php
@@ -102,8 +102,8 @@ if ($_GET['act'] == "del") {
 */
 
 $pgtitle = array("Services", "Load Balancer","Relay Action");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_relay_action_edit.php b/usr/local/www/load_balancer_relay_action_edit.php
index dc47e45..d623fef 100755
--- a/usr/local/www/load_balancer_relay_action_edit.php
+++ b/usr/local/www/load_balancer_relay_action_edit.php
@@ -176,8 +176,8 @@ if ($_POST) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Relay Action","Edit");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_relay_protocol.php b/usr/local/www/load_balancer_relay_protocol.php
index f854041..d184f1d 100755
--- a/usr/local/www/load_balancer_relay_protocol.php
+++ b/usr/local/www/load_balancer_relay_protocol.php
@@ -98,8 +98,8 @@ if ($_GET['act'] == "del") {
 */
 
 $pgtitle = array("Services", "Load Balancer","Relay Protocol");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php
index 4575aeb..519dd0b 100755
--- a/usr/local/www/load_balancer_relay_protocol_edit.php
+++ b/usr/local/www/load_balancer_relay_protocol_edit.php
@@ -132,8 +132,8 @@ if ($_POST) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Relay Protocol","Edit");
-#$statusurl = "status_slbd_vs.php";
-$statusurl = "status_slbd_pool.php";
+#$statusurl = "status_lb_vs.php";
+$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_virtual_server.php b/usr/local/www/load_balancer_virtual_server.php
index 9114dc9..4e6186e 100755
--- a/usr/local/www/load_balancer_virtual_server.php
+++ b/usr/local/www/load_balancer_virtual_server.php
@@ -94,8 +94,8 @@ for ($i = 0; isset($config['load_balancer']['virtual_server'][$i]); $i++) {
 }
 
 $pgtitle = array("Services","Load Balancer","Virtual Servers");
-$statusurl = "status_slbd_vs.php";
-#$statusurl = "status_slbd_pool.php";
+$statusurl = "status_lb_vs.php";
+#$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index dda2c71..0cd91e5 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -129,8 +129,8 @@ if ($_POST) {
 }
 
 $pgtitle = array("Services", "Load Balancer","Virtual Server","Edit");
-$statusurl = "status_slbd_vs.php";
-#$statusurl = "status_slbd_pool.php";
+$statusurl = "status_lb_vs.php";
+#$statusurl = "status_lb_pool.php";
 $logurl = "diag_logs_relayd.php";
 
 include("head.inc");
@@ -193,7 +193,6 @@ document.observe("dom:loaded", function() {
                   <td width="78%" class="vtable" colspan="2">
                     <input name="ipaddr" type="text" <?if(isset($pconfig['ipaddr'])) echo "value=\"{$pconfig['ipaddr']}\"";?> size="16" maxlength="16">
 		    		<br>This is normally the WAN IP address that you would like the server to listen on.  All connections to this IP and port will be forwarded to the pool cluster.
-		    		<br><b>NOTE:</b> DO NOT USE RELAY MODE WITH PROXY ARP - IT WILL NOT WORK - TODO for 2.0 to fix.
                   </td>
 			</tr>
                 <tr align="left">
diff --git a/usr/local/www/status_slbd_pool.php b/usr/local/www/status_lb_pool.php
index 0e8eb66..18b4c57 100755
--- a/usr/local/www/status_slbd_pool.php
+++ b/usr/local/www/status_lb_pool.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 /*
-	status_slbd_pool.php
+	status_lb_pool.php
 	part of pfSense (http://www.pfsense.com/)
 
 	Copyright (C) 2006 Seth Mos <seth.mos@xs4all.nl>.
@@ -36,7 +36,7 @@
 ##|*IDENT=page-status-loadbalancer-pool
 ##|*NAME=Status: Load Balancer: Pool page
 ##|*DESCR=Allow access to the 'Status: Load Balancer: Pool' page.
-##|*MATCH=status_slbd_pool.php*
+##|*MATCH=status_lb_pool.php*
 ##|-PRIV
 
 require("guiconfig.inc");
@@ -46,7 +46,7 @@ if (!is_array($config['load_balancer']['lbpool'])) {
 }
 $a_pool = &$config['load_balancer']['lbpool'];
 
-$slbd_logfile = "{$g['varlog_path']}/slbd.log";
+$lb_logfile = "{$g['varlog_path']}/relayd.log";
 
 $nentries = $config['syslog']['nentries'];
 if (!$nentries)
@@ -67,8 +67,8 @@ include("head.inc");
   <?php
         /* active tabs */
         $tab_array = array();
-        $tab_array[] = array("Pools", true, "status_slbd_pool.php");
-        $tab_array[] = array("Virtual Servers", false, "status_slbd_vs.php");
+        $tab_array[] = array("Pools", true, "status_lb_pool.php");
+        $tab_array[] = array("Virtual Servers", false, "status_lb_vs.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
@@ -117,7 +117,7 @@ include("head.inc");
 						$lastchange = "";
                                                 $svr = split("\|", $server);
 						$monitorip = $svr[1];
-						$logstates = return_clog($slbd_logfile, $nentries, true, array("$monitorip", "marking"), "", true);
+						$logstates = return_clog($lb_logfile, $nentries, true, array("$monitorip", "marking"), "", true);
 
 						$logstates = $logstates[0];
 
diff --git a/usr/local/www/status_slbd_vs.php b/usr/local/www/status_lb_vs.php
index f421a7f..0589425 100755
--- a/usr/local/www/status_slbd_vs.php
+++ b/usr/local/www/status_lb_vs.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 /*
-	status_slbd_vs.php
+	status_lb_vs.php
 	part of pfSense (http://www.pfsense.com/)
 
 	Copyright (C) 2007 Seth Mos <seth.mos@xs4all.nl>.
@@ -37,7 +37,7 @@
 ##|*IDENT=page-status-loadbalancer-virtualserver
 ##|*NAME=Status: Load Balancer: Virtual Server page
 ##|*DESCR=Allow access to the 'Status: Load Balancer: Virtual Server' page.
-##|*MATCH=status_slbd_vs.php*
+##|*MATCH=status_lb_vs.php*
 ##|-PRIV
 
 require("guiconfig.inc");
@@ -119,8 +119,8 @@ include("head.inc");
   <?php
         /* active tabs */
         $tab_array = array();
-        $tab_array[] = array("Pools", false, "status_slbd_pool.php");
-        $tab_array[] = array("Virtual Servers", true, "status_slbd_vs.php");
+        $tab_array[] = array("Pools", false, "status_lb_pool.php");
+        $tab_array[] = array("Virtual Servers", true, "status_lb_vs.php");
         display_top_tabs($tab_array);
   ?>
   </td></tr>
diff --git a/usr/local/www/vpn_openvpn_server.php b/usr/local/www/vpn_openvpn_server.php
index e39e93a..4b9a29a 100644
--- a/usr/local/www/vpn_openvpn_server.php
+++ b/usr/local/www/vpn_openvpn_server.php
@@ -930,7 +930,7 @@ function netbios_change() {
 								<tr>
 									<td>
 										<?php set_checked($pconfig['dynamic_ip'],$chk); ?>
-										<input name="dynamic_ip" type="checkbox" id="dynamic_ip" value="yes" <?=$chk;?>">
+										<input name="dynamic_ip" type="checkbox" id="dynamic_ip" value="yes" <?=$chk;?>/>
 									</td>
 									<td>
 										<span class="vexpl">
@@ -948,7 +948,7 @@ function netbios_change() {
 								<tr>
 									<td>
 										<?php set_checked($pconfig['pool_enable'],$chk); ?>
-										<input name="pool_enable" type="checkbox" id="pool_enable" value="yes" <?=$chk;?>">
+										<input name="pool_enable" type="checkbox" id="pool_enable" value="yes" <?=$chk;?>/>
 									</td>
 									<td>
 										<span class="vexpl">
diff --git a/usr/local/www/wizard.php b/usr/local/www/wizard.php
index 800bf30..540236c 100755
--- a/usr/local/www/wizard.php
+++ b/usr/local/www/wizard.php
@@ -158,6 +158,9 @@ function update_config_field($field, $updatetext, $unset, $arraynum, $field_type
 	eval($text);
 }
 
+$title       = preg_replace("/pfSense/i", $g['product_name'], $pkg['step'][$stepid]['title']);
+$description = preg_replace("/pfSense/i", $g['product_name'], $pkg['step'][$stepid]['description']);
+
 // handle before form display event.
 do {
 	$oldstepid = $stepid;