cacert/cacert-webdb
9
0
Fork 0
Code Issues Pull requests 3 Projects Releases 4 Wiki Activity

Combined fixes for

Browse source 
- https://bugs.cacert.org/view.php?id=413
  "Add a web page indicating the certificate request is still pending"
- https://bugs.cacert.org/view.php?id=1138
  "Implement to log the SE activity"
- https://bugs.cacert.org/view.php?id=1221
  "Inconsistency in Assurance Management"
This commit is contained in:
Wytze van der Raay 2014-06-07 09:13:27 +00:00
parent 14aafe2212
commit 42f16aab95
5 changed files with 60 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CommModule/client.pl
View file

@ -441,7 +441,7 @@ sub calculateDays($)
{
if($_[0])
{
my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' group by `to`");
my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 group by `to`");
SysLog("Summe: $sum[0]\n") if($debug);
return ($sum[0]>=50)?730:180;

2
CommModule/usbclient.pl
View file

@ -425,7 +425,7 @@ sub calculateDays($)
{
if($_[0])
{
my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' group by `to`");
my @sum = $dbh->selectrow_array("select sum(`points`) as `total` from `notary` where `to`='".$_[0]."' and `deleted`=0 group by `to`");
SysLog("Summe: $sum[0]\n") if($debug);
return ($sum[0]>=50)?730:180;

2
includes/lib/account.php
View file

@ -52,6 +52,7 @@ function fix_assurer_flag($userID = NULL)
WHERE `n`.`to` = `u`.`id`
AND (`n`.`expire` > now()
OR `n`.`expire` IS NULL)
AND `n`.`deleted` = 0
) >= 100';
$query = mysql_query($sql);
@ -86,6 +87,7 @@ function fix_assurer_flag($userID = NULL)
`n`.`expire` > now()
OR `n`.`expire` IS NULL
)
AND `n`.`deleted` = 0
) < 100
)';

3
includes/lib/general.php
View file

@ -146,7 +146,7 @@ function runCommand($command, $input = "", &$output = null, &$errors = true) {
$Result |= 5;
}
$query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now()');
$query = mysql_query('SELECT SUM(`points`) AS `points` FROM `notary` AS `n` WHERE `n`.`to` = \''.(int)intval($userID).'\' AND `n`.`expire` < now() and `deleted` = 0');
$row = mysql_fetch_assoc($query);
if ($row['points'] < 100) {
$Result |= 3;
@ -160,4 +160,3 @@ function runCommand($command, $input = "", &$output = null, &$errors = true) {
return $Result;
}

3
scripts/cron/refresh_stats.php
View file

@ -116,7 +116,8 @@ function getDataFromLive() {
$stats['assurances_made'] = number_format(tc(
"select count(*) as `count` from `notary`
where `method` = '' or `method` = 'Face to Face Meeting'"));
where (`method` = '' or `method` = 'Face to Face Meeting')
and `deleted` = 0"));
$stats['users_1to49'] = number_format(tc(
"select count(*) as `count` from (