summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Froehlich <bernhard@cacert.org>2011-10-07 21:44:53 +0200
committerBernhard Froehlich <bernhard@cacert.org>2011-10-07 21:44:53 +0200
commit8dbed757d01be5e87c1bea960363cd1f4c768338 (patch)
tree233da37060e86a91c91bcf0a5653b26713146c34
parentce072d71bc2f116a094b9e6d7da4a239f7a9d8d6 (diff)
parentd151f600b5601e9ca84b18d360a1aebbf4a7d0f7 (diff)
downloadcacert-devel-8dbed757d01be5e87c1bea960363cd1f4c768338.tar.gz
cacert-devel-8dbed757d01be5e87c1bea960363cd1f4c768338.tar.xz
cacert-devel-8dbed757d01be5e87c1bea960363cd1f4c768338.zip
Merge branch 'bug-827' into release
-rw-r--r--includes/wot.inc.php53
1 files changed, 38 insertions, 15 deletions
diff --git a/includes/wot.inc.php b/includes/wot.inc.php
index 05ce449..9cc100d 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;
@@ -223,17 +228,32 @@
<?
}
- function output_assurances_row($assuranceid,$date,$name,$points,$location,$method,$experience)
+ function output_assurances_row($assuranceid,$date,$name,$awarded,$points,$location,$method,$experience)
+ {
+
+ $tdstyle="";
+ $emopen="";
+ $emclose="";
+
+ if ($awarded == $points)
{
+ if ($awarded == "0")
+ {
+ $tdstyle="style='background-color: #ffff80'";
+ $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" <?=$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>
<?
}
@@ -287,7 +307,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);
}
}
@@ -303,7 +323,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);
}
}
@@ -318,8 +338,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'])
@@ -333,8 +356,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;