diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-05-01 00:57:27 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-05-01 00:57:27 +0200 |
| commit | c912f911b7413de664754533ac62b783125a6a83 (patch) | |
| tree | eb9b040e6b8dfacc3a8ceb17e175e6ae62053351 /includes | |
| parent | b0d02f1ff798cd2697688839c4f088f7bdaae2e7 (diff) | |
| parent | 27c8a1c6ffafda639754bcd9fda7b462117f7771 (diff) | |
| download | cacert-devel-c912f911b7413de664754533ac62b783125a6a83.tar.gz cacert-devel-c912f911b7413de664754533ac62b783125a6a83.tar.xz cacert-devel-c912f911b7413de664754533ac62b783125a6a83.zip | |
Merge branch 'bug-893' into testserver-stable
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/temp_functions.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/includes/temp_functions.php b/includes/temp_functions.php index c2f2c0d..2026107 100644 --- a/includes/temp_functions.php +++ b/includes/temp_functions.php @@ -136,7 +136,7 @@ function check_email_exists($email){ // called from includes/account.php if($process != "" && $oldid == 1) // called from includes/account.php if($oldid == 50 && $process != "") $email = mysql_real_escape_string($email); - $query = "select * from `email` where `email`='$email' and `deleted`=0"; + $query = "select 1 from `email` where `email`='$email' and `deleted`=0"; $res = mysql_query($query); return mysql_num_rows($res) > 0; } @@ -146,9 +146,9 @@ function check_gpg_cert_running($uid,$cca=0){ // called from includes/account.php if($oldid == 50 && $process != "") $uid = intval($uid); if (0==$cca) { - $query = "select * from `gpg` where `memid`='$uid' and `expire`>NOW()"; + $query = "select 1 from `gpg` where `memid`='$uid' and `expire`>NOW()"; }else{ - $query = "select * from `gpg` where `memid`='$uid' and `expire`>NOW()-90*86400"; + $query = "select 1 from `gpg` where `memid`='$uid' and `expire`>(NOW()-90*86400)"; } $res = mysql_query($query); return mysql_num_rows($res) > 0; @@ -159,11 +159,11 @@ function check_client_cert_running($uid,$cca=0){ // called from includes/account.php if($oldid == 50 && $process != "") $uid = intval($uid); if (0==$cca) { - $query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()"; - $query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()"; + $query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>NOW()"; + $query2 = "select 1 from `emailcerts` 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 1 from `emailcerts` where `memid`='$uid' and `expire`>(NOW()-90*86400)"; + $query2 = "select 1 from `emailcerts` where `memid`='$uid' and `revoked`>(NOW()-90*86400)"; } $res = mysql_query($query1); $r1 = mysql_num_rows($res)>0; @@ -177,11 +177,11 @@ function check_server_cert_running($uid,$cca=0){ // called from includes/account.php if($oldid == 50 && $process != "") $uid = intval($uid); if (0==$cca) { - $query1 = "select from `domiancerts` where `memid`='$uid' and `expire`>NOW()"; - $query2 = "select from `domiancerts` where `memid`='$uid' and `revoked`>NOW()"; + $query1 = "select 1 from `domiancerts` where `memid`='$uid' and `expire`>NOW()"; + $query2 = "select 1 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 1 from `domiancerts` where `memid`='$uid' and `expire`>(NOW()-90*86400)"; + $query2 = "select 1 from `domiancerts` where `memid`='$uid' and `revoked`>(NOW()-90*86400)"; } $res = mysql_query($query1); $r1 = mysql_num_rows($res)>0; @@ -192,7 +192,7 @@ function check_server_cert_running($uid,$cca=0){ function check_is_orgadmin($uid){ // called from includes/account.php if($oldid == 50 && $process != "") $uid = intval($uid); - $query = "select * from `org` where `memid`='$uid' and `deleted`=0"; + $query = "select 1 from `org` where `memid`='$uid' and `deleted`=0"; $res = mysql_query($query); return mysql_num_rows($res) > 0; } |