summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www/system_certmanager.php
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-04-05 07:59:34 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-04-05 07:59:38 -0400
commit73ff9530d1a19c118b6c18ecda398b02002c52e0 (patch)
tree64808fee10ee5142ecfeb3b35e8ea193d9a1d196 /src/usr/local/www/system_certmanager.php
parent4d9a5d999eac0e6b99a02eac377da035558bdcca (diff)
downloadpfsense-73ff9530d1a19c118b6c18ecda398b02002c52e0.zip
pfsense-73ff9530d1a19c118b6c18ecda398b02002c52e0.tar.gz
Merge pull request #2841 from NOYB/System_-_Miscellaneous_-_Remove_Personalizations
(cherry picked from commit 3061702cce23fcc5259f7d6d119a6fe05de84149)
Diffstat (limited to 'src/usr/local/www/system_certmanager.php')
-rw-r--r--src/usr/local/www/system_certmanager.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index bfad6a2..51d3ed6 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -342,7 +342,7 @@ if ($_POST) {
break;
case "email":
if (empty($altname['value'])) {
- array_push($input_errors, "You must provide an e-mail address for this type of subjectAltName");
+ array_push($input_errors, "An e-mail address must be provided for this type of subjectAltName");
}
if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $altname['value'])) {
array_push($input_errors, "The e-mail provided in a subjectAltName contains invalid characters.");
@@ -651,9 +651,10 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
if (!$internal_ca_count) {
$section->addInput(new Form_StaticText(
'Certificate authority',
- gettext('No internal Certificate Authorities have been defined. You must ').
- '<a href="system_camanager.php?act=new&amp;method=internal"> '. gettext(" create") .'</a>'.
- gettext(' an internal CA before creating an internal certificate.')
+ gettext('No internal Certificate Authorities have been defined. ').
+ gettext('An internal CA must be defined in order to create an internal certificate. ').
+ '<a href="system_camanager.php?act=new&amp;method=internal"> '. gettext("Create") .'</a>'.
+ gettext(' an internal CA.')
));
} else {
$allCas = array();
@@ -926,14 +927,14 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
$pconfig['csr']
))->setReadonly()
->setWidth(7)
- ->setHelp('Copy the certificate signing data from here and forward it to your certificate authority for signing.');
+ ->setHelp('Copy the certificate signing data from here and forward it to a certificate authority for signing.');
$section->addInput(new Form_Textarea(
'cert',
'Final certificate data',
$pconfig['cert']
))->setWidth(7)
- ->setHelp('Paste the certificate received from your certificate authority here.');
+ ->setHelp('Paste the certificate received from the certificate authority here.');
if (isset($id) && $a_cert[$id]) {
$section->addInput(new Form_Input(
OpenPOWER on IntegriCloud