Combined fixes for

- 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"

CommModule/client.pl

@@ -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;

CommModule/usbclient.pl

@@ -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;

includes/lib/account.php

@@ -51,7 +51,8 @@ function fix_assurer_flag($userID = NULL)
 				SELECT SUM(`points`) FROM `notary` AS `n`
 				WHERE `n`.`to` = `u`.`id`
 					AND (`n`.`expire` > now()
-					OR `n`.`expire` IS NULL)
+					     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
 			)';
 

includes/lib/general.php

@@ -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;
 	}
-	

scripts/cron/refresh_stats.php

@@ -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 (