cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

WIP: fix/bug-1551 #6

Closed
bmc wants to merge 3 commits from fix/bug-1551 into main
pull from: fix/bug-1551
merge into: cacert:main
Conversation 2 Commits 3 Files changed 1 +167 -161
1 changed files with 167 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
pages/account/3.php
View file

@ -22,10 +22,15 @@
<p><?= _( "I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors." ) ?></p>
<p><?=_("CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at")?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
<p><?= _( "CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at" ) ?>
<a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
<p><?= _( "If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence." ) ?></p>
<h5><?= _( "There is a new method for generating a CSR for this page." ) ?></h5>
<p><?= _( "It is completely described in https://wiki.cacert.org/TutorialsHowto/Generate-new-CSR, which you should follow. At the point where it says \"Copy CSR to Clipboard\" do that and come back to this page and paste the result into the textbox at the bottom of this page." ) ?></p>
<p><a href='https://community.cacert.org/clientcert' target=_blank ><?= _( "Here is a link to that procedure. It will open in a new tab." ) <</p>
<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
@ -39,15 +44,16 @@
<?
$query = "select * from `email` where `memid`='" . intval( $_SESSION[ 'profile' ][ 'id' ] ) . "' and `deleted`=0 and `hash`=''";
$res = mysql_query( $query );
while($row = mysql_fetch_assoc($res))
{ ?>
while ( $row = mysql_fetch_assoc( $res ) ) { ?>
<tr>
<td class="DataTD"><input type="checkbox" id="addid<?=intval($row['id'])?>" name="addid[]" value="<?=intval($row['id'])?>"></td>
<td class="DataTD" align="left"><label for="addid<?=intval($row['id'])?>"><?=sanitizeHTML($row['email'])?></label></td>
<td class="DataTD"><input type="checkbox" id="addid<?= intval( $row[ 'id' ] ) ?>" name="addid[]"
value="<?= intval( $row[ 'id' ] ) ?>"></td>
<td class="DataTD" align="left"><label
for="addid<?= intval( $row[ 'id' ] ) ?>"><?= sanitizeHTML( $row[ 'email' ] ) ?></label>
</td>
</tr>
<? }
if($_SESSION['profile']['points'] >= 50)
{
if ( $_SESSION[ 'profile' ][ 'points' ] >= 50 ) {
$fname = $_SESSION[ 'profile' ][ 'fname' ];
$mname = $_SESSION[ 'profile' ][ 'mname' ];
$lname = $_SESSION[ 'profile' ][ 'lname' ];
@ -63,15 +69,18 @@ if($_SESSION['profile']['points'] >= 50)
<? } ?>
<? if ( $fname && $mname && $lname ) { ?>
<input type="radio" id="incname2" name="incname" value="2"/>
<label for="incname2"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname?>'</label><br />
<label for="incname2"><?= _( "Include" ) ?> '<?= $fname . " " . $mname . " " . $lname ?>
'</label><br/>
<? } ?>
<? if ( $fname && $lname && $suffix ) { ?>
<input type="radio" id="incname3" name="incname" value="3"/>
<label for="incname3"><?=_("Include")?> '<?=$fname." ".$lname." ".$suffix?>'</label><br />
<label for="incname3"><?= _( "Include" ) ?> '<?= $fname . " " . $lname . " " . $suffix ?>
'</label><br/>
<? } ?>
<? if ( $fname && $mname && $lname && $suffix ) { ?>
<input type="radio" id="incname4" name="incname" value="4"/>
<label for="incname4"><?=_("Include")?> '<?=$fname." ".$mname." ".$lname." ".$suffix?>'</label><br />
<label for="incname4"><?= _( "Include" ) ?>
'<?= $fname . " " . $mname . " " . $lname . " " . $suffix ?>'</label><br/>
<? } ?>
</td>
</tr>
@ -83,7 +92,8 @@ if($_SESSION['profile']['points'] >= 50)
</td>
<td class="DataTD" align="left">
<label for="login"><?= _( "Enable certificate login with this certificate" ) ?><br/>
<?=_("By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .")?></label>
<?= _( "By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ ." ) ?>
</label>
</td>
</tr>
<tr>
@ -93,6 +103,12 @@ if($_SESSION['profile']['points'] >= 50)
</td>
</tr>
<td class="DataTD" colspan="2" align="left">
<input type="radio" id="root2" name="rootcert" value="2" checked="checked"/> <label
for="root2"><?= _( "Sign by class 3 root certificate" ) ?></label><br/>
<?= str_replace( "\n", "<br />\n", wordwrap( _( "Please note: Since you are using a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain." ), 125 ) ) ?>
</td>
<tr name="expertoff" style="display:none">
<td class="DataTD">
<input type="checkbox" id="expertbox" name="expertbox" onchange="showExpert(this.checked)"/>
@ -102,18 +118,6 @@ if($_SESSION['profile']['points'] >= 50)
</td>
</tr>
<?
if($_SESSION['profile']['points'] >= 50)
{
?>
<tr name="expert">
<td class="DataTD" colspan="2" align="left">
<input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
<input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label><br />
<?=str_replace("\n", "<br />\n", wordwrap(_("Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain."), 125))?>
</td>
</tr>
<? } ?>
<tr name="expert">
<td class="DataTD" colspan="2" align="left">
@ -121,8 +125,10 @@ if($_SESSION['profile']['points'] >= 50)
<?
foreach ( HashAlgorithms::getInfo() as $algorithm => $display_info ) {
?>
<input type="radio" id="hash_alg_<?=$algorithm?>" name="hash_alg" value="<?=$algorithm?>" <?=(HashAlgorithms::$default === $algorithm)?'checked="checked"':''?> />
<label for="hash_alg_<?=$algorithm?>"><?=$display_info['name']?><?=$display_info['info']?' - '.$display_info['info']:''?></label><br />
<input type="radio" id="hash_alg_<?= $algorithm ?>" name="hash_alg"
value="<?= $algorithm ?>" <?= (HashAlgorithms::$default === $algorithm) ? 'checked="checked"' : '' ?> />
<label for="hash_alg_<?= $algorithm ?>"><?= $display_info[ 'name' ] ?><?= $display_info[ 'info' ] ? ' - ' . $display_info[ 'info' ] : '' ?></label>
<br/>
<?
}
?>
@ -136,7 +142,8 @@ if($_SESSION['profile']['points'] >= 50)
</td>
<td class="DataTD" align="left">
<label for="codesign"><?= _( "Code Signing" ) ?><br/>
<?=_("Please note: By ticking this box you will automatically have your name included in the certificate.")?></label>
<?= _( "Please note: By ticking this box you will automatically have your name included in the certificate." ) ?>
</label>
</td>
</tr>
<? } ?>
@ -152,12 +159,10 @@ if($_SESSION['profile']['points'] >= 50)
</td>
</tr>
<tr name="expert">
<td class="DataTD" colspan="2">
<label for="optionalCSR"><?=_("Optional Client CSR, no information on the certificate will be used")?></label><br />
<label for="optionalCSR"><?= _( "Client CSR, no information on the certificate will be used" ) ?></label><br/>
<textarea id="optionalCSR" name="optionalCSR" cols="80" rows="5"></textarea>
</td>
</tr>
<tr>
@ -177,20 +182,21 @@ if($_SESSION['profile']['points'] >= 50)
</form>
<script language="javascript">
function showExpert(a)
{
function showExpert(a) {
b = document.getElementsByName("expert");
for(i=0;b.length>i;i++)
{
if(!a) {b[i].setAttribute("style","display:none"); }
else {b[i].removeAttribute("style");}
for (i = 0; b.length > i; i++) {
if (!a) {
b[i].setAttribute("style", "display:none");
} else {
b[i].removeAttribute("style");
}
}
b = document.getElementsByName("expertoff");
for(i=0;b.length>i;i++)
{
for (i = 0; b.length > i; i++) {
b[i].removeAttribute("style");
}
}
showExpert(false);
</script>