Merge branch 'main' into fix-email-address-maintenance-bug-1543
This commit is contained in:
commit
df612b08ba
1 changed files with 4 additions and 4 deletions
|
@ -1964,8 +1964,8 @@ function buildSubjectFromSession() {
|
|||
|
||||
$csrsubject .= buildSubjectFromSession();
|
||||
|
||||
$type="";
|
||||
if($_REQUEST["ocspcert"]!="" && $_SESSION['profile']['admin'] == 1) $type="8";
|
||||
$type=0;
|
||||
if($_REQUEST["ocspcert"]!="" && $_SESSION['profile']['admin'] == 1) $type=8;
|
||||
if($_SESSION['_config']['rootcert'] < 1 || $_SESSION['_config']['rootcert'] > 2)
|
||||
$_SESSION['_config']['rootcert'] = 1;
|
||||
|
||||
|
@ -1978,7 +1978,7 @@ function buildSubjectFromSession() {
|
|||
`subject`='".mysql_real_escape_string($csrsubject)."',
|
||||
`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
|
||||
`md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."',
|
||||
`type`='".$type."',
|
||||
`type`=$type,
|
||||
`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'";
|
||||
} else {
|
||||
$query = "insert into `orgdomaincerts` set
|
||||
|
@ -1988,7 +1988,7 @@ function buildSubjectFromSession() {
|
|||
`subject`='".mysql_real_escape_string($csrsubject)."',
|
||||
`rootcert`='".intval($_SESSION['_config']['rootcert'])."',
|
||||
`md`='".mysql_real_escape_string($_SESSION['_config']['hash_alg'])."',
|
||||
`type`='".$type."',
|
||||
`type`=$type,
|
||||
`description`='".mysql_real_escape_string($_SESSION['_config']['description'])."'";
|
||||
}
|
||||
mysql_query($query);
|
||||
|
|
Loading…
Reference in a new issue