Merge remote-tracking branch 'mainline/master' into inc

134 files changed, 150 insertions, 50 deletions

diff --git a/usr/local/sbin/ovpn-linkdown b/usr/local/sbin/ovpn-linkdown
index 112317f..b300aed 100755
--- a/usr/local/sbin/ovpn-linkdown
+++ b/usr/local/sbin/ovpn-linkdown
@@ -1,5 +1,5 @@
 #!/bin/sh
-/sbin/pfctl -b $4 -b $5
+# /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
diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup
index 613822c..b613a9a 100755
--- a/usr/local/sbin/ovpn-linkup
+++ b/usr/local/sbin/ovpn-linkup
@@ -2,10 +2,10 @@
 
 # let the configuration system know that the ip has changed.
 #/usr/local/sbin/pfSctl -c "interface newip $interface"
-if [ -n $route_vpn_gateway ]; then
+if [ "" != "$route_vpn_gateway" ]; then
 	/bin/echo $route_vpn_gateway > /tmp/$1_router
 else
-	/bin/echo $4 > /tmp/$1_router
+	/bin/echo $5 > /tmp/$1_router
 fi
 /usr/bin/touch /tmp/$1up
 # reload filter 
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown
index f6a78b9..1170d2f 100755
--- a/usr/local/sbin/ppp-linkdown
+++ b/usr/local/sbin/ppp-linkdown
@@ -6,7 +6,7 @@ fi
 if [ -f "/tmp/${interface}_defaultgw" ]; then
 	route delete default $4
 fi
-/sbin/pfctl -b $3 -b $4
+# /sbin/pfctl -b $3 -b $4
 # delete the node just in case mpd cannot do that
 /usr/sbin/ngctl shutdown $1:
 if [ -f "/var/etc/nameserver_$1" ]; then
diff --git a/usr/local/sbin/vpn-linkdown b/usr/local/sbin/vpn-linkdown
index e67a8a0..1d533cb 100755
--- a/usr/local/sbin/vpn-linkdown
+++ b/usr/local/sbin/vpn-linkdown
@@ -2,4 +2,4 @@
 
 # record logout
 /usr/bin/logger -p local3.info "logout,$1,$4,$5"
-/sbin/pfctl -b $3 -b $4
+# /sbin/pfctl -b $3 -b $4
diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index 2ffba1d..df482e2 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -35,6 +35,9 @@
 ##|*MATCH=diag_packet_capture.php*
 ##|-PRIV
 
+if ($_POST['downloadbtn'] == gettext("Download Capture"))
+	$nocsrf = true;
+
 $pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
