Fixed #5023

Added jQuery to populate the certificate details from the selected CA

2 files changed, 51 insertions, 6 deletions

diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php
index e65315a..605de54 100644
--- a/src/usr/local/www/system_camanager.php
+++ b/src/usr/local/www/system_camanager.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	certificate_manager
+	pfSense_MODULE: certificate_manager
 */
 
 ##|+PRIV
@@ -272,9 +272,9 @@ if ($_POST) {
 			$ca['descr']  = $pconfig['descr'];
 			$ca['refid']  = $pconfig['refid'];
 			$ca['serial'] = $pconfig['serial'];
-			$ca['crt']    = base64_encode($pconfig['cert']);
+			$ca['crt']	  = base64_encode($pconfig['cert']);
 			if (!empty($pconfig['key'])) {
-				$ca['prv']    = base64_encode($pconfig['key']);
+				$ca['prv']	  = base64_encode($pconfig['key']);
 			}
 		} else {
 			$old_err_level = error_reporting(0); /* otherwise openssl_ functions throw warnings directly to a page screwing menu tab */
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index b26d857..43150c2 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -28,7 +28,7 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 /*
-	pfSense_MODULE:	certificate_manager
+	pfSense_MODULE: certificate_manager
 */
 
 ##|+PRIV
@@ -777,8 +777,6 @@ else
 	));
 }
 
-print('<br />keylen = ' . $pconfig['keylen'] . '<br />');
-
 $section->addInput(new Form_Select(
 	'keylen',
 	'Key length',
@@ -989,4 +987,51 @@ $section->addInput(new Form_Select(
 $form->add($section);
 print $form;
 
+?>
+<script>
+//<![CDATA[
+events.push(function(){
+<?php if ($internal_ca_count): ?>
+	function internalca_change() {
+
+		caref = $('#caref').val();
+
+		switch (caref) {
+<?php
+			foreach ($a_ca as $ca):
+				if (!$ca['prv']) {
+					continue;
+				}
+
+				$subject = cert_get_subject_array($ca['crt']);
+
+?>
+				case "<?=$ca['refid'];?>":
+					$('#dn_country').val("<?=$subject[0]['v'];?>");
+					$('#dn_state').val("<?=$subject[1]['v'];?>");
+					$('#dn_city').val("<?=$subject[2]['v'];?>");
+					$('#dn_organization').val("<?=$subject[3]['v'];?>");
+					$('#dn_email').val("<?=$subject[4]['v'];?>");
+					break;
+<?php
+			endforeach;
+?>
+		}
+	}
+
+	// On click . .
+	$('#caref').on('change', function() {
+		internalca_change();
+	});
+
+	// On page load . .
+	internalca_change();
+
+<?php endif; ?>
+
+
+});
+//]]>
+</script>
+<?php
 include('foot.inc');
\ No newline at end of file