summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-10-20 15:38:43 -0400
committerjim-p <jimp@pfsense.org>2010-10-20 15:41:25 -0400
commit5293bfecd822c8491305eed20458165d55e44f0e (patch)
tree218e1a0a5326e45ed4fee703cef979cf638d2774
parentd8912c6bb9feb32522084854e8cfbf5893c4cb4c (diff)
downloadpfsense-5293bfecd822c8491305eed20458165d55e44f0e.zip
pfsense-5293bfecd822c8491305eed20458165d55e44f0e.tar.gz
Fix some forgotten name->descr changes.
-rw-r--r--usr/local/www/system_camanager.php4
-rw-r--r--usr/local/www/system_certmanager.php8
-rw-r--r--usr/local/www/system_crlmanager.php4
3 files changed, 8 insertions, 8 deletions
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index b60fc51..8d60553 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 d2789d9..4821591 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 e381849..780a35c 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"));
OpenPOWER on IntegriCloud