summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-01 02:03:54 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-01 02:03:54 +0200
commit4bcceb373cf63cec154b38d5ba3d97c8cee95b39 (patch)
treecd48026338b562c14f711317ffe054b5c868be3f
parentc912f911b7413de664754533ac62b783125a6a83 (diff)
parentc3f0e56d1ee679f193758538d63a6d182aa0f9e0 (diff)
downloadcacert-devel-4bcceb373cf63cec154b38d5ba3d97c8cee95b39.tar.gz
cacert-devel-4bcceb373cf63cec154b38d5ba3d97c8cee95b39.tar.xz
cacert-devel-4bcceb373cf63cec154b38d5ba3d97c8cee95b39.zip
Merge branch 'bug-1136' into testserver-stable
-rw-r--r--includes/temp_functions.php2
-rw-r--r--pages/account/43.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/temp_functions.php b/includes/temp_functions.php
index 2026107..37525b0 100644
--- a/includes/temp_functions.php
+++ b/includes/temp_functions.php
@@ -239,7 +239,7 @@ function revoke_all_private_cert($uid){
//revokes all certificates linked to a personal accounts
//gpg revokation needs to be added to a later point
$uid=intval($uid);
- $query = "select * from `email` where `memid`='".$id."' and `id`!='".$emailid."'" ;
+ $query = "select * from `email` where `memid`='".$id."'";
$res=mysql_query($query);
while($row = mysql_fetch_assoc($res)){
revoke_all_client_cert($row['id']);
diff --git a/pages/account/43.php b/pages/account/43.php
index 100c136..b9ac32a 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -788,7 +788,7 @@ include_once($_SESSION['_config']['filepath']."/includes/notary.inc.php");
<td colspan="6" class="title">
<form method="post" action="account.php" onSubmit="if(!confirm('<?=_("Are you sure you want to revoke all private certificates?")?>')) return false;">
<input type="hidden" name="action" value="revokecert">
- <input type="hidden" name="oldid" value="<?=intval($id)?>">
+ <input type="hidden" name="oldid" value="43">
<input type="hidden" name="userid" value="<?=intval($userid)?>">
<input type="submit" value="<?=_('revoke certificates')?>">
</form>