From 5293bfecd822c8491305eed20458165d55e44f0e Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 20 Oct 2010 15:38:43 -0400
Subject: [PATCH] Fix some forgotten name->descr changes.

---
 usr/local/www/system_camanager.php   | 4 ++--
 usr/local/www/system_certmanager.php | 8 ++++----
 usr/local/www/system_crlmanager.php  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index b60fc5167e..8d605535c1 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -134,14 +134,14 @@ if ($_POST) {
 
 	/* input validation */
 	if ($pconfig['method'] == "existing") {
-		$reqdfields = explode(" ", "name cert");
+		$reqdfields = explode(" ", "descr cert");
 		$reqdfieldsn = array(
 				gettext("Descriptive name"),
 				gettext("Certificate data"));
 	}
 	if ($pconfig['method'] == "internal") {
 		$reqdfields = explode(" ",
-				"name keylen lifetime dn_country dn_state dn_city ".
+				"descr keylen lifetime dn_country dn_state dn_city ".
 				"dn_organization dn_email dn_commonname");
 		$reqdfieldsn = array(
 				gettext("Descriptive name"),
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index d2789d936d..482159192e 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -157,7 +157,7 @@ if ($_POST) {
 		/* input validation */
 		if ($pconfig['method'] == "import") {
 			$reqdfields = explode(" ",
-					"name cert key");
+					"descr cert key");
 			$reqdfieldsn = array(
 					gettext("Descriptive name"),
 					gettext("Certificate data"),
@@ -166,7 +166,7 @@ if ($_POST) {
 
 		if ($pconfig['method'] == "internal") {
 			$reqdfields = explode(" ",
-					"name caref keylen lifetime dn_country dn_state dn_city ".
+					"descr caref keylen lifetime dn_country dn_state dn_city ".
 					"dn_organization dn_email dn_commonname");
 			$reqdfieldsn = array(
 					gettext("Descriptive name"),
@@ -183,7 +183,7 @@ if ($_POST) {
 
 		if ($pconfig['method'] == "external") {
 			$reqdfields = explode(" ",
-					"name csr_keylen csr_dn_country csr_dn_state csr_dn_city ".
+					"descr csr_keylen csr_dn_country csr_dn_state csr_dn_city ".
 					"csr_dn_organization csr_dn_email csr_dn_commonname");
 			$reqdfieldsn = array(
 					gettext("Descriptive name"),
@@ -271,7 +271,7 @@ if ($_POST) {
 		$pconfig = $_POST;
 
 		/* input validation */
-		$reqdfields = explode(" ", "name cert");
+		$reqdfields = explode(" ", "descr cert");
 		$reqdfieldsn = array(
 			gettext("Descriptive name"),
 			gettext("Final Certificate data"));
diff --git a/usr/local/www/system_crlmanager.php b/usr/local/www/system_crlmanager.php
index e3818496f7..780a35c47b 100644
--- a/usr/local/www/system_crlmanager.php
+++ b/usr/local/www/system_crlmanager.php
@@ -117,14 +117,14 @@ if ($_POST) {
 
 	/* input validation */
 	if ($pconfig['method'] == "existing") {
-		$reqdfields = explode(" ", "name crltext");
+		$reqdfields = explode(" ", "descr crltext");
 		$reqdfieldsn = array(
 				gettext("Descriptive name"),
 				gettext("Certificate Revocation List data"));
 	}
 	if ($pconfig['method'] == "internal") {
 		$reqdfields = explode(" ",
-				"name caref");
+				"descr caref");
 		$reqdfieldsn = array(
 				gettext("Descriptive name"),
 				gettext("Certificate Authority"));