From 4f1ebacbfb78c855b85d447f2de7f397d7117167 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Mon, 23 Aug 2010 18:15:57 +0000
Subject: [PATCH 01/48] Ticket #769. Convert assigned openvpn interfaces by
 using custom options to 2.0 style assigned openvpn interfaces. This upgrade
 removes the 'dev tun#' from cutom options and upgrades the assigned interface
 name to new style.

---
 etc/inc/upgrade_config.inc | 50 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 24f56f7499..eb1e425493 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1415,6 +1415,31 @@ function upgrade_051_to_052() {
 			/* allocate vpnid */
 			$server['vpnid'] = $vpnid++;
 
+			if (!empty($server['custom_options'])) {
+				$cstmopts = array();
+				$tmpcstmopts = explode(";", $server['custom_options']);
+				$assigned = false;
+				$tmpstr = "";
+				foreach ($tmpcstmopts as $tmpcstmopt) {
+					$tmpstr = str_replace(" ", "", $tmpcstmopt);
+					if (substr($tmpstr,0 ,6) == "devtun") {
+						$assigned = true;
+						continue;
+					} else
+						$cstmopts[] = $tmpcstmopt;
+				}
+				$server['custom_options'] = implode(";", $cstmopts);
+				if ($assigned == true) {
+					$realif = substr($tmpstr, 3);
+					foreach ($config['interfaces'] as $iface => $cfgif) {
+						if ($cfgif['if'] == $realif) {
+							$config['interfaces'][$iface]['if'] = "ovpns{$server['vpnid']}";
+							break;
+						}
+					}
+				}
+			}
+
 			$config['openvpn']['openvpn-server'][] = $server;
 		}
 		unset($config['installedpackages']['openvpnserver']);
@@ -1489,6 +1514,31 @@ function upgrade_051_to_052() {
 			/* allocate vpnid */
 			$client['vpnid'] = $vpnid++;
 
+			if (!empty($client['custom_options'])) {
+				$cstmopts = array();
+				$tmpcstmopts = explode(";", $client['custom_options']);
+				$assigned = false;
+				$tmpstr = "";
+				foreach ($tmpcstmopts as $tmpcstmopt) {
+					$tmpstr = str_replace(" ", "", $tmpcstmopt);
+					if (substr($tmpstr,0 ,6) == "devtun") {
+						$assigned = true;
+						continue;
+					} else
+						$cstmopts[] = $tmpcstmopt;
+				}
+				$client['custom_options'] = implode(";", $cstmopts);
+				if ($assigned == true) {
+					$realif = substr($tmpstr, 3);
+					foreach ($config['interfaces'] as $iface => $cfgif) {
+						if ($cfgif['if'] == $realif) {
+							$config['interfaces'][$iface]['if'] = "ovpnc{$client['vpnid']}";
+							break;
+						}
+					}
+				}
+			}
+
 			if (!empty($client['disable']))
 				$client['disable'] = true;
 			else

From 8fd0badddbead2b224c50d55542897d75ed668e6 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Mon, 23 Aug 2010 18:23:53 +0000
Subject: [PATCH 02/48] Ticket #482. This solves point 3) which converts the
 custom 'local IP' directive to the 2.0 format.

---
 etc/inc/upgrade_config.inc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index eb1e425493..e94345482e 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -1425,6 +1425,9 @@ function upgrade_051_to_052() {
 					if (substr($tmpstr,0 ,6) == "devtun") {
 						$assigned = true;
 						continue;
+					} else if (substr($tmpstr, 0, 5) == "local") {
+						$localip = substr($tmpstr, 6);
+						$server['ipaddr'] = str_replace("\n", "", $localip);
 					} else
 						$cstmopts[] = $tmpcstmopt;
 				}
@@ -1524,6 +1527,9 @@ function upgrade_051_to_052() {
 					if (substr($tmpstr,0 ,6) == "devtun") {
 						$assigned = true;
 						continue;
+					} else if (substr($tmpstr, 0, 5) == "local") {
+                                                $localip = substr($tmpstr, 6);
+                                                $client['ipaddr'] = str_replace("\n", "", $localip);
 					} else
 						$cstmopts[] = $tmpcstmopt;
 				}

From 58ed10132e74338f2beebd847ca31bd375bd4520 Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Mon, 23 Aug 2010 22:31:54 +0200
Subject: [PATCH 03/48] Fix logic operator for graph endpoint

---
 usr/local/www/status_rrd_graph.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 14dc30dd37..6e577c1c39 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -227,12 +227,13 @@ function get_dates($curperiod, $graph) {
 					break;
 			}
 			$start = mktime((8 + $houroffset), 0, 0, $curmonth, $curday, $curyear);
-			if($offset == 0)
+			if(($offset != 0) || (($start + ($end - (12 * 3600)) ) > 0) ) {
 				$end = mktime((8 + $houroffset) + 12, 0, 0, $curmonth, $curday, $curyear);
+			}
 			break;
 		case "day":
 			$start = mktime(0, 0, 0, $curmonth, ($curday + $offset), $curyear);
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, $curmonth, (($curday + $offset) + 1), $curyear);
 			break;
 		case "week":
@@ -245,27 +246,27 @@ function get_dates($curperiod, $graph) {
 					break;
 			}
 			$start = mktime(0, 0, 0, $curmonth, (($curday - $curweekday) + $weekoffset), $curyear);
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, $curmonth, (($curday - $curweekday) + $weekoffset + 7), $curyear);
 			break;
 		case "month":
 			$start = mktime(0, 0, 0, ($curmonth + $offset), 0, $curyear);
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, (($curmonth + $offset) + 1), 0, $curyear);
 			break;
 		case "quarter":
 			$start = mktime(0, 0, 0, (($curmonth - 2) + $offset), 0, $curyear);
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, (($curmonth + $offset) + 1), 0, $curyear);
 			break;
 		case "year":
 			$start = mktime(0, 0, 0, 1, 0, ($curyear + $offset));
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, 1, 0, (($curyear + $offset) +1));
 			break;
 		case "4year": 
 			$start = mktime(0, 0, 0, 1, 0, (($curyear - 3) + $offset));
-			if($offset == 0)
+			if($offset != 0)
 				$end = mktime(0, 0, 0, 1, 0, (($curyear + $offset) +1));
 			break;
 	}

From de47ce7c57669ed09c778ae7aa38cd31f4cea14d Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 23 Aug 2010 16:47:14 -0400
Subject: [PATCH 04/48] Fix order of tabs in this file.

---
 usr/local/www/diag_logs_relayd.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php
index ec654c71d1..3aac43170f 100755
--- a/usr/local/www/diag_logs_relayd.php
+++ b/usr/local/www/diag_logs_relayd.php
@@ -67,8 +67,8 @@ include("head.inc");
 	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
 	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
 	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
-	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
 	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
 	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
 	$tab_array[] = array(gettext("Load Balancer"), true, "diag_logs_relayd.php");
 	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");

From 59218e2212c318d7531ddeefe3a0dd254dd4d31c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 23 Aug 2010 17:11:24 -0400
Subject: [PATCH 05/48] Do not use APC on cli

---
 etc/rc.php_ini_setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/rc.php_ini_setup b/etc/rc.php_ini_setup
index 5479eed715..ee26d954ce 100755
--- a/etc/rc.php_ini_setup
+++ b/etc/rc.php_ini_setup
@@ -228,7 +228,7 @@ if [  $RAM -gt 96 ]; then
 
 ; APC Settings
 apc.enabled="1"
-apc.enable_cli="1"
+apc.enable_cli="0"
 apc.shm_size="${APCSHMEMSIZE}"
 
 [suhosin]

From 85a4aab6125b7cd79d1c5a697c1f47ce473d9785 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 23 Aug 2010 19:51:53 -0600
Subject: [PATCH 06/48] Fix showing the current graph selection on the system
 RRD graphs.

