summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2013-02-19 23:15:24 +0100
committerINOPIAE <inopiae@cacert.org>2013-02-19 23:15:24 +0100
commitaa92c81a1c81c0e4e8cc6ff300fd3941469a5077 (patch)
tree20ddd02eb3170ca33226bc1f94f85448af19c25e /includes
parent9508b647a4255b3e24cfe9e734d6703ee6466ef0 (diff)
downloadcacert-devel-aa92c81a1c81c0e4e8cc6ff300fd3941469a5077.tar.gz
cacert-devel-aa92c81a1c81c0e4e8cc6ff300fd3941469a5077.tar.xz
cacert-devel-aa92c81a1c81c0e4e8cc6ff300fd3941469a5077.zip
bug 1136: fixed returns and revoke_cert calls
Diffstat (limited to 'includes')
-rw-r--r--includes/temp_functions.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/temp_functions.php b/includes/temp_functions.php
index 2d67c22..9dba0ae 100644
--- a/includes/temp_functions.php
+++ b/includes/temp_functions.php
@@ -8,7 +8,7 @@ function account_email_delete($mailid){
//called from www/diputes.php if($type == "reallyemail") / if($action == "accept")
//called from account_delete
$mailid = intval($mailid);
- revoke_client_cert($mailid);
+ revoke_all_client_cert($mailid);
$query = "update `email` set `deleted`=NOW() where `id`='$mailid'";
mysql_query($query);
}
@@ -20,7 +20,7 @@ function account_domain_delete($domainid){
//called from www/diputes.php if($type == "reallydomain") / if($action == "accept")
//called from account_delete
$domainid = intval($domainid);
- revoke_server_cert($domainid);
+ revoke_all_server_cert($domainid);
mysql_query(
"update `domains`
set `deleted`=NOW()
@@ -166,9 +166,9 @@ function check_client_cert_running($uid,$cca=0){
$query2 = "select from `emailcerts` where `memid`='$uid' and `revoked`>NOW()+90*86400";
}
$res = mysql_query($query1);
- return $r1 = mysql_num_rows($res)>0;
+ $r1 = mysql_num_rows($res)>0;
$res = mysql_query($query2);
- return $r2 = mysql_num_rows($res)>0;
+ $r2 = mysql_num_rows($res)>0;
return !!($r1 || $r2);
}
@@ -184,9 +184,9 @@ function check_server_cert_running($uid,$cca=0){
$query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()+90*86400";
}
$res = mysql_query($query1);
- return $r1 = mysql_num_rows($res)>0;
+ $r1 = mysql_num_rows($res)>0;
$res = mysql_query($query2);
- return $r2 = mysql_num_rows($res)>0;
+ $r2 = mysql_num_rows($res)>0;
return !!($r1 || $r2);
}
function check_is_orgadmin($uid){