bug 1138: added assurances to SE log, rework of assurance delete form delete assurance to deleted=Now()

3 files changed, 12 insertions, 5 deletions

diff --git a/pages/account/43.php b/pages/account/43.php
index 2c60226..73fb071 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -133,7 +133,7 @@ if(intval($_REQUEST['userid']) > 0) {
             if ($res) {
                 $trow = mysql_fetch_assoc($res);
             }
-            mysql_query("delete from `notary` where `id`='$assurance'");
+            mysql_query("update `notary` set `deleted`=NOW() where `id`='$assurance'");
             if ($trow) {
                 fix_assurer_flag($trow['to']);
                 write_se_log($userid, $_SESSION['profile']['id'], 'SE assurance revoke', $ticketno);
diff --git a/pages/account/59.php b/pages/account/59.php
index 0eaafc4..4cf81c0 100644
--- a/pages/account/59.php
+++ b/pages/account/59.php
@@ -261,6 +261,13 @@ if (1 == $support) {
 <br/>
 
 <?
+
+output_log_given_assurances($userid, $support);
+?><br/><?
+
+output_log_received_assurances($userid, $support);
+?><br/><?
+
 $dres = get_se_log($userid);
 $colspan = 2;
 if (1 == $support) {
diff --git a/pages/wot/10.php b/pages/wot/10.php
index bc76a86..e490af9 100644
--- a/pages/wot/10.php
+++ b/pages/wot/10.php
@@ -36,8 +36,8 @@
 			WHERE `users`.`id` = `notary`.`from` AND `notary`.`from` != `notary`.`to`
 			GROUP BY `notary`.`from` HAVING count(*) > '$rc' ORDER BY `notary`.`when` DESC";
 */
-	$query = "SELECT count(*) AS `list` FROM `users` 
-			inner join `notary` on `users`.`id` = `notary`.`from` 
+	$query = "SELECT count(*) AS `list` FROM `users`
+			inner join `notary` on `users`.`id` = `notary`.`from`
 			GROUP BY `notary`.`from` HAVING count(*) > '$rc'";
 
 	$rank = mysql_num_rows(mysql_query($query)) + 1;
@@ -64,7 +64,7 @@
     <td class="DataTD"><b><?=_("Method")?></b></td>
   </tr>
 <?
-	$query = "select * from `notary` where `to`='".intval($_SESSION['profile']['id'])."'";
+	$query = "select * from `notary` where `deleted`=0 and `to`='".intval($_SESSION['profile']['id'])."'";
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{
@@ -114,7 +114,7 @@ if ($thawte)
   </tr>
 <?
 	$points = 0;
-	$query = "select * from `notary` where `from`='".intval($_SESSION['profile']['id'])."' and `to`!='".intval($_SESSION['profile']['id'])."'";
+	$query = "select * from `notary` where `from`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `to`!='".intval($_SESSION['profile']['id'])."'";
 	$res = mysql_query($query);
 	while($row = mysql_fetch_assoc($res))
 	{