diff options
| author | Benny Baumann <BenBE@geshi.org> | 2013-05-13 20:00:20 +0200 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2013-05-13 20:00:20 +0200 |
| commit | 4527af1ecc920d65101fa3326eeabc3c1106ad31 (patch) | |
| tree | 8ba39d53ee5b68e72707cecbea00d638de0964b0 /www | |
| parent | db0e084bdced689e15246b97fdea7bd85e299bef (diff) | |
| parent | 872521d6831db1e5796d9fac13212bbd3498865e (diff) | |
| download | cacert-devel-4527af1ecc920d65101fa3326eeabc3c1106ad31.tar.gz cacert-devel-4527af1ecc920d65101fa3326eeabc3c1106ad31.tar.xz cacert-devel-4527af1ecc920d65101fa3326eeabc3c1106ad31.zip | |
Merge branch 'bug-1094' into release
Diffstat (limited to 'www')
| -rw-r--r-- | www/disputes.php | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/www/disputes.php b/www/disputes.php index 5b78c1e..f195ed5 100644 --- a/www/disputes.php +++ b/www/disputes.php @@ -264,7 +264,7 @@ echo _("You aren't allowed to dispute your own email addresses. Can't continue."); showfooter(); exit; - } + } $res = mysql_query("select * from `users` where `id`='$oldmemid'"); $user = mysql_fetch_assoc($res); @@ -319,12 +319,20 @@ } unset($oldid); $query = "select * from `domains` where `domain`='$domain' and `deleted`=0"; - $email = ""; if(array_key_exists('email',$_REQUEST)) $email=trim(mysql_real_escape_string($_REQUEST['email'])); $res = mysql_query($query); if(mysql_num_rows($res) <= 0) { + $query = "select 1 from `orgdomains` where `domain`='$domain'"; + $res = mysql_query($query); + if(mysql_num_rows($res) > 0) + { + showheader(_("Domain Dispute")); + printf(_("The domain '%s' is included in an organisation account. Please send a mail to %s to dispute this domain."), sanitizeHTML($domain),'<a href="mailto:support@cacert.org">support@cacert.org</a>'); + showfooter(); + exit; + } showheader(_("Domain Dispute")); - printf(_("The domain '%s' doesn't exist in the system. Can't continue."), sanitizeHTML($email)); + printf(_("The domain '%s' doesn't exist in the system. Can't continue."), sanitizeHTML($domain)); showfooter(); exit; } @@ -336,7 +344,7 @@ echo _("You aren't allowed to dispute your own domains. Can't continue."); showfooter(); exit; - } + } $domainid = $row['id']; $_SESSION['_config']['domainid'] = $domainid; |