From 91a95ecaabfb6a760c522e95405396b5c8dbefaa Mon Sep 17 00:00:00 2001
From: root <root@www.cacert.org>
Date: Sun, 31 Oct 2004 07:08:42 +0000
Subject: [PATCH] bug fixes

---
 pages/account/43.php | 72 ++++++++++++++++++++++++++++++++++++++++++++
 pages/wot/10.php     |  2 +-
 www/wot.php          |  8 +++--
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/pages/account/43.php b/pages/account/43.php
index ecaaa9b..0e3049c 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -127,4 +127,76 @@
     <td class="DataTD"><?=$drow['points']?></td>
   </tr>
 </table>
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Your Assurance Points")?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><b><?=_("Date")?></b></td>
+    <td class="DataTD"><b><?=_("Who")?></b></td>
+    <td class="DataTD"><b><?=_("Points")?></b></td>
+    <td class="DataTD"><b><?=_("Location")?></b></td>
+    <td class="DataTD"><b><?=_("Method")?></b></td>
+  </tr>
+<?
+	$query = "select * from `notary` where `to`='".$row['id']."'";
+	$dres = mysql_query($query);
+	$points = 0;
+	while($drow = mysql_fetch_assoc($dres))
+	{
+		$fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$drow['from']."'"));
+		$points += $drow['points'];
+?>
+  <tr>
+    <td class="DataTD"><?=$drow['date']?></td>
+    <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['from']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td>
+    <td class="DataTD"><?=$drow['points']?></td>
+    <td class="DataTD"><?=$drow['location']?></td>
+    <td class="DataTD"><?=$drow['method']?></td>
+  </tr>
+<? } ?>
+  <tr>
+    <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+    <td class="DataTD"><?=$points?></td>
+    <td class="DataTD" colspan="2">&nbsp;</td>
+  </tr>
+</table>
+<br>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+  <tr>
+    <td colspan="5" class="title"><?=_("Assurance Points You Issued")?></td>
+  </tr>
+  <tr>
+    <td class="DataTD"><b><?=_("Date")?></b></td>
+    <td class="DataTD"><b><?=_("Who")?></b></td>
+    <td class="DataTD"><b><?=_("Points")?></b></td>
+    <td class="DataTD"><b><?=_("Location")?></b></td>
+    <td class="DataTD"><b><?=_("Method")?></b></td>
+  </tr>
+<?
+	$query = "select * from `notary` where `from`='".$row['id']."' and `to`!='".$row['id']."'";
+	$dres = mysql_query($query);
+	$points = 0;
+	while($drow = mysql_fetch_assoc($dres))
+	{
+		$fromuser = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".$drow['to']."'"));
+		$points += $drow['points'];
+?>
+  <tr>
+    <td class="DataTD"><?=$drow['date']?></td>
+    <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td>
+    <td class="DataTD"><?=$drow['points']?></td>
+    <td class="DataTD"><?=$drow['location']?></td>
+    <td class="DataTD"><?=$drow['method']?></td>
+  </tr>
+<? } ?>
+  <tr>
+    <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td>
+    <td class="DataTD"><?=$points?></td>
+    <td class="DataTD" colspan="2">&nbsp;</td>
+  </tr>
+</table>
+<br><br>
 <? } } ?>
+
diff --git a/pages/wot/10.php b/pages/wot/10.php
index af7ca61..9df1d8b 100644
--- a/pages/wot/10.php
+++ b/pages/wot/10.php
@@ -67,7 +67,7 @@
 ?>
   <tr>
     <td class="DataTD"><?=$row['date']?></td>
-    <td class="DataTD"><a href="wot.php?id=9&userid=<?=$row['from']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td>
+    <td class="DataTD"><a href="wot.php?id=9&userid=<?=$row['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td>
     <td class="DataTD"><?=$row['points']?></td>
     <td class="DataTD"><?=$row['location']?></td>
     <td class="DataTD"><?=$row['method']?></td>
diff --git a/www/wot.php b/www/wot.php
index 0133794..6391a1c 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -195,6 +195,10 @@
 			$_POST['points'] = $max - $drow['total'];
 		if($_POST['points'] < 0)
 			$_POST['points'] = 0;
+
+		if(mysql_escape_string($_POST['date']) == "")
+			$_POST['date'] = date("Y-m-d H:i:s");
+
 		$query = "insert into `notary` set `from`='".$_SESSION['profile']['id']."',
 						`to`='".$_SESSION['_config']['notarise']['id']."',
 						`points`='".intval($_POST['points'])."',
@@ -203,7 +207,7 @@
 		if($_SESSION['profile']['admin'] == 1)
 			$query .= ",\n`method`='".mysql_escape_string($_POST['method'])."'";
 		mysql_query($query);
-		if($_SESSION['profile']['id'] < 150)
+		if($_SESSION['profile']['points'] < 150)
 		{
 			$query = "insert into `notary` set `from`='".$_SESSION['profile']['id']."',
 							`to`='".$_SESSION['profile']['id']."',
@@ -212,7 +216,7 @@
 							`date`='".mysql_escape_string($_POST['date'])."',
 							`method`='Administrative Increase'";
 			mysql_query($query);
-			$_SESSION['profile']['id'] += 2;
+			$_SESSION['profile']['points'] += 2;
 		}
 
 		if($_SESSION['_config']['notarise']['language'] != "")