@@ -92,6 +95,7 @@ if ($_POST) {
 		header("Content-Disposition: attachment; filename=$fn");
 		header("Content-Length: $fs");
 		readfile($fp.$fn);
+		exit;
 	}
 } else {
 	$do_tcpdump = false;
diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php
index f8e2926..2a61223 100644
--- a/usr/local/www/diag_routes.php
+++ b/usr/local/www/diag_routes.php
@@ -86,7 +86,7 @@ include('head.inc');
 		$name = ($tabindex == 0 ? 'IPv4' : 'IPv6');
 ?>
 <table class="tabcont" width="100%" cellspacing="0" cellpadding="6" border="0">
-<tr><td class="listbg" colspan="<?=$elements?>"><strong><?=$name;?></strong></font></td></tr>
+<tr><td class="listtopic" colspan="<?=$elements?>"><strong><?=$name;?></strong></font></td></tr>
 <?php
 		foreach (explode("\n", $table) as $i => $line) {
 			if ($i == 0) continue;
diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php
index 6c9df57..91736df 100755
--- a/usr/local/www/diag_traceroute.php
+++ b/usr/local/www/diag_traceroute.php
@@ -114,7 +114,7 @@ if (!isset($do_traceroute)) {
 				</tr>
 				<tr>
 				<td valign="top" colspan="2">
-				<p><span class="vexpl"><span class="red"><b><?=gettext("Note:");?></b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p>
+				<p><span class="vexpl"><span class="red"><b><?=gettext("Note: ");?></b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?></span><p>
 				<? if ($do_traceroute) {
 					echo "<font face='terminal' size='2'>";
 					echo("<br><strong>" . gettext("Traceroute output:") . "</strong><br>");
@@ -133,7 +133,7 @@ if (!isset($do_traceroute)) {
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%"> 
-					<span class="vexpl"><b><?=gettext("Note:");?></b></span><?=gettext("Multi-wan is not supported from this utility currently.");?>
+					<span class="vexpl"><b><?=gettext("Note: ");?></b><?=gettext("Multi-wan is not supported from this utility currently.");?></span>
 				 </td>
 				</tr>					
 			</table>
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index acebe3c..97493bf 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -639,7 +639,7 @@ include("head.inc");
 		<tr>
 			<td width="22%" valign="top" class="vncell"><?=gettext("Associated filter rule");?></td>
 			<td width="78%" class="vtable">
-				<span class="red"><strong><?=gettext("NOTE: ");?></strong></span><?=gettext("This is associated to a NAT rule.");?><br />
+				<span class="red"><strong><?=gettext("Note: ");?></strong></span><?=gettext("This is associated to a NAT rule.");?><br />
 				<?=gettext("You cannot edit the interface, protocol, source, or destination of associated filter rules.");?><br />
 				<br />
 				<?php
@@ -1084,7 +1084,7 @@ include("head.inc");
 				<?=gettext("State Timeout in seconds");?>
 				</p>
 
-				<p><strong><?=gettext("NOTE: Leave fields blank to disable that feature.");?></strong></p>
+				<p><strong><?=gettext("Note: Leave fields blank to disable that feature.");?></strong></p>
 			  </div>
 			</td>
 		</tr>
@@ -1142,7 +1142,7 @@ include("head.inc");
 						<option value="sloppy state" <?php if($pconfig['statetype'] == "sloppy state") echo "selected"; ?>><?=gettext("sloppy state");?></option>
 						<option value="synproxy state"<?php if($pconfig['statetype'] == "synproxy state")  echo "selected"; ?>><?=gettext("synproxy state");?></option>
 						<option value="none"<?php if($pconfig['statetype'] == "none") echo "selected"; ?>><?=gettext("none");?></option>
-					</select><br><?=gettext("HINT: Select which type of state tracking mechanism you would like to use.  If in doubt, use keep state.");?>
+					</select><br><?=gettext("Hint: Select which type of state tracking mechanism you would like to use.  If in doubt, use keep state.");?>
 					<p>
 					<table width="90%">
 						<tr><td width="25%"><ul><li><?=gettext("keep state");?></li></ul></td><td><?=gettext("Works with all IP protocols.");?></td></tr>
@@ -1162,7 +1162,7 @@ include("head.inc");
 				</div>
 				<div id="shownoxmlrpcadv" <?php if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>>
 					<input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
-					<?=gettext("HINT: This prevents the rule from automatically syncing to other CARP members.");?>
+					<?=gettext("Hint: This prevents the rule from automatically syncing to other CARP members.");?>
 				</div>
 			</td>
 		</tr>
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 3e35b0e..88efcbd 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -154,9 +154,10 @@ if (is_array($config['openvpn'])) {
 }
 
 if ($_POST['apply']) {
-	if (file_exists("/var/run/interface_mismatch_reboot_needed"))
+	if (file_exists("/var/run/interface_mismatch_reboot_needed")) {
 		system_reboot();
-	else {
+		$rebootingnow = true;
+	} else {
 		write_config();
 
 		$retval = 0;
@@ -370,11 +371,14 @@ if ($_GET['act'] == "add" && (count($config['interfaces']) < count($portlist)))
 include("head.inc");
 
 if(file_exists("/var/run/interface_mismatch_reboot_needed")) 
-	if ($_POST)
-		$savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot.");
-	else
+	if ($_POST) {
+		if($rebootingnow) 	
+			$savemsg = gettext("The system is now rebooting.  Please wait.");
+		else
+			$savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot.");
+	} else {
 		$savemsg = gettext("Interface mismatch detected.  Please resolve the mismatch and click Save.  The firewall will reboot afterwards.");
-
+	}
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 08f1a53..b6cea47 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -98,11 +98,16 @@ if ($_POST) {
 	if (!$input_errors) {
 		if (isset($id) && $a_vlans[$id]) {
 			if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) {
-				if (!empty($a_vlans[$id]['vlanif']))
+				if (!empty($a_vlans[$id]['vlanif'])) {
+					$confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
 					// Destroy previous vlan
 					pfSense_interface_destroy($a_vlans[$id]['vlanif']);
-				else
+				} else {
 					pfSense_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
+					$confif = convert_real_interface_to_friendly_interface_name("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
+				}
+				if ($confif <> "")
+					$config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}";
 			}
 		}
 		$vlan = array();
@@ -122,7 +127,6 @@ if ($_POST) {
 
                         write_config();
 
-			$confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
 			if ($confif <> "")
 				interface_configure($confif);
 				
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 9f883cd..64b1fa9 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -464,7 +464,7 @@ if ($pkg['tabs'] <> "") {
 			$value = $_POST[$fieldname];
 			if (is_array($value)) $value = implode(',', $value);
 		} else {
-			if (isset($id) && $a_pkg[$id] && $a_pkg[$id][$fieldname])
+			if (isset($id) && $a_pkg[$id])
 				$value = $a_pkg[$id][$fieldname];
 			else
 				$value = $pkga['default_value'];
diff --git a/usr/local/www/services_captiveportal_hostname_edit.php b/usr/local/www/services_captiveportal_hostname_edit.php
index a199341..cc09459 100755
--- a/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/usr/local/www/services_captiveportal_hostname_edit.php
@@ -118,17 +118,11 @@ if ($_POST) {
 			$ip['bw_up'] = $_POST['bw_up'];
 		if ($_POST['bw_down'])
 			$ip['bw_down'] = $_POST['bw_down'];
-		if (isset($id) && $a_allowedhostnames[$id]) {
-			$oldip = $a_allowedhostnames[$id]['hostname'];
-			if (!empty($a_allowedhostnames[$id]['sn']))
-				$oldip .= "/{$a_allowedhostnames[$id]['sn']}";
+		if (isset($id) && $a_allowedhostnames[$id])
 			$a_allowedhostnames[$id] = $ip;
-		} else {
-			$oldip = $ip['hostname'];
-			if (!empty($$ip['sn']))
-				$oldip .= "/{$$ip['sn']}";
+		else
 			$a_allowedhostnames[] = $ip;
-		}
+
 		allowedhostnames_sort();
 		
 		write_config();
diff --git a/usr/local/www/status_captiveportal_test.php b/usr/local/www/status_captiveportal_test.php
index c6d1dab..576a019 100644
--- a/usr/local/www/status_captiveportal_test.php
+++ b/usr/local/www/status_captiveportal_test.php
@@ -42,9 +42,10 @@ require("shaper.inc");
 require("captiveportal.inc");
 require_once("voucher.inc");
 
+$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Test Vouchers"));
+
 include("head.inc");
 include("fbegin.inc");
-$pgtitle = array(gettext("Status"), gettext("Captive portal"), gettext("Test Vouchers"));
 ?>
 
 <form action="status_captiveportal_test.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index 4505a02..e548530 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -607,7 +607,7 @@ function get_dates($curperiod, $graph) {
 									}
 									/* generate update events utilizing prototype $('') feature */
 									echo "\n";
-									echo "\t\t\$('{$graph}-{$curoption}-{$curdatabase}').src='status_rrd_graph_img.php?start={$start}&end={$end}&graph={$graph}&database={$curdatabase}&style={$curstyle}&tmp=' + randomid;\n";
+									echo "\t\t\$('{$graph}-{$curoption}-{$curdatabase}').src='status_rrd_graph_img.php?start={$start}&graph={$graph}&database={$curdatabase}&style={$curstyle}&tmp=' + randomid;\n";
 									}
 								}
 							?>
diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php
index a4b562e..85061ba 100755
--- a/usr/local/www/status_rrd_graph_settings.php
+++ b/usr/local/www/status_rrd_graph_settings.php
@@ -62,8 +62,11 @@ $periods = array("absolute" => gettext("Absolute Timespans"),
 		"current" => gettext("Current Period"),
 		"previous" => gettext("Previous Period"));
 
-if ($_POST) {
-
+if ($_POST['ResetRRD']) {
+	mwexec('/bin/rm /var/db/rrd/*');
+	$retval = enable_rrd_graphing();
+	$savemsg = "RRD data has been cleared. New RRD files have been generated.";
+} elseif ($_POST) {
 	unset($input_errors);
 	$pconfig = $_POST;
 
@@ -223,6 +226,12 @@ include("head.inc");
 				</td>
 			</tr>
 			<tr>
+				<td width="22%" valign="top">&nbsp;</td>
+				<td width="78%">
+					<input name="ResetRRD" type="submit" class="formbtn" value="<?=gettext("Reset RRD Data");?>" onclick="return confirm('<?=gettext('Do you really want to reset the RRD graphs? This will erase all graph data.');?>')">
+				</td>
+			</tr>
+			<tr>
 				<td width="22%" height="53" valign="top">&nbsp;</td>
 				<td width="78%"><strong><span class="red"><?=gettext("Note:");?></span></strong><br>
 					<?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index 4965fb9..d1150a2 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -267,7 +267,7 @@ function prot_change() {
 					<div class="tabcont">
 						<span class="vexpl">
 							<span class="red">
-								<strong><?=gettext("NOTE:"); ?>&nbsp</strong>
+								<strong><?=gettext("Note:"); ?>&nbsp</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
 							<br/>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 2264365..c31bc92 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -339,7 +339,7 @@ function maxmss_checked(obj) {
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("IP Security"); ?></td>
 							</tr>
 							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("Security Assocications"); ?></td>
+								<td width="22%" valign="top" class="vncell"><?=gettext("Security Associations"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> />
 									<strong><?=gettext("Prefer older IPsec SAs"); ?></strong>
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index fad6b34..b6b1097 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -543,9 +543,9 @@ function select_clicked() {
 										<td>
 											<input name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/>
 											<input type="button" onClick="select_clicked();" value="<?=gettext("Select");?>">
-											<br /><?=gettext("NOTE: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.");?>
-											<br /><?=gettext("EXAMPLE: CN=Users;DC=example");?>
-											<br /><?=gettext("EXAMPLE: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com ");?>
+											<br /><?=gettext("Note: Semi-Colon separated. This will be prepended to the search base dn above or you can specify full container path.");?>
+											<br /><?=gettext("Example: CN=Users;DC=example");?>
+											<br /><?=gettext("Example: CN=Users,DC=example,DC=com;OU=OtherUsers,DC=example,DC=com ");?>
 										</td>
 									</tr>
 								</table>
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index a4b60af..9a18c87 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -42,7 +42,8 @@ require_once("certs.inc");
 
 $ca_methods = array(
 	"existing" => gettext("Import an existing Certificate Authority"),
-	"internal" => gettext("Create an internal Certificate Authority"));
+	"internal" => gettext("Create an internal Certificate Authority"),
+	"intermediate" => gettext("Create an intermediate Certificate Authority"));
 
 $ca_keylens = array( "512", "1024", "2048", "4096");
 
@@ -154,7 +155,7 @@ if ($act == "expkey") {
 
 if ($_POST) {
 
-	$input_errors = array();
+	unset($input_errors);
 	$pconfig = $_POST;
 
 	/* input validation */
@@ -183,6 +184,22 @@ if ($_POST) {
 				gettext("Distinguished name Email Address"),
 				gettext("Distinguished name Common Name"));
 	}
+	if ($pconfig['method'] == "intermediate") {
+		$reqdfields = explode(" ",
+				"descr caref keylen lifetime dn_country dn_state dn_city ".
+				"dn_organization dn_email dn_commonname");
+		$reqdfieldsn = array(
+				gettext("Descriptive name"),
+				gettext("Signing Certificate Authority"),
+				gettext("Key length"),
+				gettext("Lifetime"),
+				gettext("Distinguished name Country Code"),
+				gettext("Distinguished name State or Province"),
+				gettext("Distinguished name City"),
+				gettext("Distinguished name Organization"),
+				gettext("Distinguished name Email Address"),
+				gettext("Distinguished name Common Name"));
+	}
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 	if ($pconfig['method'] != "existing")
@@ -226,10 +243,11 @@ if ($_POST) {
 			if (!empty($pconfig['key']))
 				$ca['prv']    = base64_encode($pconfig['key']);
 		} else {
+			$old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */
 			if ($pconfig['method'] == "existing")
 				ca_import($ca, $pconfig['cert'], $pconfig['key'], $pconfig['serial']);
 
-			if ($pconfig['method'] == "internal") {
+			else if ($pconfig['method'] == "internal") {
 				$dn = array(
 					'countryName' => $pconfig['dn_country'],
 					'stateOrProvinceName' => $pconfig['dn_state'],
@@ -237,8 +255,29 @@ if ($_POST) {
 					'organizationName' => $pconfig['dn_organization'],
 					'emailAddress' => $pconfig['dn_email'],
 					'commonName' => $pconfig['dn_commonname']);
-				ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn);
+				if (!ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn)){
+					while($ssl_err = openssl_error_string()){
+						$input_errors = array();
+						array_push($input_errors, "openssl library returns: " . $ssl_err);
+					}
+				}
 			}
+			else if ($pconfig['method'] == "intermediate") {
+				$dn = array(
+					'countryName' => $pconfig['dn_country'],
+					'stateOrProvinceName' => $pconfig['dn_state'],
+					'localityName' => $pconfig['dn_city'],
+					'organizationName' => $pconfig['dn_organization'],
+					'emailAddress' => $pconfig['dn_email'],
+					'commonName' => $pconfig['dn_commonname']);
+				if (!ca_inter_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['caref'])){
+					while($ssl_err = openssl_error_string()){
+						$input_errors = array();
+						array_push($input_errors, "openssl library returns: " . $ssl_err);
+					}
+				}
+			}
+			error_reporting($old_err_level);
 		}
 
 		if (isset($id) && $a_ca[$id])
@@ -246,7 +285,8 @@ if ($_POST) {
 		else
 			$a_ca[] = $ca;
 
-		write_config();
+		if (!$input_errors)
+			write_config();
 
 //		pfSenseHeader("system_camanager.php");
 	}
@@ -268,10 +308,17 @@ function method_change() {
 		case 0:
 			document.getElementById("existing").style.display="";
 			document.getElementById("internal").style.display="none";
+			document.getElementById("intermediate").style.display="none";
 			break;
 		case 1:
 			document.getElementById("existing").style.display="none";
 			document.getElementById("internal").style.display="";
+			document.getElementById("intermediate").style.display="none";
+			break;
+		case 2:
+			document.getElementById("existing").style.display="none";
+			document.getElementById("internal").style.display="";
+			document.getElementById("intermediate").style.display="";
 			break;
 	}
 }
@@ -385,6 +432,23 @@ function method_change() {
 						<tr>
 							<td colspan="2" valign="top" class="listtopic"><?=gettext("Internal Certificate Authority");?></td>
 						</tr>
+						<tr id='intermediate'>
+							<td width="22%" valign="top" class="vncellreq"><?=gettext("Signing Certificate Authority");?></td>
+							<td width="78%" class="vtable">
+                                                                <select name='caref' id='caref' class="formselect" onChange='internalca_change()'>
+                                                                <?php
+                                                                        foreach( $a_ca as $ca):
+                                                                        if (!$ca['prv'])
+                                                                                continue;
+                                                                        $selected = "";
+                                                                        if ($pconfig['caref'] == $ca['refid'])
+                                                                                $selected = "selected";
+                                                                ?>
+                                                                        <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['descr'];?></option>
+                                                                <?php endforeach; ?>
+                                                                </select>
+							</td>
+						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td>
 							<td width="78%" class="vtable">
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 87b8d91..6b0d81e 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -240,6 +240,8 @@ if ($_POST) {
 
 				$cert['descr'] = $pconfig['descr'];
 
+				$old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warings directly to a page screwing menu tab */
+
 				if ($pconfig['method'] == "import")
 					cert_import($cert, $pconfig['cert'], $pconfig['key']);
 
@@ -252,8 +254,13 @@ if ($_POST) {
 						'emailAddress' => $pconfig['dn_email'],
 						'commonName' => $pconfig['dn_commonname']);
 	
-					cert_create($cert, $pconfig['caref'], $pconfig['keylen'],
-						$pconfig['lifetime'], $dn);
+					if (!cert_create($cert, $pconfig['caref'], $pconfig['keylen'],
+						$pconfig['lifetime'], $dn)){
+						while($ssl_err = openssl_error_string()){
+							$input_errors = array();
+							array_push($input_errors, "openssl library returns: " . $ssl_err);
+						}
+					}
 				}
 
 				if ($pconfig['method'] == "external") {
@@ -265,8 +272,15 @@ if ($_POST) {
 						'emailAddress' => $pconfig['csr_dn_email'],
 						'commonName' => $pconfig['csr_dn_commonname']);
 
-					csr_generate($cert, $pconfig['csr_keylen'], $dn);
+					if(!csr_generate($cert, $pconfig['csr_keylen'], $dn)){
+						while($ssl_err = openssl_error_string()){
+							$input_errors = array();
+							array_push($input_errors, "openssl library returns: " . $ssl_err);
+						}
+					}
 				}
+				error_reporting($old_err_level);
+
 				if (isset($id) && $a_cert[$id])
 					$a_cert[$id] = $cert;
 				else
@@ -275,7 +289,8 @@ if ($_POST) {
 					$a_user[$userid]['cert'][] = $cert['refid'];
 			}
 
-			write_config();
+			if (!$input_errors)
+				write_config();
 
 			if ($userid)
 				pfSenseHeader("system_usermanager.php?act=edit&id={$userid}");
@@ -940,7 +955,7 @@ function internalca_change() {
 					</tr>
 					<tr>
 						<td>&nbsp;</td>
-						<td colspan="3">NOTE: You can only delete a certificate if it is not currently in use.</td>
+						<td colspan="3"><?=gettext("Note: You can only delete a certificate if it is not currently in use.");?></td>
 					</tr>
 				</table>
 
diff --git a/usr/local/www/themes/_corporate/images/icons/favicon.ico b/usr/local/www/themes/_corporate/images/icons/favicon.ico
new file mode 100644
index 0000000..3440bf2
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/favicon.ico
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_advanced.gif b/usr/local/www/themes/_corporate/images/icons/icon_advanced.gif
new file mode 100644
index 0000000..3ede1ff
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_advanced.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_advanced_s.gif b/usr/local/www/themes/_corporate/images/icons/icon_advanced_s.gif
new file mode 100644
index 0000000..b233549
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_advanced_s.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_alias_host.gif b/usr/local/www/themes/_corporate/images/icons/icon_alias_host.gif
new file mode 100644
index 0000000..ad43e17
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_alias_host.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_alias_net.gif b/usr/local/www/themes/_corporate/images/icons/icon_alias_net.gif
new file mode 100644
index 0000000..abd1b8b
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_alias_net.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_alias_port.gif b/usr/local/www/themes/_corporate/images/icons/icon_alias_port.gif
new file mode 100644
index 0000000..4acf2aa
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_alias_port.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_alias_url.gif b/usr/local/www/themes/_corporate/images/icons/icon_alias_url.gif
new file mode 100644
index 0000000..660571e
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_alias_url.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_alias_url_reload.gif b/usr/local/www/themes/_corporate/images/icons/icon_alias_url_reload.gif
new file mode 100644
index 0000000..55c1c4a
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_alias_url_reload.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_chain.png b/usr/local/www/themes/_corporate/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_ifalias.gif b/usr/local/www/themes/_corporate/images/icons/icon_ifalias.gif
new file mode 100644
index 0000000..0c569a7
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_ifalias.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_ifalias_d.gif b/usr/local/www/themes/_corporate/images/icons/icon_ifalias_d.gif
new file mode 100644
index 0000000..faa84d4
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_ifalias_d.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_info_pkg.gif b/usr/local/www/themes/_corporate/images/icons/icon_info_pkg.gif
new file mode 100644
index 0000000..cd3a532
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_info_pkg.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_right.gif b/usr/local/www/themes/_corporate/images/icons/icon_right.gif
new file mode 100644
index 0000000..fdf2d8b
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_right.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png b/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-group.png b/usr/local/www/themes/_corporate/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png b/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-user.png b/usr/local/www/themes/_corporate/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-user.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system_lock_screen.png b/usr/local/www/themes/_corporate/images/icons/icon_system_lock_screen.png
new file mode 100644
index 0000000..30f306d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system_lock_screen.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_wzd_nsaved.png b/usr/local/www/themes/_corporate/images/icons/icon_wzd_nsaved.png
new file mode 100644
index 0000000..21cb27d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_wzd_nsaved.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_wzd_saved.png b/usr/local/www/themes/_corporate/images/icons/icon_wzd_saved.png
new file mode 100644
index 0000000..ab82946
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_wzd_saved.png
diff --git a/usr/local/www/themes/_corporate/images/icons/in.gif b/usr/local/www/themes/_corporate/images/icons/in.gif
new file mode 100644
index 0000000..f1da771
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/in.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/in_d.gif b/usr/local/www/themes/_corporate/images/icons/in_d.gif
new file mode 100644
index 0000000..18e26be
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/in_d.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/out.gif b/usr/local/www/themes/_corporate/images/icons/out.gif
new file mode 100644
index 0000000..1a1d1d5
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/out.gif
diff --git a/usr/local/www/themes/_corporate/images/icons/out_d.gif b/usr/local/www/themes/_corporate/images/icons/out_d.gif
new file mode 100644
index 0000000..879f1da
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/out_d.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_advanced.gif b/usr/local/www/themes/code-red/images/icons/icon_advanced.gif
new file mode 100644
index 0000000..3ede1ff
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_advanced.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_advanced_s.gif b/usr/local/www/themes/code-red/images/icons/icon_advanced_s.gif
new file mode 100644
index 0000000..b233549
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_advanced_s.gif
diff --git a/usr/local/www/themes/code-red/images/icons/icon_chain.png b/usr/local/www/themes/code-red/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/code-red/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/metallic/images/icons/icon_chain.png b/usr/local/www/themes/metallic/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/metallic/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/nervecenter/images/icons/icon_chain.png b/usr/local/www/themes/nervecenter/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/nervecenter/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/favicon.ico b/usr/local/www/themes/pfsense-dropdown/images/icons/favicon.ico
new file mode 100644
index 0000000..3440bf2
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/favicon.ico
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_host.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_host.gif
new file mode 100644
index 0000000..ad43e17
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_host.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_net.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_net.gif
new file mode 100644
index 0000000..abd1b8b
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_net.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_port.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_port.gif
new file mode 100644
index 0000000..4acf2aa
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_port.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url.gif
new file mode 100644
index 0000000..660571e
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url_reload.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url_reload.gif
new file mode 100644
index 0000000..55c1c4a
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_alias_url_reload.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_chain.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_de.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_de.png
new file mode 100644
index 0000000..069cbbe
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_de.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_en.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_en.png
new file mode 100644
index 0000000..bd7f9a5
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_en.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_es.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_es.png
new file mode 100644
index 0000000..434776c
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_es.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_pt_BR.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_pt_BR.png
new file mode 100644
index 0000000..f786349
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_flag_pt_BR.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_cert.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_cert.png
new file mode 100644
index 0000000..48a34b6
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_cert.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_file.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_file.png
new file mode 100644
index 0000000..48a9ed2
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_file.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_group.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_group.png
new file mode 100644
index 0000000..7d929c0
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_group.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_host.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_host.png
new file mode 100644
index 0000000..867ef2c
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_host.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_imp.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_imp.png
new file mode 100644
index 0000000..f667cfc
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_imp.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_mail.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_mail.png
new file mode 100644
index 0000000..d2d4548
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_mail.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_pwd.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_pwd.png
new file mode 100644
index 0000000..06b53a1
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_pwd.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_search.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_search.png
new file mode 100644
index 0000000..33de926
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_search.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_time.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_time.png
new file mode 100644
index 0000000..aa8300a
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_time.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_unknown.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_unknown.png
new file mode 100644
index 0000000..1857d0e
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_unknown.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_url.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_url.png
new file mode 100644
index 0000000..cf56792
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_url.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_user.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_user.png
new file mode 100644
index 0000000..e00eebe
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_frmfld_user.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias.gif
new file mode 100644
index 0000000..0c569a7
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias_d.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias_d.gif
new file mode 100644
index 0000000..faa84d4
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_ifalias_d.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_info_pkg.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_info_pkg.gif
new file mode 100644
index 0000000..cd3a532
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_info_pkg.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl.gif
new file mode 100644
index 0000000..8dcd7c0
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl_p.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl_p.gif
new file mode 100644
index 0000000..0c79849
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_bl_p.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_p.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_p.gif
new file mode 100644
index 0000000..eb41284
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_plus_p.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_lock_screen.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_lock_screen.png
new file mode 100644
index 0000000..30f306d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_lock_screen.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_logout.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_logout.png
new file mode 100644
index 0000000..9bbb6c7
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system_logout.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_trapped.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_trapped.gif
new file mode 100644
index 0000000..ffeb2cd
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_trapped.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_nsaved.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_nsaved.png
new file mode 100644
index 0000000..21cb27d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_nsaved.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_saved.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_saved.png
new file mode 100644
index 0000000..ab82946
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_wzd_saved.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/in.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/in.gif
new file mode 100644
index 0000000..f1da771
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/in.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/in_d.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/in_d.gif
new file mode 100644
index 0000000..18e26be
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/in_d.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/out.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/out.gif
new file mode 100644
index 0000000..1a1d1d5
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/out.gif
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/out_d.gif b/usr/local/www/themes/pfsense-dropdown/images/icons/out_d.gif
new file mode 100644
index 0000000..879f1da
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/out_d.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/favicon.ico b/usr/local/www/themes/pfsense/images/icons/favicon.ico
new file mode 100644
index 0000000..3440bf2
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/favicon.ico
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_alias_host.gif b/usr/local/www/themes/pfsense/images/icons/icon_alias_host.gif
new file mode 100644
index 0000000..ad43e17
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_alias_host.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_alias_net.gif b/usr/local/www/themes/pfsense/images/icons/icon_alias_net.gif
new file mode 100644
index 0000000..abd1b8b
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_alias_net.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_alias_port.gif b/usr/local/www/themes/pfsense/images/icons/icon_alias_port.gif
new file mode 100644
index 0000000..4acf2aa
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_alias_port.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_alias_url.gif b/usr/local/www/themes/pfsense/images/icons/icon_alias_url.gif
new file mode 100644
index 0000000..660571e
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_alias_url.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_alias_url_reload.gif b/usr/local/www/themes/pfsense/images/icons/icon_alias_url_reload.gif
new file mode 100644
index 0000000..55c1c4a
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_alias_url_reload.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_chain.png b/usr/local/www/themes/pfsense/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_chain.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_flag_de.png b/usr/local/www/themes/pfsense/images/icons/icon_flag_de.png
new file mode 100644
index 0000000..069cbbe
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_flag_de.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_flag_en.png b/usr/local/www/themes/pfsense/images/icons/icon_flag_en.png
new file mode 100644
index 0000000..bd7f9a5
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_flag_en.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_flag_es.png b/usr/local/www/themes/pfsense/images/icons/icon_flag_es.png
new file mode 100644
index 0000000..434776c
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_flag_es.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_flag_pt_BR.png b/usr/local/www/themes/pfsense/images/icons/icon_flag_pt_BR.png
new file mode 100644
index 0000000..f786349
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_flag_pt_BR.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_cert.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_cert.png
new file mode 100644
index 0000000..48a34b6
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_cert.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_file.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_file.png
new file mode 100644
index 0000000..48a9ed2
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_file.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_group.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_group.png
new file mode 100644
index 0000000..7d929c0
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_group.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_host.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_host.png
new file mode 100644
index 0000000..867ef2c
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_host.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_imp.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_imp.png
new file mode 100644
index 0000000..f667cfc
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_imp.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_mail.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_mail.png
new file mode 100644
index 0000000..d2d4548
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_mail.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_pwd.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_pwd.png
new file mode 100644
index 0000000..06b53a1
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_pwd.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_search.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_search.png
new file mode 100644
index 0000000..33de926
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_search.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_time.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_time.png
new file mode 100644
index 0000000..aa8300a
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_time.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_unknown.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_unknown.png
new file mode 100644
index 0000000..1857d0e
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_unknown.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_url.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_url.png
new file mode 100644
index 0000000..cf56792
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_url.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_frmfld_user.png b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_user.png
new file mode 100644
index 0000000..e00eebe
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_frmfld_user.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_ifalias.gif b/usr/local/www/themes/pfsense/images/icons/icon_ifalias.gif
new file mode 100644
index 0000000..0c569a7
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_ifalias.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_ifalias_d.gif b/usr/local/www/themes/pfsense/images/icons/icon_ifalias_d.gif
new file mode 100644
index 0000000..faa84d4
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_ifalias_d.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_plus_bl.gif b/usr/local/www/themes/pfsense/images/icons/icon_plus_bl.gif
new file mode 100644
index 0000000..8dcd7c0
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_plus_bl.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_plus_bl_p.gif b/usr/local/www/themes/pfsense/images/icons/icon_plus_bl_p.gif
new file mode 100644
index 0000000..0c79849
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_plus_bl_p.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_plus_p.gif b/usr/local/www/themes/pfsense/images/icons/icon_plus_p.gif
new file mode 100644
index 0000000..eb41284
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_plus_p.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png b/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-group.png b/usr/local/www/themes/pfsense/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png b/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-user.png b/usr/local/www/themes/pfsense/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-user.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system_lock_screen.png b/usr/local/www/themes/pfsense/images/icons/icon_system_lock_screen.png
new file mode 100644
index 0000000..30f306d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system_lock_screen.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system_logout.png b/usr/local/www/themes/pfsense/images/icons/icon_system_logout.png
new file mode 100644
index 0000000..9bbb6c7
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system_logout.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_trapped.gif b/usr/local/www/themes/pfsense/images/icons/icon_trapped.gif
new file mode 100644
index 0000000..ffeb2cd
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_trapped.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_wzd_nsaved.png b/usr/local/www/themes/pfsense/images/icons/icon_wzd_nsaved.png
new file mode 100644
index 0000000..21cb27d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_wzd_nsaved.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_wzd_saved.png b/usr/local/www/themes/pfsense/images/icons/icon_wzd_saved.png
new file mode 100644
index 0000000..ab82946
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_wzd_saved.png
diff --git a/usr/local/www/themes/pfsense/images/icons/in.gif b/usr/local/www/themes/pfsense/images/icons/in.gif
new file mode 100644
index 0000000..f1da771
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/in.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/in_d.gif b/usr/local/www/themes/pfsense/images/icons/in_d.gif
new file mode 100644
index 0000000..18e26be
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/in_d.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/out.gif b/usr/local/www/themes/pfsense/images/icons/out.gif
new file mode 100644
index 0000000..1a1d1d5
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/out.gif
diff --git a/usr/local/www/themes/pfsense/images/icons/out_d.gif b/usr/local/www/themes/pfsense/images/icons/out_d.gif
new file mode 100644
index 0000000..879f1da
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/out_d.gif
diff --git a/usr/local/www/themes/the_wall/images/icons/icon_chain.png b/usr/local/www/themes/the_wall/images/icons/icon_chain.png
new file mode 100644
index 0000000..12db07a
--- /dev/null
+++ b/usr/local/www/themes/the_wall/images/icons/icon_chain.png
diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php
index b4890ad..8ec2504 100644
--- a/usr/local/www/vpn_ipsec_phase1.php
+++ b/usr/local/www/vpn_ipsec_phase1.php
@@ -139,6 +139,11 @@ if ($_POST) {
 	/* input validation */
 
 	$method = $pconfig['authentication_method'];
+	// Unset ca and cert if not required to avaoid storing in config
+	if ($method == "pre_shared_key" || method == "xauth_psk_server"){
+		unset($pconfig['caref']);	
+		unset($pconfig['certref']);	
+	}
 
 	// Only require PSK here for normal PSK tunnels (not mobile) or xauth.
 	// For RSA methods, require the CA/Cert.