summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-01 00:28:47 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-01 00:28:47 +0200
commitb0d02f1ff798cd2697688839c4f088f7bdaae2e7 (patch)
tree2e9f5c978074285f6b5c0b92a009fcd3338b53ff /includes
parentfa2505d3e18e4eeece2324e026ec9f99feedd74b (diff)
parent8c4068f534f61c53d113ad443ead6277eb8a874c (diff)
downloadcacert-devel-b0d02f1ff798cd2697688839c4f088f7bdaae2e7.tar.gz
cacert-devel-b0d02f1ff798cd2697688839c4f088f7bdaae2e7.tar.xz
cacert-devel-b0d02f1ff798cd2697688839c4f088f7bdaae2e7.zip
Merge branch 'bug-893' into testserver-stable
Diffstat (limited to 'includes')
-rw-r--r--includes/account.php2
-rw-r--r--includes/temp_functions.php10
2 files changed, 6 insertions, 6 deletions
diff --git a/includes/account.php b/includes/account.php
index c59e696..b445dd4 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -2879,7 +2879,7 @@
showfooter();
exit;
}
- if ( 1 !== preg_match_all('/^[a-z]\d{8}\.\d+\.\d+$/',trim($_REQUEST['arbitrationno'])) ) {
+ if ( 1 !== preg_match('/^[a-z]\d{8}\.\d+\.\d+$/i',trim($_REQUEST['arbitrationno'])) ) {
showheader(_("My CAcert.org Account!"));
echo _("You did not enter an arbitration number entry.");
showfooter();
diff --git a/includes/temp_functions.php b/includes/temp_functions.php
index 9dba0ae..c2f2c0d 100644
--- a/includes/temp_functions.php
+++ b/includes/temp_functions.php
@@ -148,7 +148,7 @@ function check_gpg_cert_running($uid,$cca=0){
if (0==$cca) {
$query = "select * from `gpg` where `memid`='$uid' and `expire`>NOW()";
}else{
- $query = "select * from `gpg` where `memid`='$uid' and `expire`>NOW()+90*86400";
+ $query = "select * from `gpg` where `memid`='$uid' and `expire`>NOW()-90*86400";
}
$res = mysql_query($query);
return mysql_num_rows($res) > 0;
@@ -162,8 +162,8 @@ function check_client_cert_running($uid,$cca=0){
$query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()";
$query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()";
}else{
- $query1 = "select from `emailcerts` where `memid`='$uid' and `expire`>NOW()+90*86400";
- $query2 = "select from `emailcerts` where `memid`='$uid' and `revoked`>NOW()+90*86400";
+ $query1 = "select from `emailcerts` where `memid`='$uid' and `expire`>NOW()-90*86400";
+ $query2 = "select from `emailcerts` where `memid`='$uid' and `revoked`>NOW()-90*86400";
}
$res = mysql_query($query1);
$r1 = mysql_num_rows($res)>0;
@@ -180,8 +180,8 @@ function check_server_cert_running($uid,$cca=0){
$query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()";
$query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()";
}else{
- $query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()+90*86400";
- $query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()+90*86400";
+ $query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()-90*86400";
+ $query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()-90*86400";
}
$res = mysql_query($query1);
$r1 = mysql_num_rows($res)>0;