Merge pull request 'Improve client certificate issuing' (!17) from fix-client-cert-issues into main
Reviewed-on: #17 Reviewed-by: Brian Mc Cullough <bmccullough@cacert.org> Reviewed-by: Dirk Astrath <dirk@cacert.org>
This commit is contained in:
commit
408796eaf0
1 changed files with 9 additions and 3 deletions
|
@ -253,7 +253,8 @@ function buildSubjectFromSession() {
|
|||
if(!(array_key_exists('addid',$_REQUEST) && is_array($_REQUEST['addid'])) && $_REQUEST['SSO'] != '1')
|
||||
{
|
||||
showheader(_("My CAcert.org Account!"));
|
||||
echo _("I didn't receive a valid Certificate Request, hit the back button and try again.");
|
||||
?><p><?= _("I didn't receive a valid Certificate Request, hit the back button and try again."); ?></p>
|
||||
<p><?= _("You did not select any email address and did not check the SSO option."); ?></p><?
|
||||
showfooter();
|
||||
exit;
|
||||
}
|
||||
|
@ -495,8 +496,13 @@ function buildSubjectFromSession() {
|
|||
`disablelogin`='".($_SESSION['_config']['disablelogin']?1:0)."',
|
||||
`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
|
||||
`md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."',
|
||||
`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'";
|
||||
mysql_query($query);
|
||||
`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."',
|
||||
`coll_found`=0";
|
||||
|
||||
if (!mysql_query($query)) {
|
||||
trigger_error("Query failed: " . mysql_errno() . ": " . mysql_error(), E_USER_ERROR);
|
||||
}
|
||||
|
||||
$emailid = mysql_insert_id();
|
||||
if(is_array($addys))
|
||||
foreach($addys as $addy)
|
||||
|
|
Loading…
Reference in a new issue