---
 usr/local/www/status_rrd_graph.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 6e577c1c39..e1ee2b2c9c 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -358,9 +358,9 @@ function get_dates($curperiod, $graph) {
 
 						switch($curcat) {
 							case "system":
-								$optioncf = str_replace($search, $replace, $optionc[1]);
-								echo "<option value=\"$optioncf\"";
-								$prettyprint = ucwords(str_replace($search, $replace, $optioncf));
+								$optionc = str_replace($search, $replace, $optionc[1]);
+								echo "<option value=\"$optionc\"";
+								$prettyprint = ucwords(str_replace($search, $replace, $optionc));
 								break;
 							default:
 								/* Deduce a interface if possible and use the description */

From 9cd5e6f516437e9b31e2fc17826d463ca78381bf Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 23 Aug 2010 21:11:25 -0600
Subject: [PATCH 07/48] Allow System: Throughput RRD graph to be displayed.
 Ticket #715

---
 usr/local/www/status_rrd_graph.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index e1ee2b2c9c..dd659c7c8f 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -175,6 +175,9 @@ $dbheader = array("allgraphs-traffic.rrd",
 		"outbound-packets.rrd",
 		"outbound-traffic.rrd");
 
+/* additional menu choices for the custom tab */
+$dbheader_custom = array("system-throughput.rrd");
+
 foreach($databases as $database) {
 	if(stristr($database, "-wireless")) {
 		$wireless = true;
@@ -191,6 +194,7 @@ foreach($databases as $database) {
 }
 /* append the existing array to the header */
 $ui_databases = array_merge($dbheader, $databases);
+$custom_databases = array_merge($dbheader_custom, $databases);
 
 $styles = array('inverse' => gettext('Inverse'),
 		'absolute' => gettext('Absolute'));
@@ -336,7 +340,7 @@ function get_dates($curperiod, $graph) {
 					<?php
 
 					if($curcat == "custom") {
-						foreach ($databases as $db => $database) {
+						foreach ($custom_databases as $db => $database) {
 							$optionc = split("-", $database);
 							$search = array("-", ".rrd", $optionc);
 							$replace = array(" :: ", "", $friendly);
@@ -420,7 +424,7 @@ function get_dates($curperiod, $graph) {
 						<?php
 						$curdatabase = $curoption;
 						$graph = "custom-$curdatabase";
-						if(in_array($curdatabase, $databases)) {
+						if(in_array($curdatabase, $custom_databases)) {
 							echo "<tr><td colspan=2 class=\"list\">\n";
 							echo "<IMG BORDER='0' name='{$graph}-{$curoption}-{$curdatabase}' ";
 							echo "id='{$graph}-{$curoption}-{$curdatabase}' ALT=\"$prettydb Graph\" ";
@@ -463,7 +467,7 @@ function get_dates($curperiod, $graph) {
 											continue 2;
 										}
 								}
-								if(in_array($curdatabase, $databases)) {
+								if(in_array($curdatabase, $ui_databases)) {
 									$dates = get_dates($curperiod, $graph);
 									$start = $dates['start'];
 									$end = $dates['end'];
@@ -489,7 +493,7 @@ function get_dates($curperiod, $graph) {
 							<?php
 							foreach($graphs as $graph) {
 								/* check which databases are valid for our category */
-								foreach($databases as $curdatabase) {
+								foreach($ui_databases as $curdatabase) {
 									if(! stristr($curdatabase, $curcat)) {
 										continue;
 									}

From 44aef5432bf5e647d79b5951015076909f6c136c Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 23 Aug 2010 22:24:19 -0600
Subject: [PATCH 08/48] See if the name matches a gateway instead of showing
 everything ending in -quality.  Also do a more restrictive match when
 checking which graph to display, so it doesn't match ones it shouldn't. (for
 example, WAN matching both WAN and GW_WAN)

---
 usr/local/www/status_rrd_graph.php | 35 ++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index dd659c7c8f..3630bba9d8 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -447,11 +447,20 @@ function get_dates($curperiod, $graph) {
 										/* only show interfaces with a gateway */
 										$optionc = "$optionc[0]";
 										if(!interface_has_gateway($optionc)) {
-											if(!preg_match("/($optionc)-(quality)/", $curdatabase)) {
+											if(!isset($gateways_arr))
+												$gateways_arr = return_gateways_array();
+											$found_gateway = false;
+											foreach ($gateways_arr as $gw) {
+												if ($gw['name'] == $optionc) {
+													$found_gateway = true;
+													break;
+												}
+											}
+											if(!$found_gateway) {
 												continue 2;
 											}
 										}
-										if(! preg_match("/($optionc)[-.]/i", $curdatabase)) {
+										if(! preg_match("/(^$optionc-|-$optionc\\.)/i", $curdatabase)) {
 											continue 2;
 										}
 										break;
@@ -463,7 +472,7 @@ function get_dates($curperiod, $graph) {
 										break;
 									default:
 										/* just use the name here */
-										if(! preg_match("/($curoption)[-.]/i", $curdatabase)) {
+										if(! preg_match("/(^$curoption-|-$curoption\\.)/i", $curdatabase)) {
 											continue 2;
 										}
 								}
@@ -502,11 +511,23 @@ function get_dates($curperiod, $graph) {
 									$replace = array(" :: ", "", $friendly);
 									switch($curoption) {
 										case "outbound":
+											$optionc = "$optionc[0]";
 											if(!interface_has_gateway($optionc)) {
-												continue 2; 
-											}
-											if(! stristr($curdatabase, $optionc)) {
+												if(!isset($gateways_arr))
+													$gateways_arr = return_gateways_array();
+												$found_gateway = false;
+												foreach ($gateways_arr as $gw) {
+													if ($gw['name'] == $optionc) {
+														$found_gateway = true;
+														break;
+													}
+												}
+												if(!$found_gateway) {
 													continue 2;
+												}
+											}
+											if(! preg_match("/(^$optionc-|-$optionc\\.)/i", $curdatabase)) {
+												continue 2;
 											}
 											break;
 										case "allgraphs":
@@ -517,7 +538,7 @@ function get_dates($curperiod, $graph) {
 											break;
 										default:
 											/* just use the name here */
-											if(! stristr($curdatabase, $curoption)) {
+											if(! preg_match("/(^$curoption-|-$curoption\\.)/i", $curdatabase)) {
 												continue 2;
 											}
 									}

From 2103b25243715930aae8019b0ee2e8a16b7418fe Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Mon, 23 Aug 2010 23:24:22 -0600
Subject: [PATCH 09/48] Skip the placeholder databases when outbound is
 selected, too.  Also don't check the name against the gateway list on
 anything but the quality tab.

---
 usr/local/www/status_rrd_graph.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 3630bba9d8..1daae30e1f 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -444,11 +444,19 @@ function get_dates($curperiod, $graph) {
 								$replace = array(" :: ", "", $friendly);
 								switch($curoption) {
 									case "outbound":
+										/* make sure we do not show the placeholder databases in the outbound view */
+										if((stristr($curdatabase, "outbound")) || (stristr($curdatabase, "allgraphs"))) {
+											continue 2;
+										}
 										/* only show interfaces with a gateway */
 										$optionc = "$optionc[0]";
 										if(!interface_has_gateway($optionc)) {
-											if(!isset($gateways_arr))
-												$gateways_arr = return_gateways_array();
+											if(!isset($gateways_arr)) {
+												if(preg_match("/quality/i", $curdatabase))
+													$gateways_arr = return_gateways_array();
+												else
+													$gateways_arr = array();
+											}
 											$found_gateway = false;
 											foreach ($gateways_arr as $gw) {
 												if ($gw['name'] == $optionc) {
@@ -511,10 +519,18 @@ function get_dates($curperiod, $graph) {
 									$replace = array(" :: ", "", $friendly);
 									switch($curoption) {
 										case "outbound":
+											/* make sure we do not show the placeholder databases in the outbound view */
+											if((stristr($curdatabase, "outbound")) || (stristr($curdatabase, "allgraphs"))) {
+												continue 2;
+											}
+											/* only show interfaces with a gateway */
 											$optionc = "$optionc[0]";
 											if(!interface_has_gateway($optionc)) {
 												if(!isset($gateways_arr))
-													$gateways_arr = return_gateways_array();
+													if(preg_match("/quality/i", $curdatabase))
+														$gateways_arr = return_gateways_array();
+													else
+														$gateways_arr = array();
 												$found_gateway = false;
 												foreach ($gateways_arr as $gw) {
 													if ($gw['name'] == $optionc) {

From d6d50244df14c43832cca5199b04e659557c20dd Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 24 Aug 2010 10:08:40 +0000
Subject: [PATCH 10/48] Fixes #764. Import the patch in the ticket to allow
 per-host netboot file on dhcpd settings.

---
 etc/inc/services.inc                 |  2 ++
 usr/local/www/services_dhcp_edit.php | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 2a2c4f6170..ab8e6e8e54 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -356,6 +356,8 @@ EOD;
 					$dhhostname = str_replace(".", "_", $dhhostname);
 					$dhcpdconf .= "	option host-name {$dhhostname};\n";
 				}
+				if ($sm['netbootfile'])
+					$dhcpdconf .= "	filename \"{$sm['netbootfile']}\";\n";
 
 				$dhcpdconf .= "}\n";
 				$i++;
diff --git a/usr/local/www/services_dhcp_edit.php b/usr/local/www/services_dhcp_edit.php
index 26d3580e74..51da0f4b42 100755
--- a/usr/local/www/services_dhcp_edit.php
+++ b/usr/local/www/services_dhcp_edit.php
@@ -73,7 +73,7 @@ if (!is_array($config['dhcpd'][$if]['staticmap'])) {
 }
 
 $static_arp_enabled=isset($config['dhcpd'][$if]['staticarp']);
-
+$netboot_enabled=isset($config['dhcpd'][$if]['netboot']);
 $a_maps = &$config['dhcpd'][$if]['staticmap'];
 $ifcfgip = get_interface_ip($if);
 $ifcfgsn = get_interface_subnet($if);
@@ -87,10 +87,12 @@ if (isset($id) && $a_maps[$id]) {
         $pconfig['mac'] = $a_maps[$id]['mac'];
 		$pconfig['hostname'] = $a_maps[$id]['hostname'];
         $pconfig['ipaddr'] = $a_maps[$id]['ipaddr'];
+	$pconfig['netbootfile'] = $a_maps[$id]['netbootfile'];
         $pconfig['descr'] = $a_maps[$id]['descr'];
 } else {
         $pconfig['mac'] = $_GET['mac'];
 		$pconfig['hostname'] = $_GET['hostname'];
+	$pconfig['netbootfile'] = $_GET['netbootfile'];
         $pconfig['descr'] = $_GET['descr'];
 }
 
@@ -156,6 +158,7 @@ if ($_POST) {
 		$mapent['ipaddr'] = $_POST['ipaddr'];
 		$mapent['hostname'] = $_POST['hostname'];
 		$mapent['descr'] = $_POST['descr'];
+		$mapent['netbootfile'] = $_POST['netbootfile'];
 
 		if (isset($id) && $a_maps[$id])
 			$a_maps[$id] = $mapent;
@@ -219,6 +222,14 @@ include("head.inc");
                     <input name="hostname" type="text" class="formfld unknown" id="hostname" size="20" value="<?=htmlspecialchars($pconfig['hostname']);?>">
                     <br> <span class="vexpl"><?=gettext("Name of the host, without domain part.");?></span></td>
                 </tr>				
+                <?php if($netboot_enabled) { ?>
+		<tr>
+		  <td width="22%" valign="top" class="vncell">Netboot filename</td>
+		  <td width="78%" class="vtable">
+		    <input name="netbootfile" type="text" class="formfld unknown" id="netbootfile" size="20" value="<?=htmlspecialchars($pconfig['netbootfile']);?>">
+		    <br> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+		</tr>
+		<?php } ?>
                 <tr> 
                   <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
                   <td width="78%" class="vtable"> 

From 15d456b9ea73270bebecda69be9e41443c95c533 Mon Sep 17 00:00:00 2001
From: gnhb <gnoahb@gmail.com>
Date: Tue, 24 Aug 2010 15:38:45 +0700
Subject: [PATCH 11/48] Fix declaration. Change 'global $configure' to 'global
 $config' to make function work.

Also, remove reference to $syscfg variable not declared in new
system_dhcpleases_configure.
---
 etc/inc/system.inc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 3578ee7139..2f9e874ab5 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -233,20 +233,20 @@ function system_hosts_generate() {
 }
 
 function system_dhcpleases_configure() {
-	global $configure, $g;
-
+	global $config, $g;
+	
 	/* Start the monitoring process for dynamic dhcpclients. */
 	if (isset($config['dnsmasq']['regdhcp'])) {
 		/* Make sure we do not error out */
 		@touch("{$g['dhcpd_chroot_path']}/var/db/dhcpd.leases");
-                if (file_exists("{$g['varrun_path']}/dhcpleases.pid"))
-                        sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "HUP");
-                else
-                        mwexec("/usr/local/sbin/dhcpleases -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases -d {$syscfg['domain']} -p {$g['varrun_path']}/dnsmasq.pid -h {$g['varetc_path']}/hosts");
-        } else {
-                sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "TERM");
-                @unlink("{$g['varrun_path']}/dhcpleases.pid");
-        }
+		if (file_exists("{$g['varrun_path']}/dhcpleases.pid"))
+				sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "HUP");
+		else
+			mwexec("/usr/local/sbin/dhcpleases -l {$g['dhcpd_chroot_path']}/var/db/dhcpd.leases -d {$config['system']['domain']} -p {$g['varrun_path']}/dnsmasq.pid -h {$g['varetc_path']}/hosts");
+	} else {
+		sigkillbypid("{$g['varrun_path']}/dhcpleases.pid", "TERM");
+		@unlink("{$g['varrun_path']}/dhcpleases.pid");
+	}
 }
 
 function system_hostname_configure() {

From 5f0b6a8f2aa3e5875188cd6720d037ef25503bca Mon Sep 17 00:00:00 2001
From: gnhb <gnoahb@gmail.com>
Date: Tue, 24 Aug 2010 15:55:39 +0700
Subject: [PATCH 12/48] Remove redundant call to system_dhcpleases_configure.
 It is called in services_dnsmasq_configure.

---
 etc/rc.bootup | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/etc/rc.bootup b/etc/rc.bootup
index 38310b4ea4..3780438e5e 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -301,9 +301,6 @@ services_dhcpd_configure();
 /* start dnsmasq service */
 services_dnsmasq_configure();
 
-/* start dhcpleases dhpcp hosts leases program */
-system_dhcpleases_configure();
-
 /* start dyndns service */
 @touch("{$g['tmp_path']}/update_dyndns");
 

From b7142c29da6ac3ea5e38f97b00c7b9770a281533 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 24 Aug 2010 11:08:07 +0000
Subject: [PATCH 13/48] Ticket #8. Use correct variable. Discovered-by: Mark
 Huijgen

---
 etc/inc/filter.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 322fd968c2..dd81794b65 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -160,7 +160,7 @@ function filter_delete_states_for_down_gateways() {
                         	if (!is_ipaddr($gwip))
                                 	$gwip = get_interface_gateway($gateway['friendlyiface']);
                         	if (is_ipaddr($gwstatus['srcip'])) {
-					$cmd = "/sbin/pfctl -b {$gateway['srcip']} ";
+					$cmd = "/sbin/pfctl -b {$gwstatus['srcip']} ";
 					if (is_ipaddr($gwip))
 						$cmd .= "-b {$gwip}";
 					mwexec($cmd);

From 3a90c973ba891393437c7831e145103b53dcf814 Mon Sep 17 00:00:00 2001
From: gnhb <gnoahb@gmail.com>
Date: Tue, 24 Aug 2010 16:16:30 +0700
Subject: [PATCH 14/48] Tiny change to boot message to remove redundant info
 and make it pretty.

---
 etc/inc/interfaces.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 539ba683a1..5e9e629537 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1059,7 +1059,7 @@ function interface_ppps_configure($interface) {
 	
 	if($g['booting']) {
 		$descr = isset($ifcfg['descr']) ? $ifcfg['descr'] : strtoupper($interface);
-		echo " configuring {$upper_type} on {$descr} interface...\n";
+		echo "starting {$pppif} link...";
 		// Do not re-configure the interface if we are booting and it's already been started
 		if(file_exists("{$g['varrun_path']}/{$ppp['type']}_{$interface}.pid"))
 			return 0;

From 92150bd8cbb1abd68c9a8cffd748184b1e0c4c43 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 24 Aug 2010 11:12:16 +0000
Subject: [PATCH 15/48] Revert "Remove redundant call to
 system_dhcpleases_configure. It is called in services_dnsmasq_configure."

This reverts commit 5f0b6a8f2aa3e5875188cd6720d037ef25503bca.
---
 etc/rc.bootup | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/rc.bootup b/etc/rc.bootup
index 3780438e5e..38310b4ea4 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -301,6 +301,9 @@ services_dhcpd_configure();
 /* start dnsmasq service */
 services_dnsmasq_configure();
 
+/* start dhcpleases dhpcp hosts leases program */
+system_dhcpleases_configure();
+
 /* start dyndns service */
 @touch("{$g['tmp_path']}/update_dyndns");
 

From 5f250a244a33abc9e791239ba2c2ad9f6737045b Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Tue, 24 Aug 2010 16:22:39 +0200
Subject: [PATCH 16/48] Apparently we use domain sockets now for collecting
 user statistics. This was causing the nc command to wait _very_ long for a
 timeout and essentially destroy the graphing backend and the openvpn user
 statistics in the process

---
 etc/inc/rrd.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index 96981dae66..aaf4256aa5 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -371,6 +371,7 @@ function enable_rrd_graphing() {
 					foreach($config['openvpn']['openvpn-server'] as $server) {
 						if("ovpns{$server['vpnid']}" == $ifname) {
 							$port = $server['local_port'];
+							$vpnid = $server['vpnid'];
 						}
 					}
 				}
@@ -383,7 +384,7 @@ function enable_rrd_graphing() {
 				$rrdupdatesh .= " echo \"quit\"\n";
 				$rrdupdatesh .= "}\n";
 				$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$vpnusers N:\\\n";
-				$rrdupdatesh .= "`list_current_users | nc localhost {$port} | awk -F\",\" '/^CLIENT_LIST/ {print \$2}' | wc -l | awk '{print $1}'`\n";
+				$rrdupdatesh .= "`list_current_users | nc -U {$g['varetc_path']}/openvpn/server{$vpnid}.sock | awk -F\",\" '/^CLIENT_LIST/ {print \$2}' | wc -l | awk '{print $1}'` &\n";
 			}
 
 			/* QUEUES, set up the queues databases */

From c14d996776df164d83f34845e423715bf97ba764 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 24 Aug 2010 10:45:29 -0400
Subject: [PATCH 17/48] Resolve issue where used variable might be an array
 (multiple voucher rolls)

---
 etc/inc/voucher.inc | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/etc/inc/voucher.inc b/etc/inc/voucher.inc
index e7012cb97e..056172b0a5 100644
--- a/etc/inc/voucher.inc
+++ b/etc/inc/voucher.inc
@@ -145,9 +145,16 @@ function voucher_auth($voucher_received, $test = 0) {
     // All given vouchers were valid and this isn't simply a test.
     // Write back the used DB's
 
-    if (is_array($bitstring))
-        foreach ($bitstring as $roll => $used)
-            voucher_write_used_db($roll, base64_encode($used));
+	if (is_array($bitstring)) {
+		foreach ($bitstring as $roll => $used) {
+			if(is_array($used)) {
+				foreach($used as $u)
+					voucher_write_used_db($roll, base64_encode($u));
+			} else {
+				voucher_write_used_db($roll, base64_encode($used));
+			}
+		}
+	}
 
     // Active DB: we only add the first voucher if multiple given
     // and give that one all the time credit. This allows the user to logout and

From c6f4586c99db40ed84aeed6da75a16b20d0136d2 Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Tue, 24 Aug 2010 16:46:16 +0200
Subject: [PATCH 18/48] We need to require the globals include for finding our
 theme specific rrd color includes.

---
 usr/local/www/status_rrd_graph_img.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 4e7b887e8f..9dfb8e17c6 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -32,6 +32,7 @@
 	pfSense_MODULE:	system
 */
 
+require("global.inc");
 require("guiconfig.inc");
 require_once("filter.inc");
 require_once("shaper.inc");

From 4478867f34ab0fec67633fdaeddaaa1ff1e80d9c Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Tue, 24 Aug 2010 16:50:13 +0200
Subject: [PATCH 19/48] Shift the fields from "top" once more to get our
 processor statistics back

---
 etc/inc/rrd.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index aaf4256aa5..30cea8c0fe 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -559,7 +559,7 @@ function enable_rrd_graphing() {
 		$rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { \\\n";
 		$rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } \\\n";
 		$rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { processes = \$1; } \\\n";
-		$rrdupdatesh .= "else if ( \$1 == \"CPU:\" ) { user = \$2; nice = \$4; sys = \$6; interrupt = \$8; } \\\n";
+		$rrdupdatesh .= "else if ( \$1 == \"CPU:\" ) { user = \$3; nice = \$5; sys = \$7; interrupt = \$9; } \\\n";
 		$rrdupdatesh .= "} END { printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes }'`\n\n";
 
 		/* End CPU statistics */

From e80c551c2efcb99fbd46ad9125417bdaada19603 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 24 Aug 2010 19:07:32 +0000
Subject: [PATCH 20/48] Use correct name for include

---
 usr/local/www/status_rrd_graph_img.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 9dfb8e17c6..fecb8d5144 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -32,7 +32,7 @@
 	pfSense_MODULE:	system
 */
 
-require("global.inc");
+require("globals.inc");
 require("guiconfig.inc");
 require_once("filter.inc");
 require_once("shaper.inc");

From c7cdfe2037f07f26b4d8554dab8cdcb65df47a8c Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 24 Aug 2010 18:05:37 -0400
Subject: [PATCH 21/48] Remove ORIGINAL_PORTAL_IP option.  Never did get it
 working correctly.

---
 usr/local/captiveportal/index.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/usr/local/captiveportal/index.php b/usr/local/captiveportal/index.php
index 6316d0c7f3..79a9fa6e61 100755
--- a/usr/local/captiveportal/index.php
+++ b/usr/local/captiveportal/index.php
@@ -486,12 +486,7 @@ function portal_allow($clientip,$clientmac,$username,$password = null, $attribut
 		include("{$g['varetc_path']}/captiveportal-logout.html");
 
 	} else {
-		if($_POST['ORIGINAL_PORTAL_IP'] && $_SERVER['SERVER_NAME'] != $_POST['ORIGINAL_PORTAL_IP']) {
- 			header ('HTTP/1.1 301 Moved Permanently');
-			header("Location: " . $_POST['ORIGINAL_PORTAL_IP']);
-		} else {
-			header("Location: " . $my_redirurl);
-		}
+		header("Location: " . $my_redirurl);
 	}
 
 	return $sessionid;

From b6a1b5b7e4718dab993fe70cd8311c6afc022901 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 24 Aug 2010 18:30:42 -0400
Subject: [PATCH 22/48] Correct text to read when a logout event occurs

---
 usr/local/www/services_captiveportal.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php
index d1f6ed9654..53094bc1cd 100755
--- a/usr/local/www/services_captiveportal.php
+++ b/usr/local/www/services_captiveportal.php
@@ -716,7 +716,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td>
 		  <br>
 		  <br>
 		<?php endif; ?>
-<?=gettext("The contents of the HTML/PHP file that you upload here are displayed when an authentication error occurs. " .
+<?=gettext("The contents of the HTML/PHP file that you upload here are displayed when logout event occurs. " .
 "You may include"); ?> &quot;$PORTAL_MESSAGE$&quot;, <?=gettext("which will be replaced by the error or reply messages from the RADIUS server, if any."); ?></td>
 	</tr>
 	<tr>

From b260c8e04366a8503cc31f668e7df360e7d9d7f4 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Tue, 24 Aug 2010 19:11:57 -0400
Subject: [PATCH 23/48] Improve the standard Captive Portal pages when a custom
 page is not set

---
 etc/inc/captiveportal.inc | 187 ++++++++++++++++++++++++++++++--------
 1 file changed, 148 insertions(+), 39 deletions(-)

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 9918f1f1ce..3fbd3f726b 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1,9 +1,12 @@
 <?php
 /*
 	captiveportal.inc
-	part of m0n0wall (http://m0n0.ch/wall)
+	part of pfSense (http://www.pfSense.org)
 
-	Copyright (C) 2009 Ermal Luçi
+	originally part of m0n0wall (http://m0n0.ch/wall)
+
+	Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
+	Copyright (C) 2009 Ermal Luçi <ermal.luci@gmail.com>
 	Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
 	All rights reserved.
 
@@ -91,30 +94,77 @@ function captiveportal_configure() {
 		else {
 			/* example/template page */
 			$htmltext = <<<EOD
-<html>
-<head>
-<title>{$g['product_name']} captive portal</title>
-</head>
-<body>
-<center>
-<h2>{$g['product_name']} captive portal</h2>
-Welcome to the {$g['product_name']} Captive Portal!
-<p>
-<form method="post" action="\$PORTAL_ACTION\$">
-<input name="redirurl" type="hidden" value="\$PORTAL_REDIRURL\$">
-<table>
-   <tr><td>Username:</td><td><input name="auth_user" type="text"></td></tr>
-   <tr><td>Password:</td><td><input name="auth_pass" type="password"></td></tr>
-   <tr><td>&nbsp;</td></tr>
-   <tr>
-     <td colspan="2">
-	<center><input name="accept" type="submit" value="Continue"></center>
-     </td>
-   </tr>
-</table>
-</center>
-</form>
-</body>
+<html> 
+	<body> 
+		<form method="post" action="$PORTAL_ACTION$"> 
+		<input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$">
+			<center>
+				<table cellpadding="6" cellspacing="0" width="550" height="380" style="border:1px solid #000000">
+					<tr height="10" bgcolor="#990000">
+						<td style="border-bottom:1px solid #000000">
+							<font color='white'>
+								<b>
+									{$g['product_name']} captive portal
+								</b>
+							</font>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<div id="mainlevel">
+								<center>
+									<table width="100%" border="0" cellpadding="5" cellspacing="0">
+								 		<tr>
+								    		<td>
+												<center>
+													<div id="mainarea">
+														<center>
+															<table width="100%" border="0" cellpadding="5" cellspacing="5">
+																<tr>
+										     						<td>
+																		<div id="maindivarea">
+																			<center>
+																				<div id='statusbox'>
+																					<font color='red' face='arial' size='+1'>
+																						<b>
+																							$PORTAL_MESSAGE$
+																						</b>
+																					</font>
+																				</div>
+																				<br/>
+																				<div id='loginbox'>
+																					<table>
+																					   <tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr>
+																					   <tr><td>&nbsp;</td></tr>
+																					   <tr><td align="right">Username:</td><td><input name="auth_user" type="text" style="border: 1px dashed;"></td></tr>
+																					   <tr><td align="right">Password:</td><td><input name="auth_pass" type="password" style="border: 1px dashed;"></td></tr>
+																					   <tr><td>&nbsp;</td></tr>
+																					   <tr>
+																					     <td colspan="2">
+																							<center><input name="accept" type="submit" value="Continue"></center>
+																					     </td>
+																					   </tr>
+																					</table>
+																				</div>
+																			</center>
+																		</div>
+										     						</td>
+																</tr>
+															</table>
+														</center>
+													</div>
+												</center>
+											</td>
+										</tr>
+									</table>
+								</center>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</center>
+		</form>
+	</body> 
 </html>
 
 
@@ -142,18 +192,77 @@ EOD;
 		else {
 			/* example page */
 			$errtext = <<<EOD
-<html>
-<head>
-<title>Authentication error</title>
-</head>
-<body>
-<font color="#cc0000"><h2>Authentication error</h2></font>
-<b>
-Username and/or password invalid.
-<br><br>
-<a href="javascript:history.back(); ">Go back</a>
-</b>
-</body>
+<html> 
+	<body> 
+		<form method="post" action="$PORTAL_ACTION$"> 
+		<input name="redirurl" type="hidden" value="$PORTAL_REDIRURL$">
+			<center>
+				<table cellpadding="6" cellspacing="0" width="550" height="380" style="border:1px solid #000000">
+					<tr height="10" bgcolor="#990000">
+						<td style="border-bottom:1px solid #000000">
+							<font color='white'>
+								<b>
+									{$g['product_name']} captive portal
+								</b>
+							</font>
+						</td>
+					</tr>
+					<tr>
+						<td>
+							<div id="mainlevel">
+								<center>
+									<table width="100%" border="0" cellpadding="5" cellspacing="0">
+								 		<tr>
+								    		<td>
+												<center>
+													<div id="mainarea">
+														<center>
+															<table width="100%" border="0" cellpadding="5" cellspacing="5">
+																<tr>
+										     						<td>
+																		<div id="maindivarea">
+																			<center>
+																				<div id='statusbox'>
+																					<font color='red' face='arial' size='+1'>
+																						<b>
+																							$PORTAL_MESSAGE$
+																						</b>
+																					</font>
+																				</div>
+																				<br/>
+																				<div id='loginbox'>
+																					<table>
+																					   <tr><td colspan="2"><center>Welcome to the {$g['product_name']} Captive Portal!</td></tr>
+																					   <tr><td>&nbsp;</td></tr>
+																					   <tr><td align="right">Username:</td><td><input name="auth_user" type="text" style="border: 1px dashed;"></td></tr>
+																					   <tr><td align="right">Password:</td><td><input name="auth_pass" type="password" style="border: 1px dashed;"></td></tr>
+																					   <tr><td>&nbsp;</td></tr>
+																					   <tr>
+																					     <td colspan="2">
+																							<center><input name="accept" type="submit" value="Continue"></center>
+																					     </td>
+																					   </tr>
+																					</table>
+																				</div>
+																			</center>
+																		</div>
+										     						</td>
+																</tr>
+															</table>
+														</center>
+													</div>
+												</center>
+											</td>
+										</tr>
+									</table>
+								</center>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</center>
+		</form>
+	</body> 
 </html>
 
 EOD;
@@ -1285,4 +1394,4 @@ function portal_ip_from_client_ip($cliip) {
 	return false;
 }
 
-?>
+?>
\ No newline at end of file

From 90551807190ea3e9d2c62352562342c8155987a9 Mon Sep 17 00:00:00 2001
From: Warren Baker <warren@decoy.co.za>
Date: Wed, 25 Aug 2010 18:18:08 +0200
Subject: [PATCH 24/48] New Package XML tag 'tab_level' allows for multiple
 rows of tab displays.

---
 usr/local/www/pkg.php      | 60 ++++++++++++++++++++++--------------
 usr/local/www/pkg_edit.php | 62 +++++++++++++++++++++-----------------
 2 files changed, 71 insertions(+), 51 deletions(-)

diff --git a/usr/local/www/pkg.php b/usr/local/www/pkg.php
index df42a15b00..52e6fe34fe 100755
--- a/usr/local/www/pkg.php
+++ b/usr/local/www/pkg.php
@@ -131,31 +131,45 @@ include("fbegin.inc");
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php
 if ($pkg['tabs'] <> "") {
-	echo '<tr><td>';
-	$tab_array = array();
-	foreach($pkg['tabs']['tab'] as $tab) {
-		if(isset($tab['active'])) {
-			$active = true;
-		} else {
-			$active = false;
-		}
-		$urltmp = "";
-		if($tab['url'] <> "") 
-			$urltmp = $tab['url'];
-		if($tab['xml'] <> "") 
-			$urltmp = "pkg_edit.php?xml=" . $tab['xml'];
+    $tab_array = array();
+    foreach($pkg['tabs']['tab'] as $tab) {
+        if($tab['tab_level'])
+            $tab_level = $tab['tab_level'];
+        else
+            $tab_level = 1;
+        if(isset($tab['active'])) {
+            $active = true;
+        } else {
+            $active = false;
+        }
+        $urltmp = "";
+        if($tab['url'] <> "") $urltmp = $tab['url'];
+        if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml'];
 
-		$myurl = getenv("HTTP_HOST");
-		// eval url so that above $myurl item can be processed if need be.
-		$url = str_replace('$myurl', $myurl, $urltmp);
-		$tab_array[] = array(
-			$tab['text'],
-			$active,
-			$url
-		);
+        $addresswithport = getenv("HTTP_HOST");
+        $colonpos = strpos($addresswithport, ":");
+        if ($colonpos !== False) {
+            //my url is actually just the IP address of the pfsense box
+            $myurl = substr($addresswithport, 0, $colonpos);
+        } else {
+            $myurl = $addresswithport;
+        }
+        // eval url so that above $myurl item can be processed if need be.
+        $url = str_replace('$myurl', $myurl, $urltmp);
+
+        $tab_array[$tab_level][] = array(
+                        $tab['text'],
+                        $active,
+                        $url
+                    );
+    }
+
+    ksort($tab_array);
+    foreach($tab_array as $tab) {
+        echo '<tr><td>';
+        display_top_tabs($tab);
+        echo '</td></tr>';
     }
-	display_top_tabs($tab_array);
-	echo '</td></tr>';
 }
 ?>
 <script>
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 9d2ef13d43..cd9af8a125 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -332,39 +332,45 @@ foreach ($pkg['fields']['field'] as $field) {
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 <?php
 if ($pkg['tabs'] <> "") {
-    echo '<tr><td>';
     $tab_array = array();
     foreach($pkg['tabs']['tab'] as $tab) {
-	if(isset($tab['active'])) {
-		$active = true;
-	} else {
-		$active = false;
-	}
-	$urltmp = "";
-	if($tab['url'] <> "") $urltmp = $tab['url'];
-	if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml'];
+		if($tab['tab_level'])
+			$tab_level = $tab['tab_level'];
+		else
+			$tab_level = 1;
+		if(isset($tab['active'])) {
+			$active = true;
+		} else {
+			$active = false;
+		}
+		$urltmp = "";
+		if($tab['url'] <> "") $urltmp = $tab['url'];
+		if($tab['xml'] <> "") $urltmp = "pkg_edit.php?xml=" . $tab['xml'];
 
- 	$addresswithport = getenv("HTTP_HOST");
-	$colonpos = strpos($addresswithport, ":");
-	if ($colonpos !== False){
-		//my url is actually just the IP address of the pfsense box
-		$myurl = substr($addresswithport, 0, $colonpos);
-	}
-	else
-	{
-		$myurl = $addresswithport;
-	}
-	// eval url so that above $myurl item can be processed if need be.
-	$url = str_replace('$myurl', $myurl, $urltmp);
+ 		$addresswithport = getenv("HTTP_HOST");
+		$colonpos = strpos($addresswithport, ":");
+		if ($colonpos !== False) {
+			//my url is actually just the IP address of the pfsense box
+			$myurl = substr($addresswithport, 0, $colonpos);
+		} else {
+			$myurl = $addresswithport;
+		}
+		// eval url so that above $myurl item can be processed if need be.
+		$url = str_replace('$myurl', $myurl, $urltmp);
 
-	$tab_array[] = array(
-				$tab['text'],
-				$active,
-				$url
-			);
+		$tab_array[$tab_level][] = array(
+						$tab['text'],
+						$active,
+						$url
+					);
     }
-    display_top_tabs($tab_array);
-    echo '</td></tr>';
+
+	ksort($tab_array);
+	foreach($tab_array as $tab) {
+   		echo '<tr><td>';
+    	display_top_tabs($tab);
+   		echo '</td></tr>';
+	}
 }
 ?>
 <tr><td><div id="mainarea"><table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0">

From 3f1789530e1223b31c76e3f4186592fc890c19e0 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Wed, 25 Aug 2010 15:21:47 -0600
Subject: [PATCH 25/48] Fix text for successful authentication test. Fixes #849

---
 usr/local/www/diag_authentication.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php
index 91874d462f..19c0d6948c 100755
--- a/usr/local/www/diag_authentication.php
+++ b/usr/local/www/diag_authentication.php
@@ -56,9 +56,9 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		if (authenticate_user($_POST['username'], $_POST['password'], $authcfg)) {
-			$savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated sucessfully.");
+			$savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated successfully.");
 			$groups = getUserGroups($_POST['username'], $authcfg);
-			$savemsg .= "<br />" + gettext("This user is member of this groups") + ": <br />";
+			$savemsg .= "<br />" . gettext("This user is a member of these groups") . ": <br />";
 			foreach ($groups as $group)
 				$savemsg .= "{$group} ";
 		} else {

From 450bf4e2f644fbfd7a902b9cc898ece32ffaace6 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 25 Aug 2010 18:07:46 -0400
Subject: [PATCH 26/48] Rename to 'Tables'.  Ticket #850

---
 usr/local/www/{diag_overload_tables.php => diag_tables.php} | 0
 usr/local/www/fbegin.inc                                    | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename usr/local/www/{diag_overload_tables.php => diag_tables.php} (100%)

diff --git a/usr/local/www/diag_overload_tables.php b/usr/local/www/diag_tables.php
similarity index 100%
rename from usr/local/www/diag_overload_tables.php
rename to usr/local/www/diag_tables.php
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index fa8f9d4371..48cbe839fb 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -186,7 +186,7 @@ $diagnostics_menu[] = array("DNS Lookup", "/diag_dns.php");
 $diagnostics_menu[] = array("Edit File", "/edit.php");
 $diagnostics_menu[] = array("Factory Defaults", "/diag_defaults.php");
 $diagnostics_menu[] = array("Halt System", "/halt.php" );
-$diagnostics_menu[] = array("Overload tables", "/diag_overload_tables.php");
+$diagnostics_menu[] = array("Tables", "/diag_tables.php");
 $diagnostics_menu[] = array("Ping", "/diag_ping.php");
 $diagnostics_menu[] = array("pfTOP", "/diag_system_pftop.php");
 $diagnostics_menu[] = array("Reboot", "/reboot.php");

From c07b05e01c6c54ba882f3f5c3f2fc8b3d03354cf Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Wed, 25 Aug 2010 18:08:59 -0400
Subject: [PATCH 27/48] s/overload//

---
 usr/local/www/diag_tables.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr/local/www/diag_tables.php b/usr/local/www/diag_tables.php
index 9c409c65eb..9551e51723 100644
--- a/usr/local/www/diag_tables.php
+++ b/usr/local/www/diag_tables.php
@@ -1,6 +1,6 @@
 <?php
 /*
-	diag_overload_tables.php
+	diag_tables.php
 	Copyright (C) 2010 Jim Pingle
 
 	Portions borrowed from diag_dump_states.php:
@@ -35,13 +35,13 @@
 */
 
 ##|+PRIV
-##|*IDENT=page-diagnostics-overload-tables
-##|*NAME=Diagnostics: PF Overload table IP addresses
-##|*DESCR=Allow access to the 'Diagnostics: Overload tables' page.
-##|*MATCH=diag_overload_tables.php*
+##|*IDENT=page-diagnostics-tables
+##|*NAME=Diagnostics: PF Table IP addresses
+##|*DESCR=Allow access to the 'Diagnostics: Tables' page.
+##|*MATCH=diag_tables.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Diagnostics"), gettext("Overload tables"));
+$pgtitle = array(gettext("Diagnostics"), gettext("Tables"));
 
 require_once("guiconfig.inc");
 
@@ -82,10 +82,10 @@ include("fbegin.inc");
 
 <script language="javascript">
 	function method_change(entrytype) {
-		window.location='diag_overload_tables.php?type=' + entrytype;
+		window.location='diag_tables.php?type=' + entrytype;
 	}
 	function del_entry(entry) {
-		new Ajax.Request("diag_overload_tables.php?type=<?php echo $tablename;?>&delete=" + entry, {
+		new Ajax.Request("diag_tables.php?type=<?php echo $tablename;?>&delete=" + entry, {
 		onComplete: function(response) {
 			if (200 == response.status) 
 				new Effect.Fade($(response.responseText), { duration: 1.0 } ); 
@@ -133,7 +133,7 @@ include("fbegin.inc");
 
 <?php
 	if($count > 0)
-		echo "<p/>" . gettext("Delete") . " <a href='diag_overload_tables.php?deleteall=true&type={$tablename}'>" . gettext("all") . "</a> " . gettext("entries in this table.");
+		echo "<p/>" . gettext("Delete") . " <a href='diag_tables.php?deleteall=true&type={$tablename}'>" . gettext("all") . "</a> " . gettext("entries in this table.");
 
 ?>
 

From 52ab1d445a2dfb671a8ec958980ae0997dcb9923 Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Thu, 26 Aug 2010 04:09:30 -0600
Subject: [PATCH 28/48] Revert "Use get_real_interface here and compare to that
 to make it more generic instead of doing this wireless-specific stuff." which
 probably ended up doing some recursion in various cases, especially slowing
 down as it goes down a larger list in this foreach loop.

This reverts commit b635c0601c65628807d844911adae3c4ef00d240.
---
 etc/inc/interfaces.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 5e9e629537..6ce101c43b 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2667,7 +2667,7 @@ function convert_real_interface_to_friendly_interface_name($interface = "wan") {
                 if ($config['interfaces'][$if]['if'] == $interface)
                         return $if;
 
-                if (get_real_interface($if) == $interface)
+                if (stristr($interface, "_wlan0") && $config['interfaces'][$if]['if'] == interface_get_wireless_base($interface))
                         return $if;
 
                 $int = interface_translate_type_to_real($if);

From 48f236320d930978ecb8b7eabb5256c368ba1de9 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 26 Aug 2010 14:21:47 +0000
Subject: [PATCH 29/48] Fixes #847. Check even interface groups before allowing
 deletion of an interface. Also try to readd to a group an interface when
 configuring.

---
 etc/inc/interfaces.inc              | 19 +++++++++++++++++++
 usr/local/www/interfaces_assign.php |  4 +++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 6ce101c43b..ab917fd8c4 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -2489,6 +2489,10 @@ function interface_configure($interface = "wan", $reloadall = false) {
 
 		link_interface_to_vips($interface, "update");
 
+		$grouptmp = link_interface_to_group($interface);
+		if (!empty($grouptmp))
+			interface_group_add_member($realif, $grouptmp);
+
 		if ($interface == "lan")
 			/* make new hosts file */
 			system_hosts_generate();
@@ -2627,6 +2631,10 @@ function interface_group_setup(&$groupname /* The parameter is an array */) {
 
 	return;
 }
+
+function interface_group_add_member($interface, $groupname) {
+	mwexec("/sbin/ifconfig {$interface} group {$groupname}", true);
+}
  
 /* COMPAT Function */
 function convert_friendly_interface_to_real_interface_name($interface) {
@@ -3026,6 +3034,17 @@ function link_interface_to_bridge($int) {
 	}
 }
 
+function link_interface_to_group($int) {
+        global $config;
+
+        if (is_array($config['ifgroups']['ifgroupentry'])) {
+                foreach ($config['ifgroups']['ifgroupentry'] as $group) {
+			if (in_array($int, explode(" ", $groupname['members'])))
+                                return "{$group['ifname']}";
+		}
+	}
+}
+
 function link_interface_to_gre($interface) {
         global $config;
 
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 421286c227..41f0fd21b7 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -241,7 +241,9 @@ if ($_POST['apply']) {
 if ($_GET['act'] == "del") {
 	$id = $_GET['id'];
 
-	if (link_interface_to_bridge($id))
+	if (link_interface_to_group($id))
+		$input_errors[] = gettext("The interface is part of a group. Please remove it from the group to continue");
+	else if (link_interface_to_bridge($id))
 		$input_errors[] = gettext("The interface is part of a bridge. Please remove it from the bridge to continue");
 	else if (link_interface_to_gre($id))
 		$input_errors[] = gettext("The interface is part of a gre tunnel. Please delete the tunnel to continue");

From 6d80857f47bf5d56a18565e89c1a5017c87f4f7c Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 26 Aug 2010 09:54:00 -0400
Subject: [PATCH 30/48] Put some size tags on these fields.

---
 usr/local/www/wizards/openvpn_wizard.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index f790f7bda4..6d46438ecc 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -121,6 +121,7 @@
 			<displayname>Name</displayname>
 			<type>input</type>
 			<bindstofield>ovpnserver->step2->authtype</bindstofield>
+			<size>30</size>
 			<description>Descriptive server name, for your own reference.</description>
 		</field>
 		<field>
@@ -283,6 +284,7 @@
 			<displayname>Name</displayname>
 			<type>input</type>
 			<bindstofield>ovpnserver->step2->authtype</bindstofield>
+			<size>20</size>
 			<description>Descriptive name for the RADIUS server, for your reference.</description>
 		</field>
 		<field>
@@ -360,6 +362,7 @@
 			<displayname>Descriptive name</displayname>
 			<description>A name for your reference, to identify this certificate. This is the same as common-name field for other Certificates.</description>
 			<type>input</type>
+			<size>20</size>
 			<bindstofield>ovpnserver->step6->certca</bindstofield>
 		</field>
 		<field>
@@ -490,6 +493,7 @@
 			<displayname>Descriptive name</displayname>
 			<description>A name for your reference, to identify this certificate. This is also known as the certificate's "Common Name."</description>
 			<type>input</type>
+			<size>20</size>
 			<bindstofield>ovpnserver->step9->certname</bindstofield>
 		</field>
 		<field>
@@ -939,3 +943,4 @@
 	<includefile>/usr/local/www/wizards/openvpn_wizard.inc</includefile>
 </step>
 </pfsensewizard>
+
\ No newline at end of file

From 1bd4b4dcd97c2c77aa8900e3113d5050d44af469 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 26 Aug 2010 10:41:49 -0400
Subject: [PATCH 31/48] Enforce length of OpenVPN server descr in wizard.

---
 usr/local/www/wizards/openvpn_wizard.inc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index e4a7c8cb92..ff8175cf1e 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -512,6 +512,9 @@ function step12_submitphpaction() {
 	$server['interface'] = $pconfig['step10']['interface'];
 	if (isset($pconfig['step10']['localport']))
 		$server['local_port'] = $pconfig['step10']['localport'];
+
+	if (strlen($pconfig['step10']['descr']) > 30)
+		$pconfig['step10']['descr'] = substr($pconfig['step10']['descr'], 0, 30);
 	$server['description'] = $pconfig['step10']['descr'];
 	$server['custom_options'] = $pconfig['step10']['advanced'];
 	if (isset($pconfig['step10']['tlsauth'])) {
@@ -567,7 +570,10 @@ function step12_submitphpaction() {
 
 	if (isset($pconfig['step11']['ovpnrule'])) {
 		$rule = array();
-		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
+		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
+		/* Ensure the rule descr is not too long for pf to handle */
+		if (strlen($rule['descr']) > 52)
+			$rule['descr'] = substr($rule['descr'], 0, 52);
 		$rule['direction'] = "in";
 		$rule['source']['any'] = TRUE;
 		$rule['destination']['network'] = $server['interface'] . "ip";
@@ -580,7 +586,10 @@ function step12_submitphpaction() {
 	}
 	if (isset($pconfig['step11']['ovpnallow'])) {
 		$rule = array();
-		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard rules.");
+		$rule['descr'] = gettext("OpenVPN {$server['description']} wizard");
+		/* Ensure the rule descr is not too long for pf to handle */
+		if (strlen($rule['descr']) > 52)
+			$rule['descr'] = substr($rule['descr'], 0, 52);
 		$rule['source']['any'] = TRUE;
 		$rule['destination']['any'] = TRUE;
 		$rule['interface'] = "openvpn";

From e19b7d1ea849f40f1de194cadeefb3c289812442 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 26 Aug 2010 16:37:38 +0000
Subject: [PATCH 32/48] Allow carp interfaces to sit on top of aliases. Also
 add safety belts to ipalias deletion for this to avoid breakage. Trigered-by:
 http://forum.pfsense.org/index.php/topic,27834.0.html

---
 etc/inc/interfaces.inc                     | 21 ++++++++++++++++++++-
 usr/local/www/firewall_virtual_ip.php      |  9 +++++++++
 usr/local/www/firewall_virtual_ip_edit.php |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index ab917fd8c4..8259fec852 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1689,7 +1689,7 @@ function interface_carp_configure(&$vip) {
 	/* Ensure CARP IP really exists prior to loading up. */
 	$ww_subnet_ip = find_interface_ip($realif);
 	$ww_subnet_bits = find_interface_subnet($realif);
-	if (!ip_in_subnet($vip['subnet'], gen_subnet($ww_subnet_ip, $ww_subnet_bits) . "/" . $ww_subnet_bits)) {
+	if (!ip_in_subnet($vip['subnet'], gen_subnet($ww_subnet_ip, $ww_subnet_bits) . "/" . $ww_subnet_bits) && !ip_in_interface_alias_subnet($vip['interface'], $vip['subnet'])) {
 		file_notice("CARP", "Sorry but we could not find a matching real interface subnet for the virtual IP address {$vip['subnet']}.", "Firewall: Virtual IP", "");
 		return;
 	}
@@ -3100,6 +3100,25 @@ function find_interface_subnet($interface, $flush = false)
 	return $interface_sn_arr_cache[$interface];
 }
 
+function ip_in_interface_alias_subnet($interface, $ipalias) {
+	global $config;
+
+	if (empty($interface) || !is_ipaddr($ipalias))
+		return 0;
+	if (is_array($config['virtualip']['vip'])) {
+                foreach ($config['virtualip']['vip'] as $vip) {
+                        switch ($vip['mode']) {
+                        case "ipalias":
+                                if ($vip['interface'] <> $interface)
+                                        continue;
+				if (ip_in_subnet($ipalias, gen_subnet($vip['subnet'], $vip['subnet_bits']) . "/" . $vip['subnet_bits']))
+					return 1;
+                                break;
+                        }
+                }
+	}
+}
+
 function get_interface_ip($interface = "wan")
 {
 	$realif = get_real_interface($interface);
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 1ccfc2ae52..ec15fdfc16 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -108,6 +108,15 @@ if ($_GET['act'] == "del") {
 			}
 		}
 
+		if ($a_vip[$_GET['id']]['mode'] == "proxyarp") {
+			$vipiface = $a_vip[$_GET['id']]['interface'];
+			foreach ($a_vip as $vip) {
+				if ($vip['interface'] == $vipiface && $vip['mode'] == "carp")
+					if (ip_in_subnet($vip['subnet'], gen_subnet($a_vip[$_GET['id']]['subnet'], $a_vip[$_GET['id']]['subnet_bits']) . "/" . $a_vip[$_GET['id']]['subnet_bits']))
+						$input_errors[] = gettext("This entry cannot be deleted because it is still referenced by CARP") . " {$vip['descr']}.";
+			}
+		}
+
 		if (!$input_errors) {
 			// Special case since every proxyarp vip is handled by the same daemon.
 			if ($a_vip[$_GET['id']]['mode'] == "proxyarp") {
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index ffddef7ad9..bdad11a928 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -143,7 +143,7 @@ if ($_POST) {
 
 		$parent_ip = get_interface_ip($_POST['interface']);
 		$parent_sn = get_interface_subnet($_POST['interface']);
-		if (!ip_in_subnet($_POST['subnet'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn)) {
+		if (!ip_in_subnet($_POST['subnet'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn) && !ip_in_interface_alias_subnet($_POST['interface'], $_POST['subnet'])) {
 			$cannot_find = $_POST['subnet'] . "/" . $_POST['subnet_bits'] ;
 			$input_errors[] = sprintf(gettext("Sorry, we could not locate an interface with a matching subnet for %s.  Please add an IP alias in this subnet on this interface."),$cannot_find);
 		} else if ($parent_sn != $_POST['subnet_bits'])

From a3733a0c356cc13dfe2067b60a2fa3e6c6a01aa8 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 26 Aug 2010 16:47:10 +0000
Subject: [PATCH 33/48] Do not allow proxy arp to be edited if it references a
 carp.

---
 usr/local/www/firewall_virtual_ip_edit.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index bdad11a928..895143522a 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -154,8 +154,22 @@ if ($_POST) {
 	}
 
 	if (isset($id) && ($a_vip[$id])) {
-		if ($a_vip[$id]['mode'] != $_POST['mode'])
-			interface_vip_bring_down($a_vip[$id]);
+		if ($a_vip[$id]['mode'] != $_POST['mode']) {
+			$bringdown = false;
+			if ($a_vip[$id]['mode'] == "proxyarp") {
+				$vipiface = $a_vip[$id]['interface'];
+				foreach ($a_vip as $vip) {
+					if ($vip['interface'] == $vipiface && $vip['mode'] == "carp") {
+						if (ip_in_subnet($vip['subnet'], gen_subnet($a_vip[$id]['subnet'], $a_vip[$id]['subnet_bits']) . "/" . $a_vip[$id]['subnet_bits'])) {
+							$input_errors[] = gettext("This entry cannot be modified because it is still referenced by CARP") . " {$vip['descr']}.";
+							$bringdown = false;
+						}
+					}
+				}
+			}
+			if (bringdown == false)
+				interface_vip_bring_down($a_vip[$id]);
+		}
 		if ($a_vip[$id]['interface'] != $_POST['interface'])
 			interface_vip_bring_down($a_vip[$id]);
 	}

From 4e56c0b8927f10497cef2435a28f426622422351 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 26 Aug 2010 16:57:59 +0000
Subject: [PATCH 34/48] Switch to the right values for openvpn 2.1 according to
 the documentation.

---
 usr/local/sbin/ovpn-linkdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/sbin/ovpn-linkdown b/usr/local/sbin/ovpn-linkdown
index 451f60616d..e3c740048f 100755
--- a/usr/local/sbin/ovpn-linkdown
+++ b/usr/local/sbin/ovpn-linkdown
@@ -1,5 +1,5 @@
 #!/bin/sh
-/sbin/pfctl -b $3
+/sbin/pfctl -b $4 -b $5
 # delete the node just in case mpd cannot do that
 /bin/rm -f /var/etc/nameserver_$1
 /bin/rm -f /tmp/$1_router

From 39a12bf5c872263c9b11647088034677f45fb8d1 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Thu, 26 Aug 2010 17:06:16 +0000
Subject: [PATCH 35/48] Limit description of rules to 64 chars as that is what
 pfctl will accept.

---
 etc/inc/filter.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index dd81794b65..c18a75724c 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -1455,7 +1455,7 @@ function filter_generate_user_rule_arr($rule) {
 	$ret['rule'] = $line;
 	$ret['interface'] = $rule['interface'];
 	if($rule['descr'] != "" and $line != "")
-		$ret['descr'] = "label \"USER_RULE: " . str_replace('"', '', $rule['descr']) . "\"";
+		$ret['descr'] = "label \"USER_RULE: " . str_replace('"', '', substr($rule['descr'], 0, 63)) . "\"";
 	else
 		$ret['descr'] = "label \"USER_RULE\"";
 

From 556687cf1741d8bedab48025690a5b56b164d8cb Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Thu, 26 Aug 2010 11:34:14 -0400
Subject: [PATCH 36/48] Use www_path here instead of a relative path.

---
 usr/local/www/status_rrd_graph_img.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index fecb8d5144..2807370d4d 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -186,7 +186,7 @@ if ($altq_list_queues[$curif]) {
 $speedlimit = ($upstream + $downstream);
 
 /* select theme colors if the inclusion file exists */
-$rrdcolors = "./themes/{$g['theme']}/rrdcolors.inc.php";
+$rrdcolors = "{$g['www_path']}/themes/{$g['theme']}/rrdcolors.inc.php";
 if(file_exists($rrdcolors)) {
 	include($rrdcolors);
 } else {

From e57c91a28ef0723602c42cfd445c14ef7ce13087 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Thu, 26 Aug 2010 15:32:16 -0300
Subject: [PATCH 37/48] Use the same div ids and structure from dashboard on
 status_graph to make it more flexible with custom themes

---
 usr/local/www/status_graph.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/usr/local/www/status_graph.php b/usr/local/www/status_graph.php
index f901014151..ddcfd2d983 100755
--- a/usr/local/www/status_graph.php
+++ b/usr/local/www/status_graph.php
@@ -177,14 +177,14 @@ foreach ($ifdescrs as $ifn => $ifd) {
 <p><form method="post" action="status_graph.php">
 </form>
 <p>
-<div>
-    <div class="widgetdiv" style="padding: 5px; float:left; width:46%">
+<div id="niftyOutter">
+    <div id="col1" style="float: left; width: 46%; padding: 5px; position: relative;">
         <object data="graph.php?ifnum=<?=$curif;?>&amp;ifname=<?=rawurlencode($ifdescrs[$curif]);?>" type="image/svg+xml" width="<?=$width;?>" height="<?=$height;?>">
             <param name="src" value="graph.php?ifnum=<?=$curif;?>&amp;ifname=<?=rawurlencode($ifdescrs[$curif]);?>" />
             <?=gettext("Your browser does not support the type SVG! You need to either use Firefox or download the Adobe SVG plugin"); ?>.
         </object>
     </div>
-    <div class="widgetdiv" style="padding: 5px; float:right; width:48%">
+    <div id="col2" style="float: right; width: 48%; padding: 5px; position: relative;">
         <table width="100%" border="0" cellspacing="0" cellpadding="0">
             <tr>
                 <td class="listtopic" valign="top"><?=gettext("Host IP"); ?></td>
@@ -272,7 +272,8 @@ foreach ($ifdescrs as $ifn => $ifd) {
                 </td>
            </tr>
         </table>
-	 </div>
+	</div>
+	<div style="clear: both;"></div>
 </div>
 
 <?php include("fend.inc"); ?>

From 59345b3cef9500261fa5cf41c44b61f48088a4a7 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Thu, 26 Aug 2010 17:10:00 -0300
Subject: [PATCH 38/48] Fix associated rule source address changes on NAT Port
 Forward

When we change the source address on a NAT Port Forward rule that had
an associated rule, we need to change the associated rule source address
as well
---
 usr/local/www/firewall_nat_edit.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index ceded3d789..7f75f83a9a 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -362,17 +362,14 @@ if ($_POST) {
 			// If a rule already exists, load it
 			if (!empty($natent['associated-rule-id'])) {
 				$filterentid = get_id($natent['associated-rule-id'], $config['filter']['rule']);
-				if ($filterentid == false) {
-					pconfig_to_address($filterent['source'], $_POST['src'],
-						$_POST['srcmask'], $_POST['srcnot'],
-						$_POST['srcbeginport'], $_POST['srcendport']);
+				if ($filterentid == false)
 					$filterent['associated-rule-id'] = $natent['associated-rule-id'];
-				} else
+				else
 					$filterent =& $config['filter']['rule'][$filterentid];
-			} else
-				pconfig_to_address($filterent['source'], $_POST['src'],
-					$_POST['srcmask'], $_POST['srcnot'],
-					$_POST['srcbeginport'], $_POST['srcendport']);
+			}
+			pconfig_to_address($filterent['source'], $_POST['src'],
+				$_POST['srcmask'], $_POST['srcnot'],
+				$_POST['srcbeginport'], $_POST['srcendport']);
 
 			// Update interface, protocol and destination
 			$filterent['interface'] = $_POST['interface'];

From dfeb6800908af6bca5941ce7230def5e8fd197e7 Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Fri, 27 Aug 2010 09:23:41 +0200
Subject: [PATCH 39/48] Correct math for the 12 hour graph so it doesn't show
 the empty hours

---
 usr/local/www/status_rrd_graph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 1daae30e1f..62f3ac61a9 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -231,7 +231,7 @@ function get_dates($curperiod, $graph) {
 					break;
 			}
 			$start = mktime((8 + $houroffset), 0, 0, $curmonth, $curday, $curyear);
-			if(($offset != 0) || (($start + ($end - (12 * 3600)) ) > 0) ) {
+			if(($offset != 0) || (($end - ($start + (12 * 3600)) ) > 0) ) {
 				$end = mktime((8 + $houroffset) + 12, 0, 0, $curmonth, $curday, $curyear);
 			}
 			break;

From 635633c7aec8a8486731de0e2eb09d26c6077fee Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Fri, 27 Aug 2010 12:37:30 +0200
Subject: [PATCH 40/48] Revert the top field change shift as these break a lot
 of other installs.

---
 etc/inc/rrd.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc
index 30cea8c0fe..aaf4256aa5 100644
--- a/etc/inc/rrd.inc
+++ b/etc/inc/rrd.inc
@@ -559,7 +559,7 @@ function enable_rrd_graphing() {
 		$rrdupdatesh .= "`$top -d 2 -s 1 0 | $awk '{gsub(/%/, \"\")} BEGIN { \\\n";
 		$rrdupdatesh .= "printf \"$rrdtool update $rrddbpath$ifname$proc \" } \\\n";
 		$rrdupdatesh .= "{ if ( \$2 == \"processes:\" ) { processes = \$1; } \\\n";
-		$rrdupdatesh .= "else if ( \$1 == \"CPU:\" ) { user = \$3; nice = \$5; sys = \$7; interrupt = \$9; } \\\n";
+		$rrdupdatesh .= "else if ( \$1 == \"CPU:\" ) { user = \$2; nice = \$4; sys = \$6; interrupt = \$8; } \\\n";
 		$rrdupdatesh .= "} END { printf \"N:\"user\":\"nice\":\"sys\":\"interrupt\":\"processes }'`\n\n";
 
 		/* End CPU statistics */

From 5b9ba75a61fa432ca59db0a70b80ab94ddee2277 Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Fri, 27 Aug 2010 13:46:15 +0200
Subject: [PATCH 41/48] Change the require() to require_once()

---
 usr/local/www/status_rrd_graph_img.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/usr/local/www/status_rrd_graph_img.php b/usr/local/www/status_rrd_graph_img.php
index 2807370d4d..c57e322769 100644
--- a/usr/local/www/status_rrd_graph_img.php
+++ b/usr/local/www/status_rrd_graph_img.php
@@ -32,8 +32,8 @@
 	pfSense_MODULE:	system
 */
 
-require("globals.inc");
-require("guiconfig.inc");
+require_once("globals.inc");
+require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 require_once("rrd.inc");

From 37d7de2d2b073545c18d95619d633fdaa5d4d7f4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Fri, 27 Aug 2010 08:12:25 -0400
Subject: [PATCH 42/48] Fix some PPPoE server radius variable references. Fixes
 #853.

---
 etc/inc/vpn.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 1c204f0889..a4c631b6a8 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1213,7 +1213,7 @@ EOD;
 
 				$clientip = long2ip32(ip2long($pppoecfg['remoteip']) + $i);
 
-				if (isset ($pppoecfg['radius']['radiusissueips']) && isset ($pppoecfg['radius']['enable'])) {
+				if (isset ($pppoecfg['radius']['radiusissueips']) && isset ($pppoecfg['radius']['server']['enable'])) {
 					$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 0.0.0.0/0";
 				} else {
 					$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 {$clientip}/32";
@@ -1273,9 +1273,9 @@ EOD;
 					$mpdconf .= "	set ipcp dns " . join(" ", $syscfg['dnsserver']) . "\n";
 			}
 
-			if (isset ($pppoecfg['radius']['enable'])) {
+			if (isset ($pppoecfg['radius']['server']['enable'])) {
 				$mpdconf .=<<<EOD
-	set radius server {$pppoecfg['radius']['server']} "{$pppoecfg['radius']['secret']}"
+	set radius server {$pppoecfg['radius']['server']['ip']} "{$pppoecfg['radius']['server']['secret']}"
 	set radius retries 3
 	set radius timeout 10
 	set auth enable radius-auth

From 17a710031ba8a8c0f3c402cdec8311a993312f31 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 27 Aug 2010 18:05:13 +0000
Subject: [PATCH 43/48] Fixes #714. Do not show the cellular graphs if there is
 no ppp interface defined.

---
 usr/local/www/status_rrd_graph.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 62f3ac61a9..d66a9d7250 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -185,7 +185,7 @@ foreach($databases as $database) {
 	if(stristr($database, "-queues")) {
 		$queues = true;
 	}
-	if(stristr($database, "-cellular")) {
+	if(stristr($database, "-cellular") && !empty($config['ppps'])) {
 		$cellular = true;
 	}
 	if(stristr($database, "-vpnusers")) {

From dd0026b94f9a32527796f89c50977c6fb624998a Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 27 Aug 2010 18:16:30 +0000
Subject: [PATCH 44/48] Ticket #695. Fix the advanced icon showing on firewall
 rules page.

---
 usr/local/www/firewall_rules.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 3a769b7e6a..3a5beb1442 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -71,6 +71,25 @@ function check_for_advanced_options(&$item) {
 		$item_set .= "max-src-conn-rate {$item['max-src-conn-rate']} ";
 	if($item['max-src-conn-rates'])
 		$item_set .= "max-src-conn-rates {$item['max-src-conn-rates']} ";
+	if($item['gateway'])
+		$item_set .= "gateway {$item['gateway']} ";
+	if($item['dnpipe'])
+		$item_set .= "limiter {$item['dnpipe']} ";
+	if($item['pdnpipe'])
+		$item_set .= "limiter {$item['pdnpipe']} ";
+	if($item['l7container'])
+		$item_set .= "layer7 {$item['l7container']} ";
+	if($item['tag'])
+		$item_set .= "tag {$item['tag']} ";
+	if($item['tagged'])
+		$item_set .= "tagged {$item['tagged']} ";
+	if(isset($item['allowopts']))
+		$item_set .= "allowopts ";
+	if(isset($item['disablereplyto']))
+		$item_set .= "disable reply-to";
+	if($item['tcpflags_any'] || $item['tcpflags1'] || $item['tcpflags2'])
+		$item_set .= "tcpflags set";
+	
 	return $item_set;
 }
 
@@ -436,7 +455,7 @@ if($_REQUEST['undodrag']) {
 						continue;
 					if (isset($filterent['floating']) && "FloatingRules" != $if)
 						continue;
-					$isadvset = check_for_advanced_options($filterent);
+					$isadvset = heck_for_advanced_options($filterent);
 					if($isadvset)
 						$advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"" . gettext("advanced settings set") . ": {$isadvset}\" border=\"0\">";
 					else 

From 43131698d5760af8c0214922937935cfb1c53fee Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 27 Aug 2010 20:37:41 +0000
Subject: [PATCH 45/48] Ticket #695. Restore accidentally removed char.

---
 usr/local/www/firewall_rules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 3a5beb1442..eed381208d 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -455,7 +455,7 @@ if($_REQUEST['undodrag']) {
 						continue;
 					if (isset($filterent['floating']) && "FloatingRules" != $if)
 						continue;
-					$isadvset = heck_for_advanced_options($filterent);
+					$isadvset = check_for_advanced_options($filterent);
 					if($isadvset)
 						$advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"" . gettext("advanced settings set") . ": {$isadvset}\" border=\"0\">";
 					else 

From 89b2f77472e96d46ccdf1deeca2eeac10a4fdabc Mon Sep 17 00:00:00 2001
From: Erik Fonnesbeck <efonnes@gmail.com>
Date: Fri, 27 Aug 2010 15:03:24 -0600
Subject: [PATCH 46/48] Add missing space for separating the text for this
 option from the last one.

---
 usr/local/www/firewall_rules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index eed381208d..3c2ccd663b 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -86,7 +86,7 @@ function check_for_advanced_options(&$item) {
 	if(isset($item['allowopts']))
 		$item_set .= "allowopts ";
 	if(isset($item['disablereplyto']))
-		$item_set .= "disable reply-to";
+		$item_set .= "disable reply-to ";
 	if($item['tcpflags_any'] || $item['tcpflags1'] || $item['tcpflags2'])
 		$item_set .= "tcpflags set";
 	

From 3c2d0a1d92b81d7a7d8afed6aa0db0db887e9bed Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Sun, 29 Aug 2010 02:39:52 -0400
Subject: [PATCH 47/48] fix text

---
 usr/local/www/vpn_pppoe.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/local/www/vpn_pppoe.php b/usr/local/www/vpn_pppoe.php
index 81c8c4c076..46e8c3e0bd 100755
--- a/usr/local/www/vpn_pppoe.php
+++ b/usr/local/www/vpn_pppoe.php
@@ -344,7 +344,7 @@ function enable_change(enable_over) {
 		     }
 		    ?>
 		    </select>
-		    <br><?=gettext("Hint: 10 is TEN pppoe clients"); ?>
+		    <br><?=gettext("Hint: 10 is ten PPPoE clients"); ?>
                   </td>
 		</tr>
                 <tr> 
@@ -387,21 +387,21 @@ function enable_change(enable_over) {
 			 <br>
                       </strong><?=gettext("Sends accounting packets to the RADIUS server"); ?>.<br>
                       <input name="radiussecenable" type="checkbox" id="radiussecenable" onclick="enable_change(false)" value="yes" <?php if ($pconfig['radiussecenable']) echo "checked"; ?>>
-                      <strong><?=gettext("Use Backup Radius Server"); ?></strong><br>
+                      <strong><?=gettext("Use Backup RADIUS Server"); ?></strong><br>
                       <?=gettext("When set, if primary server fails all requests will be sent via backup server"); ?></td>
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("NAS IP Address"); ?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="radius_nasip" type="text" class="formfld unknown" id="radius_nasip" size="20" value="<?=htmlspecialchars($pconfig['radius_nasip']);?>">
-                    <br><?=gettext("radius server NAS ip Address"); ?><br>
+                    <br><?=gettext("RADIUS server NAS IP Address"); ?><br>
                     </td>
                 </tr>
                 <tr> 
                   <td width="22%" valign="top" class="vncellreq"><?=gettext("RADIUS Accounting Update"); ?></td>
                   <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="radius_acct_update" type="text" class="formfld unknown" id="radius_acct_update" size="20" value="<?=htmlspecialchars($pconfig['radius_acct_update']);?>">
-                    <br><?=gettext("Radius accounting update period in seconds"); ?>
+                    <br><?=gettext("RADIUS accounting update period in seconds"); ?>
                     </td>
                 </tr>
                 <tr> 
@@ -416,7 +416,7 @@ function enable_change(enable_over) {
                       <input name="radiusserver" type="text" class="formfld unknown" id="radiusserver" size="20" value="<?=htmlspecialchars($pconfig['radiusserver']);?>">
 			 <input name="radiusserverport" type="text" class="formfld unknown" id="radiusserverport" size="4" value="<?=htmlspecialchars($pconfig['radiusserverport']);?>">
 			 <input name="radiusserveracctport" type="text" class="formfld unknown" id="radiusserveracctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserveracctport']);?>">
-                      <br><?=gettext("Enter the IP address and port of the RADIUS server. Format ip auth_port acct_port"); ?><br>
+                      <br><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the RADIUS server."); ?><br>
 			 <br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td>
                 </tr>
                 <tr> 
@@ -432,7 +432,7 @@ function enable_change(enable_over) {
                       <input name="radiusserver2" type="text" class="formfld unknown" id="radiusserver2" size="20" value="<?=htmlspecialchars($pconfig['radiusserver2']);?>">
 			 <input name="radiusserver2port" type="text" class="formfld unknown" id="radiusserver2port" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2port']);?>">
 			 <input name="radiusserver2acctport" type="text" class="formfld unknown" id="radiusserver2acctport" size="4" value="<?=htmlspecialchars($pconfig['radiusserver2acctport']);?>">
-                      <br><?=gettext("Enter the IP address and port of the BACKUP RADIUS server. Format ip auth_port acct_port"); ?><br>
+                      <br><?=gettext("Enter the IP address, authentication port and accounting port (optional) of the backup RADIUS server."); ?><br>
 			 <br> <?=gettext("standard port 1812 and 1813 accounting"); ?></td>
                 </tr>
                 <tr> 

From dff71b6bbec5575cde975e47c6405b1fcad9c65b Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 29 Aug 2010 21:15:14 -0400
Subject: [PATCH 48/48] Add Captive Portal CARP configuration synchronization

---
 etc/rc.filter_synchronize       | 410 ++++++++++++++++----------------
 usr/local/pkg/carp_settings.xml |   6 +
 2 files changed, 214 insertions(+), 202 deletions(-)

diff --git a/etc/rc.filter_synchronize b/etc/rc.filter_synchronize
index ff5156f73e..773130210f 100755
--- a/etc/rc.filter_synchronize
+++ b/etc/rc.filter_synchronize
@@ -48,104 +48,104 @@ require_once("interfaces.inc");
  *                                   the configuration section
  */
 function backup_vip_config_section() {
-        global $config;
-        $new_section = &$config['virtualip'];
-        foreach($new_section['vip'] as $section) {
-                if($section['mode'] == "proxyarp") {
-                        unset($section);
-                }
-                if($section['advskew'] <> "") {
-                        $section_val = intval($section['advskew']);
-                        $section_val=$section_val+100;
-                        if($section_val > 255)
-                                $section_val = 255;
-                        $section['advskew'] = $section_val;
-                }
-                $temp['vip'][] = $section;
-   }
-   return $temp;
+	global $config;
+	$new_section = &$config['virtualip'];
+	foreach($new_section['vip'] as $section) {
+		if($section['mode'] == "proxyarp") {
+			unset($section);
+		}
+		if($section['advskew'] <> "") {
+			$section_val = intval($section['advskew']);
+			$section_val=$section_val+100;
+			if($section_val > 255)
+				$section_val = 255;
+			$section['advskew'] = $section_val;
+		}
+		$temp['vip'][] = $section;
+	}
+	return $temp;
 }
 
 function remove_special_characters($string) {
-        $match_array = "";
-        preg_match_all("/[a-zA-Z0-9\_\-]+/",$string,$match_array);
-        $string = "";
-        foreach ($match_array[0] as $ma) {
-                if ($string <> "")
-                        $string .= " ";
-                $string .= $ma;
-        }
-        return $string;
+	$match_array = "";
+	preg_match_all("/[a-zA-Z0-9\_\-]+/",$string,$match_array);
+	$string = "";
+	foreach ($match_array[0] as $ma) {
+		if ($string <> "")
+			$string .= " ";
+		$string .= $ma;
+	}
+	return $string;
 }
 
 function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsense.restore_config_section') {
-        global $config, $g;
+	global $config, $g;
 
-        if(file_exists("{$g['varrun_path']}/booting"))
-                return;
+	if(file_exists("{$g['varrun_path']}/booting"))
+		return;
 
-        update_filter_reload_status("Syncing CARP data to {$url}");
+	update_filter_reload_status("Syncing CARP data to {$url}");
 
-        /* make a copy of config */
-        $config_copy = $config;
+	/* make a copy of config */
+	$config_copy = $config;
 
-        /* strip out nosync items */
-        if (is_array($config_copy['nat']['advancedoutbound']['rule'])) {
-		$rulescnt = count($config_copy['nat']['advancedoutbound']['rule']);
-        	for ($x = 0; $x < $rulescnt; $x++) {
-                	$config_copy['nat']['advancedoutbound']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['advancedoutbound']['rule'][$x]['descr']);
-                	if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync']))
-                        	unset ($config_copy['nat']['advancedoutbound']['rule'][$x]);
-        	}
+	/* strip out nosync items */
+	if (is_array($config_copy['nat']['advancedoutbound']['rule'])) {
+	$rulescnt = count($config_copy['nat']['advancedoutbound']['rule']);
+	for ($x = 0; $x < $rulescnt; $x++) {
+		$config_copy['nat']['advancedoutbound']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['advancedoutbound']['rule'][$x]['descr']);
+		if (isset ($config_copy['nat']['advancedoutbound']['rule'][$x]['nosync']))
+			unset ($config_copy['nat']['advancedoutbound']['rule'][$x]);
 		}
-        if (is_array($config_copy['nat']['rule'])) {
+	}
+	if (is_array($config_copy['nat']['rule'])) {
 		$natcnt = count($config_copy['nat']['rule']);
-        	for ($x = 0; $x < $natcnt; $x++) {
-                	$config_copy['nat']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['rule'][$x]['descr']);
-                	if (isset ($config_copy['nat']['rule'][$x]['nosync']))
-                        	unset ($config_copy['nat']['rule'][$x]);
+		for ($x = 0; $x < $natcnt; $x++) {
+			$config_copy['nat']['rule'][$x]['descr'] = remove_special_characters($config_copy['nat']['rule'][$x]['descr']);
+			if (isset ($config_copy['nat']['rule'][$x]['nosync']))
+				unset ($config_copy['nat']['rule'][$x]);
 		}
-        }
-        if (is_array($config_copy['filter']['rule'])) {
+	}
+	if (is_array($config_copy['filter']['rule'])) {
 		$filtercnt = count($config_copy['filter']['rule']);
-        	for ($x = 0; $x < $filtercnt; $x++) {
-                	$config_copy['filter']['rule'][$x]['descr'] = remove_special_characters($config_copy['filter']['rule'][$x]['descr']);
-                	if (isset ($config_copy['filter']['rule'][$x]['nosync']))
-                        	unset ($config_copy['filter']['rule'][$x]);
+		for ($x = 0; $x < $filtercnt; $x++) {
+			$config_copy['filter']['rule'][$x]['descr'] = remove_special_characters($config_copy['filter']['rule'][$x]['descr']);
+			if (isset ($config_copy['filter']['rule'][$x]['nosync']))
+				unset ($config_copy['filter']['rule'][$x]);
 		}
-        }
-        if (is_array($config_copy['aliases']['alias'])) {
+	}
+	if (is_array($config_copy['aliases']['alias'])) {
 		$aliascnt = count($config_copy['aliases']['alias']);
-        	for ($x = 0; $x < $aliascnt; $x++) {
-                	$config_copy['aliases']['alias'][$x]['descr'] = remove_special_characters($config_copy['aliases']['alias'][$x]['descr']);
-                	if (isset ($config_copy['aliases']['alias'][$x]['nosync']))
-                        	unset ($config_copy['aliases']['alias'][$x]);
-        	}
+		for ($x = 0; $x < $aliascnt; $x++) {
+			$config_copy['aliases']['alias'][$x]['descr'] = remove_special_characters($config_copy['aliases']['alias'][$x]['descr']);
+			if (isset ($config_copy['aliases']['alias'][$x]['nosync']))
+				unset ($config_copy['aliases']['alias'][$x]);
 		}
-        if (is_array($config_copy['dnsmasq']['hosts'])) {
+	}
+	if (is_array($config_copy['dnsmasq']['hosts'])) {
 		$dnscnt = count($config_copy['dnsmasq']['hosts']);
-        	for ($x = 0; $x < $dnscnt; $x++) {
-                	$config_copy['dnsmasq']['hosts'][$x]['descr'] = remove_special_characters($config_copy['dnsmasq']['hosts'][$x]['descr']);
-                	if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync']))
-                        	unset ($config_copy['dnsmasq']['hosts'][$x]);
-        	}
+		for ($x = 0; $x < $dnscnt; $x++) {
+			$config_copy['dnsmasq']['hosts'][$x]['descr'] = remove_special_characters($config_copy['dnsmasq']['hosts'][$x]['descr']);
+			if (isset ($config_copy['dnsmasq']['hosts'][$x]['nosync']))
+				unset ($config_copy['dnsmasq']['hosts'][$x]);
 		}
-        if (is_array($config_copy['virtualip']['vip'])) {
+	}
+	if (is_array($config_copy['virtualip']['vip'])) {
 		$vipcnt = count($config_copy['virtualip']['vip']);
-        	for ($x = 0; $x < $vipcnt; $x++) {
-                	$config_copy['virtualip']['vip'][$x]['descr'] = remove_special_characters($config_copy['virtualip']['vip'][$x]['descr']);
-                	if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp")
-                        	unset ($config_copy['virtualip']['vip'][$x]);
-        	}
+		for ($x = 0; $x < $vipcnt; $x++) {
+			$config_copy['virtualip']['vip'][$x]['descr'] = remove_special_characters($config_copy['virtualip']['vip'][$x]['descr']);
+			if (isset ($config_copy['virtualip']['vip'][$x]['nosync']) or $config_copy['virtualip']['vip'][$x]['mode'] == "proxyarp")
+				unset ($config_copy['virtualip']['vip'][$x]);
 		}
-        if (is_array($config_copy['ipsec']['tunnel'])) {
+	}
+	if (is_array($config_copy['ipsec']['tunnel'])) {
 		$ipseccnt = count($config_copy['ipsec']['tunnel']);
-        	for ($x = 0; $x < $ipseccnt; $x++) {
-                	$config_copy['ipsec']['tunnel'][$x]['descr'] = remove_special_characters($config_copy['ipsec']['tunnel'][$x]['descr']);
-                	if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync']))
-                        	unset ($config_copy['ipsec']['tunnel'][$x]);
-        	}
+		for ($x = 0; $x < $ipseccnt; $x++) {
+			$config_copy['ipsec']['tunnel'][$x]['descr'] = remove_special_characters($config_copy['ipsec']['tunnel'][$x]['descr']);
+			if (isset ($config_copy['ipsec']['tunnel'][$x]['nosync']))
+				unset ($config_copy['ipsec']['tunnel'][$x]);
 		}
+	}
 
 	if (is_array($config_copy['dhcpd'])) {
 		foreach($config_copy['dhcpd'] as $dhcpif => $dhcpifconf) {
@@ -157,10 +157,10 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
 		}
 	}
 
-        foreach ($sections as $section) {
-                /*  we can't use array_intersect_key()
-                 *  due to the vip 'special case'
-                 */
+	foreach ($sections as $section) {
+	   /*  we can't use array_intersect_key()
+		*  due to the vip 'special case'
+		*/
 		switch ($section) {
 			case 'virtualip':
 				$xml[$section] = backup_vip_config_section();
@@ -174,49 +174,49 @@ function carp_sync_xml($url, $password, $sections, $port = 80, $method = 'pfsens
 			default:
 				$xml[$section] = $config_copy[$section];
 		}
-        }
+	}
 
-        $params = array(
-                XML_RPC_encode($password),
-                XML_RPC_encode($xml)
-        );
+	$params = array(
+		XML_RPC_encode($password),
+		XML_RPC_encode($xml)
+	);
 
-        $numberofruns = 0;
-        while ($numberofruns < 2) {
-                log_error("Beginning XMLRPC sync to {$url}:{$port}.");
-                $msg = new XML_RPC_Message($method, $params);
-                $cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
-                $username = $config['system']['user'][0]['name'];
-                $cli->setCredentials($username, $password);
-                if($numberofruns > 1)
-                        $cli->setDebug(1);
-                /* send our XMLRPC message and timeout after 240 seconds */
-                $resp = $cli->send($msg, "240");
-				if($resp->faultCode()) {
-					$error = "A communications error occurred while attempting communication with {$url}:{$port} (pfsense.exec_php).";
-					log_error($error);
-					return;	
-				}
-                if(!$resp) {
-                        $error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
-                        log_error($error);
-                        file_notice("sync_settings", $error, "Settings Sync", "");
-                } elseif($resp->faultCode()) {
-                        $error = "An error code was received while attempting XMLRPC sync with username {$username} {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
-                        log_error($error);
-                        file_notice("sync_settings", $error, "Settings Sync", "");
-                } else {
-                        log_error("XMLRPC sync successfully completed with {$url}:{$port}.");
-                        $numberofruns = 3;
-                }
-				$parsed_response =  XML_RPC_Decode($resp->value());
-				if(!is_array($firewall_info) && trim($firewall_info) == "Authentication failed") {
-					$error = "A authentication failure occurred while trying to access {$url}:{$port} (pfsense.exec_php).";
-					log_error($error);
-					$numberofruns = 5;
-				}
-                $numberofruns++;
-        }
+	$numberofruns = 0;
+	while ($numberofruns < 2) {
+		log_error("Beginning XMLRPC sync to {$url}:{$port}.");
+		$msg = new XML_RPC_Message($method, $params);
+		$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
+		$username = $config['system']['user'][0]['name'];
+		$cli->setCredentials($username, $password);
+		if($numberofruns > 1)
+			$cli->setDebug(1);
+		/* send our XMLRPC message and timeout after 240 seconds */
+		$resp = $cli->send($msg, "240");
+		if($resp->faultCode()) {
+			$error = "A communications error occurred while attempting communication with {$url}:{$port} (pfsense.exec_php).";
+			log_error($error);
+			return;	
+		}
+		if(!$resp) {
+			$error = "A communications error occured while attempting XMLRPC sync with username {$username} {$url}:{$port}.";
+			log_error($error);
+			file_notice("sync_settings", $error, "Settings Sync", "");
+		} elseif($resp->faultCode()) {
+			$error = "An error code was received while attempting XMLRPC sync with username {$username} {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+			log_error($error);
+			file_notice("sync_settings", $error, "Settings Sync", "");
+		} else {
+			log_error("XMLRPC sync successfully completed with {$url}:{$port}.");
+			$numberofruns = 3;
+		}
+		$parsed_response =  XML_RPC_Decode($resp->value());
+		if(!is_array($firewall_info) && trim($firewall_info) == "Authentication failed") {
+			$error = "A authentication failure occurred while trying to access {$url}:{$port} (pfsense.exec_php).";
+			log_error($error);
+			$numberofruns = 5;
+		}
+		$numberofruns++;
+	}
 }
 
 global $g;
@@ -227,89 +227,95 @@ if (is_array($config['installedpackages']['carpsettings']['config'])) {
 	update_filter_reload_status("Building CARP sync information");
 	foreach($config['installedpackages']['carpsettings']['config'] as $carp) {
 		if ($carp['synchronizetoip'] != "" ) {
-			/*
-                         * XXX: The way we're finding the port right now is really suboptimal -
-                         *              we can't assume that the other machine is setup identically.
-                         */
-                         if ($config['system']['webgui']['protocol'] != "") {
-                         	$synchronizetoip = $config['system']['webgui']['protocol'];
-                                $synchronizetoip .= "://";
-                         }
-                         $port = $config['system']['webgui']['port'];
-                         /* if port is empty lets rely on the protocol selection */
-                         if ($port == "") {
-                         	if ($config['system']['webgui']['protocol'] == "http")
-                                	$port = "80";
-                                else
-                                	$port = "443";
-                         }
-                         $synchronizetoip .= $carp['synchronizetoip'];
-                         if ($carp['synchronizerules'] != "" and is_array($config['filter']))
-                         	$sections[] = 'filter';
-                         if ($carp['synchronizenat'] != "" and is_array($config['nat']))
-                         	$sections[] = 'nat';
-                         if ($carp['synchronizealiases'] != "" and is_array($config['aliases']))
-                         	$sections[] = 'aliases';
-                         if ($carp['synchronizedhcpd'] != "" and is_array($config['dhcpd']))
-                                $sections[] = 'dhcpd';
-                         if ($carp['synchronizewol'] != "" and is_array($config['wol']))
-                                $sections[] = 'wol';
-                         if ($carp['synchronizetrafficshaper'] != "" and is_array($config['shaper']))
-                                $sections[] = 'shaper';
-                         if ($carp['synchronizestaticroutes'] != "" and is_array($config['staticroutes'])) {
-                                $sections[] = 'staticroutes';
-                                $sections[] = 'gateways';
-                         }
-                         if ($carp['synchronizevirtualip'] != "" and is_array($config['virtualip']))
-                                $sections[] = 'virtualip';
-                         if ($carp['synchronizelb'] != "" and is_array($config['load_balancer']))
-                                $sections[] = 'load_balancer';
-                         if ($carp['synchronizeipsec'] != "" and is_array($config['ipsec']))
-                                $sections[] = 'ipsec';
-                         if ($carp['synchronizeopenvpn'] != "" and is_array($config['openvpn'])) {
-                                $sections[] = 'openvpn';
-                                $mergesections[] = 'cert';
-                                $mergesections[] = 'ca';
-                         }
-                         if ($carp['synchronizeusers'] != "") {
-                                $mergesections[] = 'user';
-                                $mergesections[] = 'group';
-                         }
-                         if ($carp['synchronizednsforwarder'] != "" and is_array($config['dnsmasq']))
-                                $sections[] = 'dnsmasq';
-                         if ($carp['synchronizeschedules'] != "" and is_array($config['schedules']))
-                                $sections[] = 'schedules';
-                         if (count($sections) > 0) {
-                                update_filter_reload_status("Signaling CARP reload signal...");
-                                carp_sync_xml($synchronizetoip, $carp['password'], $sections, $port);
-				if (is_array($mergesections))
-					carp_sync_xml($synchronizetoip, $carp['password'], $mergesections, $port, 'pfsense.merge_config_section');
-                                $cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port);
-				$params = array(
-					XML_RPC_encode($carp['password'])
-				);
+		   /*
+			* XXX: The way we're finding the port right now is really suboptimal -
+			*              we can't assume that the other machine is setup identically.
+			*/
+		if ($config['system']['webgui']['protocol'] != "") {
+			$synchronizetoip = $config['system']['webgui']['protocol'];
+			$synchronizetoip .= "://";
+		}
 
-                                $msg = new XML_RPC_Message('pfsense.filter_configure', $params);
-                                $username = $config['system']['user'][0]['name'];
-                                $cli->setCredentials($username, $carp['password']);
-                                $resp = $cli->send($msg, "900");
+		/* if port is empty lets rely on the protocol selection */
+		$port = $config['system']['webgui']['port'];
+		if ($port == "") {
+			if ($config['system']['webgui']['protocol'] == "http")
+				$port = "80";
+			else
+				$port = "443";
+		}
 
-				if(!$resp) {
-					$error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
-					log_error($error);
-					file_notice("sync_settings", $error, "Settings Sync", "");
-				} elseif($resp->faultCode()) {
-					$error = "An error code was received while attempting Filter sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
-					log_error($error);
-					file_notice("sync_settings", $error, "Settings Sync", "");
-				} else {
-					log_error("Filter sync successfully completed with {$synchronizetoip}:{$port}.");
-					$numberofruns = 3;
-				}
-                         }
-			 break;
-                }
-        }
+		$synchronizetoip .= $carp['synchronizetoip'];
+		if ($carp['synchronizerules'] != "" and is_array($config['filter']))
+			$sections[] = 'filter';
+		if ($carp['synchronizenat'] != "" and is_array($config['nat']))
+			$sections[] = 'nat';
+		if ($carp['synchronizealiases'] != "" and is_array($config['aliases']))
+			$sections[] = 'aliases';
+		if ($carp['synchronizedhcpd'] != "" and is_array($config['dhcpd']))
+			$sections[] = 'dhcpd';
+		if ($carp['synchronizewol'] != "" and is_array($config['wol']))
+			$sections[] = 'wol';
+		if ($carp['synchronizetrafficshaper'] != "" and is_array($config['shaper']))
+			$sections[] = 'shaper';
+		if ($carp['synchronizestaticroutes'] != "" and is_array($config['staticroutes'])) {
+			$sections[] = 'staticroutes';
+			$sections[] = 'gateways';
+		}
+		if ($carp['synchronizevirtualip'] != "" and is_array($config['virtualip']))
+			$sections[] = 'virtualip';
+		if ($carp['synchronizelb'] != "" and is_array($config['load_balancer']))
+			$sections[] = 'load_balancer';
+		if ($carp['synchronizeipsec'] != "" and is_array($config['ipsec']))
+			$sections[] = 'ipsec';
+		if ($carp['synchronizeopenvpn'] != "" and is_array($config['openvpn'])) {
+			$sections[] = 'openvpn';
+			$mergesections[] = 'cert';
+			$mergesections[] = 'ca';
+		}
+		if ($carp['synchronizeusers'] != "") {
+			$mergesections[] = 'user';
+			$mergesections[] = 'group';
+		} 
+		if ($carp['synchronizednsforwarder'] != "" and is_array($config['dnsmasq']))
+			$sections[] = 'dnsmasq';
+		if ($carp['synchronizeschedules'] != "" and is_array($config['schedules']))
+			$sections[] = 'schedules';
+		if ($carp['synchronizecaptiveportal'] != "" and is_array($config['captiveportal']))
+			$sections[] = 'captiveportal';
+		if ($carp['synchronizecaptiveportal'] != "" and is_array($config['vouchers']))
+			$sections[] = 'vouchers';
+		if (count($sections) > 0) {
+			update_filter_reload_status("Signaling CARP reload signal...");
+			carp_sync_xml($synchronizetoip, $carp['password'], $sections, $port);
+			if (is_array($mergesections))
+				carp_sync_xml($synchronizetoip, $carp['password'], $mergesections, $port, 'pfsense.merge_config_section');
+			$cli = new XML_RPC_Client('/xmlrpc.php', $synchronizetoip, $port);
+			$params = array(
+				XML_RPC_encode($carp['password'])
+			);
+
+			$msg = new XML_RPC_Message('pfsense.filter_configure', $params);
+			$username = $config['system']['user'][0]['name'];
+			$cli->setCredentials($username, $carp['password']);
+			$resp = $cli->send($msg, "900");
+
+			if(!$resp) {
+				$error = "A communications error occured while attempting Filter sync with username {$username} {$synchronizetoip}:{$port}.";
+				log_error($error);
+				file_notice("sync_settings", $error, "Settings Sync", "");
+			} elseif($resp->faultCode()) {
+				$error = "An error code was received while attempting Filter sync with username {$username} {$synchronizetoip}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
+				log_error($error);
+				file_notice("sync_settings", $error, "Settings Sync", "");
+			} else {
+				log_error("Filter sync successfully completed with {$synchronizetoip}:{$port}.");
+				$numberofruns = 3;
+			}
+		}
+		break;
+		}
+	}
 }
 
-?>
+?>
\ No newline at end of file
diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml
index 170609f8e9..de0d226ba9 100644
--- a/usr/local/pkg/carp_settings.xml
+++ b/usr/local/pkg/carp_settings.xml
@@ -160,6 +160,12 @@
 			<description>When this option is enabled, this system will automatically sync the DNS Forwarder configuration to the other CARP host when changes are made.</description>
 			<type>checkbox</type>
 		</field>
+		<field>
+			<fielddescr>Synchronize Captive Portal</fielddescr>
+			<fieldname>synchronizecaptiveportal</fieldname>
+			<description>When this option is enabled, this system will automatically sync the Captive Portal configuration to the other CARP host when changes are made.</description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Synchronize to IP</fielddescr>
 			<fieldname>synchronizetoip</fieldname>