summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <ted@test.cacert.org>2018-11-19 22:28:05 +0000
committerBernhard Fröhlich <ted@test.cacert.org>2018-11-19 22:28:05 +0000
commit35199b7bb05951ec51c45ea650aaff632eab1147 (patch)
tree9df420439f4005b01158fd82c620f2d67d7d7a14
parent96ad69b12a9a49b00f969ad4f9990f0ac4739dbe (diff)
downloadcacert-devel-35199b7bb05951ec51c45ea650aaff632eab1147.tar.gz
cacert-devel-35199b7bb05951ec51c45ea650aaff632eab1147.tar.xz
cacert-devel-35199b7bb05951ec51c45ea650aaff632eab1147.zip
Fixed some merge errors
-rw-r--r--includes/account.php8
-rw-r--r--includes/notary.inc.php1
2 files changed, 5 insertions, 4 deletions
diff --git a/includes/account.php b/includes/account.php
index f82e647..e158c2c 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -914,8 +914,8 @@ function buildSubjectFromSession() {
`rootcert`='".intval($row['rootcert'])."',
`type`='".intval($row['type'])."',
`pkhash`='".mysqli_real_escape_string($_SESSION['mconn'], $row['pkhash'])."',
+ `md`='".HashAlgorithms::clean($row['md'])."',
`description`='".mysqli_real_escape_string($_SESSION['mconn'], $row['description'])."'";
- `md`='".HashAlgorithms::clean($row['md'])."'";
mysqli_query($_SESSION['mconn'],$query);
$newid = mysqli_insert_id($_SESSION['mconn']);
$newfile=generatecertpath("csr","server",$newid);
@@ -1095,8 +1095,8 @@ function buildSubjectFromSession() {
`disablelogin`='".intval($row['disablelogin'])."',
`codesign`='".intval($row['codesign'])."',
`rootcert`='".intval($row['rootcert'])."',
+ `md`='".HashAlgorithms::clean($row['md'])."',
`description`='".mysqli_real_escape_string($_SESSION['mconn'], $row['description'])."'";
- `md`='".HashAlgorithms::clean($row['md'])."'";
mysqli_query($_SESSION['mconn'],$query);
$newid = mysqli_insert_id($_SESSION['mconn']);
$newfile=generatecertpath("csr","client",$newid);
@@ -1735,8 +1735,8 @@ function buildSubjectFromSession() {
`modified`=NOW(),
`codesign`='".intval($row['codesign'])."',
`rootcert`='".intval($row['rootcert'])."',
+ `md`='".HashAlgorithms::clean($row['md'])."',
`description`='".mysqli_real_escape_string($_SESSION['mconn'], $row['description'])."'";
- `md`='".HashAlgorithms::clean($row['md'])."'";
mysqli_query($_SESSION['mconn'],$query);
$newid = mysqli_insert_id($_SESSION['mconn']);
$newfile=generatecertpath("csr","orgclient",$newid);
@@ -2088,8 +2088,8 @@ function buildSubjectFromSession() {
`subject`='".mysqli_real_escape_string($_SESSION['mconn'], $row['subject'])."',
`type`='".intval($row['type'])."',
`rootcert`='".intval($row['rootcert'])."',
+ `md`='".HashAlgorithms::clean($row['md'])."',
`description`='".mysqli_real_escape_string($_SESSION['mconn'], $row['description'])."'";
- `md`='".HashAlgorithms::clean($row['md'])."'";
mysqli_query($_SESSION['mconn'],$query);
$newid = mysqli_insert_id($_SESSION['mconn']);
//echo "NewID: $newid<br/>\n";
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index f931bd8..b6cee0f 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1666,6 +1666,7 @@ function write_se_log($uid, $adminid, $type, $info, $typeid=1){
$info = mysqli_real_escape_string($_SESSION['mconn'], g($info);
$typeid = intval($typeid);
$query="insert into `adminlog` (`when`, `uid`, `adminid`,`type`,`information`,`actiontypeid`) values
+ (Now(), $uid, $adminid, '$type', '$info')";
return mysqli_query($_SESSION['mconn'], $query);
}