From 7bde59f452e76602a01262f8a5797345565fa6d8 Mon Sep 17 00:00:00 2001
From: dirk <beliebige_email_adresse@fidocon.de>
Date: Wed, 7 Sep 2011 22:38:50 +0200
Subject: bug-827 corrected Unknown and 3rd

---
 includes/wot.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 05ce449..657fde9 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -333,8 +333,8 @@
 				if ($points <= 2)	       // maybe limit to 35/50 pts in the future?
 					$points = 0;
 				break;
-			case 'unknown':			 // to be revoked in the future? limit to max 50 pts?
-			case 'Trusted 3rd Parties':	     // to be revoked in the future? limit to max 35 pts?
+			case 'Unknown':			 // to be revoked in the future? limit to max 50 pts?
+			case 'Trusted Third Parties':	     // to be revoked in the future? limit to max 35 pts?
 			case '':				// to be revoked in the future? limit to max 50 pts?
 			case 'Face to Face Meeting':	    // normal assurances, limit to 35/50 pts in the future?
 				break;
-- 
cgit v1.2.1


From d7add31fa77ecfc333acece499708e1c9cb83c81 Mon Sep 17 00:00:00 2001
From: dirk <beliebige_email_adresse@fidocon.de>
Date: Tue, 20 Sep 2011 00:42:04 +0200
Subject: bug-827 added behavior of deleted accounts

---
 includes/wot.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 657fde9..2f12c01 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -147,7 +147,12 @@
 	{
 		$name = trim($name);
 		if($name == "")
-			$name = _("Deleted before Verification");
+		{
+			if ($userid == 0)
+				$name = _("System");
+			else
+				$name = _("Deleted account");
+		}
 		else
 			$name = "<a href='wot.php?id=9&amp;userid=".intval($userid)."'>$name</a>";
 		return $name;
-- 
cgit v1.2.1


From f6f19d4bd23f9edcf9e90b43b845718dcd1c08a6 Mon Sep 17 00:00:00 2001
From: dirk <beliebige_email_adresse@fidocon.de>
Date: Tue, 20 Sep 2011 01:22:32 +0200
Subject: bug-827 changed behaviour of awarded=null

---
 includes/wot.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 2f12c01..dc75899 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -323,8 +323,11 @@
 
 	function calc_points($row)
 	{
-		if (intval($row['points']) < intval($row['awarded']))
-			$points = intval($row['awarded']);      // if 'sum of added points' > 100, awarded shows correct value
+		$awarded = intval($row['awarded']);
+		if ($awarded == "")
+			$awarded = 0;
+		if (intval($row['points']) < $awarded)
+			$points = $awarded;      // if 'sum of added points' > 100, awarded shows correct value
 		else
 			$points = intval($row['points']);       // on very old assurances, awarded is '0' instead of correct value
 		switch ($row['method'])
-- 
cgit v1.2.1


From 97ff331594de71b9565319338d881ddcdf3ee932 Mon Sep 17 00:00:00 2001
From: dirk <beliebige_email_adresse@fidocon.de>
Date: Tue, 27 Sep 2011 23:35:30 +0200
Subject: added italics line for awarded=points=0

---
 includes/wot.inc.php | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index dc75899..89dee8c 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -228,17 +228,27 @@
 <?
 	}
 
-	function output_assurances_row($assuranceid,$date,$name,$points,$location,$method,$experience)
+	function output_assurances_row($assuranceid,$date,$name,$awarded,$points,$location,$method,$experience)
 	{
+
+	$emopen="";
+	$emclose="";
+
+	if ($awarded == $points)
+	{
+		$emopen="<em>";
+		$emclose="</em>";
+	}
+
 ?>
     <tr>
-	<td class="DataTD"><?=$assuranceid?></td>
-    	<td class="DataTD"><?=$date?></td>
-    	<td class="DataTD"><?=$name?></td>
-    	<td class="DataTD"><?=$points?></td>
-    	<td class="DataTD"><?=$location?></td>
-    	<td class="DataTD"><?=$method?></td>
-    	<td class="DataTD"><?=$experience?></td>
+	<td class="DataTD"><?=$emopen?><?=$assuranceid?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$date?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$name?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$awarded?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$location?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$method?><?=$emclose?></td>
+    	<td class="DataTD"><?=$emopen?><?=$experience?><?=$emclose?></td>
     </tr>
 <?
 	}
@@ -292,7 +302,7 @@
 			$fromuser = get_user (intval($row['to'])); 
 			calc_experience ($row,$points,$experience,$sum_experience);
 			$name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to']));
-			output_assurances_row (intval($row['id']),$row['date'],$name,intval($row['awarded']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);
+			output_assurances_row (intval($row['id']),$row['date'],$name,intval($row['awarded']),intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);
 		}
 	}
 
@@ -308,7 +318,7 @@
 			$fromuser = get_user (intval($row['from']));
 			calc_assurances ($row,$points,$experience,$sum_experience,$awarded);
 			$name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from']));
-			output_assurances_row (intval($row['id']),$row['date'],$name,$awarded,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);
+			output_assurances_row (intval($row['id']),$row['date'],$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience);
 		}
 	}
 
-- 
cgit v1.2.1


From 4861134ce06ef2d784cf981a5519c392a45f8136 Mon Sep 17 00:00:00 2001
From: dirk <beliebige_email_adresse@fidocon.de>
Date: Tue, 27 Sep 2011 23:41:02 +0200
Subject: bug-827 added italics line for $awarded=$points=0

---
 includes/wot.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 89dee8c..3cbafcb 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -236,8 +236,11 @@
 
 	if ($awarded == $points)
 	{
-		$emopen="<em>";
-		$emclose="</em>";
+		if ($awarded == "0")
+		{
+			$emopen="<em>";
+			$emclose="</em>";
+		}
 	}
 
 ?>
-- 
cgit v1.2.1


From d151f600b5601e9ca84b18d360a1aebbf4a7d0f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20T=C3=A4nzer?= <neo@nhng.de>
Date: Wed, 28 Sep 2011 05:05:36 +0200
Subject: bug 827: color the emphasized rows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch supplied by Uli60

Signed-off-by: Michael Tänzer <neo@nhng.de>
---
 includes/wot.inc.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 3cbafcb..9cc100d 100644
--- a/includes/wot.inc.php
+++ b/includes/wot.inc.php
@@ -231,6 +231,7 @@
 	function output_assurances_row($assuranceid,$date,$name,$awarded,$points,$location,$method,$experience)
 	{
 
+	$tdstyle="";
 	$emopen="";
 	$emclose="";
 
@@ -238,6 +239,7 @@
 	{
 		if ($awarded == "0")
 		{
+			$tdstyle="style='background-color: #ffff80'";
 			$emopen="<em>";
 			$emclose="</em>";
 		}
@@ -245,13 +247,13 @@
 
 ?>
     <tr>
-	<td class="DataTD"><?=$emopen?><?=$assuranceid?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$date?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$name?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$awarded?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$location?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$method?><?=$emclose?></td>
-    	<td class="DataTD"><?=$emopen?><?=$experience?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$name?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$awarded?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$location?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$method?><?=$emclose?></td>
+	<td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$experience?><?=$emclose?></td>
     </tr>
 <?
 	}
-- 
cgit v1.2.1