Project

General

Profile

« Previous | Next » 

Revision da0f70ed

Added by Jim Pingle about 9 years ago

Add a field to CA/Cert pages for OU, which is required by some external CAs and users. Fixes #6672

View differences:

src/usr/local/www/system_certmanager.php
391 391
						'organizationName' => $pconfig['dn_organization'],
392 392
						'emailAddress' => $pconfig['dn_email'],
393 393
						'commonName' => $pconfig['dn_commonname']);
394

  
394
					if (!empty($pconfig['dn_organizationalunit'])) {
395
						$dn['organizationalUnitName'] = $pconfig['dn_organizationalunit'];
396
					}
395 397
					if (count($altnames)) {
396 398
						$altnames_tmp = "";
397 399
						foreach ($altnames as $altname) {
......
417 419
						'organizationName' => $pconfig['csr_dn_organization'],
418 420
						'emailAddress' => $pconfig['csr_dn_email'],
419 421
						'commonName' => $pconfig['csr_dn_commonname']);
422
					if (!empty($pconfig['csr_dn_organizationalunit'])) {
423
						$dn['organizationalUnitName'] = $pconfig['csr_dn_organizationalunit'];
424
					}
420 425
					if (count($altnames)) {
421 426
						$altnames_tmp = "";
422 427
						foreach ($altnames as $altname) {
......
686 691
		'Organization',
687 692
		'text',
688 693
		$pconfig['dn_organization'],
689
		['placeholder' => 'e.g. My Company Inc.']
694
		['placeholder' => 'e.g. My Company Inc']
695
	));
696

  
697
	$section->addInput(new Form_Input(
698
		'dn_organizationalunit',
699
		'Organizational Unit',
700
		'text',
701
		$pconfig['dn_organizationalunit'],
702
		['placeholder' => 'e.g. My Department Name (optional)']
690 703
	));
691 704

  
692 705
	$section->addInput(new Form_Input(
......
805 818
		'Organization',
806 819
		'text',
807 820
		$pconfig['csr_dn_organization'],
808
		['placeholder' => 'e.g. My Company Inc.']
821
		['placeholder' => 'e.g. My Company Inc']
822
	));
823

  
824
	$section->addInput(new Form_Input(
825
		'csr_dn_organizationalunit',
826
		'Organizational Unit',
827
		'text',
828
		$pconfig['csr_dn_organizationalunit'],
829
		['placeholder' => 'e.g. My Department Name (optional)']
809 830
	));
810 831

  
811 832
	$section->addInput(new Form_Input(
......
1093 1114
					$('#dn_city').val("<?=$subject[2]['v'];?>");
1094 1115
					$('#dn_organization').val("<?=$subject[3]['v'];?>");
1095 1116
					$('#dn_email').val("<?=$subject[4]['v'];?>");
1117
					$('#dn_organizationalunit').val("<?=$subject[6]['v'];?>");
1096 1118
					break;
1097 1119
<?php
1098 1120
			endforeach;

Also available in: Unified diff