From e8e283669a4e2322174e42c223fed4a732417af8 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Fri, 11 Apr 2014 19:31:46 -0500
Subject: use email from CA creation also as the default for server cert

---
 usr/local/www/wizards/openvpn_wizard.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'usr/local/www')

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index a6ce0df..e6291c2 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -251,6 +251,7 @@ function step9_stepbeforeformdisplay() {
 		$state = $pconfig['step6']['state'];
 		$city = $pconfig['step6']['city'];
 		$org = $pconfig['step6']['organization'];
+		$email = $pconfig['step6']['email'];
 	} else {
 		$ca = lookup_ca($pconfig['step6']['authcertca']);
 		$cavl = cert_get_subject_array($ca['crt']);
-- 
cgit v1.1


From ffb76388c9fc22ac4e6ca8483acb49b542541977 Mon Sep 17 00:00:00 2001
From: Phil Davis <phil.davis@inf.org>
Date: Sat, 12 Apr 2014 04:03:37 -0700
Subject: Tidy up package signature text

Thought I would tidy this up while coming across it. IMHO "Package settings" reads better than "Packages settings"... and I reworded the explanatory text a bit also.
---
 usr/local/www/system_advanced_misc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 514a9d8..5f220a0 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -719,14 +719,14 @@ function tmpvar_checked(obj) {
 							<?php endif; ?>
 
 							<tr>
-								<td colspan="2" valign="top" class="listtopic"><?=gettext("Packages settings"); ?></td>
+								<td colspan="2" valign="top" class="listtopic"><?=gettext("Package settings"); ?></td>
 							</tr>
 							<tr>
-								<td width="22%" valign="top" class="vncell"><?=gettext("Packages signature"); ?></td>
+								<td width="22%" valign="top" class="vncell"><?=gettext("Package signature"); ?></td>
 								<td width="78%" class="vtable">
 									<input name="pkg_nochecksig" type="checkbox" id="pkg_nochecksig" value="yes" <?php if ($pconfig['pkg_nochecksig']) echo "checked=\"checked\""; ?> />
-									<strong><?=gettext("Do NOT check packages signature"); ?></strong><br />
-									<?=gettext("Enable this option will make pfSense install any packages without check its signature."); ?>
+									<strong><?=gettext("Do NOT check package signature"); ?></strong><br />
+									<?=gettext("Enable this option to allow pfSense to install any package without checking its signature."); ?>
 								</td>
 							</tr>
 
-- 
cgit v1.1