summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Dörre <felix@dogcraft.de>2015-04-19 15:09:45 +0200
committerFelix Dörre <felix@dogcraft.de>2015-04-21 21:14:04 +0200
commite12f929ab962e023f613a7411e49ebbbaad4700a (patch)
treed63e664c84e6fef0f4cb8b3b6a1e32ed8b499c39
parent305c23ce3d42f1302f9d12f4b97758871f351539 (diff)
downloadcacert-devel-e12f929ab962e023f613a7411e49ebbbaad4700a.tar.gz
cacert-devel-e12f929ab962e023f613a7411e49ebbbaad4700a.tar.xz
cacert-devel-e12f929ab962e023f613a7411e49ebbbaad4700a.zip
upd: fixup for includes/lib/account for administrative-increase-assurances
-rw-r--r--includes/lib/account.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/lib/account.php b/includes/lib/account.php
index aab98a4..6e17dda 100644
--- a/includes/lib/account.php
+++ b/includes/lib/account.php
@@ -49,7 +49,7 @@ function fix_assurer_flag($userID = NULL)
)
AND (
SELECT SUM(`awarded`) FROM `notary` AS `n`
- WHERE `n`.`to` = `u`.`id`
+ WHERE `n`.`to` = `u`.`id` AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to`
AND (`n`.`expire` > now()
OR `n`.`expire` IS NULL)
AND `n`.`deleted` = 0
@@ -82,7 +82,7 @@ function fix_assurer_flag($userID = NULL)
)
OR (
SELECT SUM(`awarded`) FROM `notary` AS `n`
- WHERE `n`.`to` = `u`.`id`
+ WHERE `n`.`to` = `u`.`id` AND `n`.`method` != 'Administrative Increase' AND `n`.`from` != `n`.`to`
AND (
`n`.`expire` > now()
OR `n`.`expire` IS NULL