summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-10-14 22:07:16 +0200
committerBenny Baumann <BenBE@geshi.org>2014-10-14 22:07:16 +0200
commit3b8168b5e75e1a337823972035b987a66f46134a (patch)
tree5a56418a0a4552573b66b6c7fd809f0fdadd736f
parent2bb611d7c41ebf27c87f880182f4a51d0a3176bb (diff)
parent3a5f13b14f21ce3e0ff8107c31c563a9de8c3fb0 (diff)
downloadcacert-devel-3b8168b5e75e1a337823972035b987a66f46134a.tar.gz
cacert-devel-3b8168b5e75e1a337823972035b987a66f46134a.tar.xz
cacert-devel-3b8168b5e75e1a337823972035b987a66f46134a.zip
Merge branch 'bug-1310' into testserver-stable
-rw-r--r--www/disputes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/disputes.php b/www/disputes.php
index eab3d68..bd6d5c1 100644
--- a/www/disputes.php
+++ b/www/disputes.php
@@ -224,7 +224,7 @@
}
//check if email belongs to locked account
- $res = mysql_query("select 1 from `email`, `users` where `email`.`email`='$email' and `email`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1)");
+ $res = mysql_query("select 1 from `email`, `users` where `email`.`email`='$email' and `email`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1) and `email`.`deleted` = 0");
if(mysql_num_rows($res) > 0)
{
showheader(_("Email Dispute"));
@@ -317,7 +317,7 @@
}
//check if domain belongs to locked account
- $res = mysql_query("select 1 from `domains`, `users` where `domains`.`domain`='$domain' and `domains`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1)");
+ $res = mysql_query("select 1 from `domains`, `users` where `domains`.`domain`='$domain' and `domains`.`memid`=`users`.`id` and (`users`.`assurer_blocked`=1 or `users`.`locked`=1) and `domains`.`deleted` = 0");
if(mysql_num_rows($res) > 0)
{
showheader(_("Domain Dispute"));