diff options
author | dirk <beliebige_email_adresse@fidocon.de> | 2011-10-26 00:43:07 +0200 |
---|---|---|
committer | dirk <beliebige_email_adresse@fidocon.de> | 2011-10-26 00:43:07 +0200 |
commit | cdfc30d5a6a677a3b13c3576af2fbd975f447498 (patch) | |
tree | 290ecc91f46eedc84e36ef478af0d9d53597a207 /includes/notary.inc.php | |
parent | 32a12f0e40e4bb6fc1bc4d958d88d4df13f0146b (diff) | |
parent | c9524ee04d797eedb02a6d329de8960fe5b79bb3 (diff) | |
download | cacert-devel-cdfc30d5a6a677a3b13c3576af2fbd975f447498.tar.gz cacert-devel-cdfc30d5a6a677a3b13c3576af2fbd975f447498.tar.xz cacert-devel-cdfc30d5a6a677a3b13c3576af2fbd975f447498.zip |
bug-882 resolved merge conflict ...
Merge commit 'origin/bug-882' into bug-882
Conflicts:
includes/notary.inc.php
Diffstat (limited to 'includes/notary.inc.php')
-rw-r--r-- | includes/notary.inc.php | 42 |
1 files changed, 28 insertions, 14 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php index 4c8b4d2..73227ac 100644 --- a/includes/notary.inc.php +++ b/includes/notary.inc.php @@ -274,35 +274,49 @@ <? } - function output_assurances_row($assuranceid,$date,$when,$email,$name,$points,$location,$method,$experience,$userid,$support,$revoked) + function output_assurances_row($assuranceid,$date,$when,$email,$name,$awarded,$points,$location,$method,$experience,$userid,$support,$revoked) { + + $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" <?=$tdstyle?>><?=$emopen?><?=$assuranceid?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$date?><?=$emclose?></td> <? if ($support == "1") { ?> - <td class="DataTD"><?=$when?></td> - <td class="DataTD"><?=$email?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$when?><?=$emclose?></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><?=$email?><?=$emclose?></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?><?=$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> <? if ($support == "1") { if ($revoked == true) { ?> - <td class="DataTD"> </td> + <td class="DataTD" <?=$tdstyle?>> </td> <? } else { ?> - <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($userid)?>&assurance=<?=intval($assuranceid)?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a></td> + <td class="DataTD" <?=$tdstyle?>><?=$emopen?><a href="account.php?id=43&userid=<?=intval($userid)?>&assurance=<?=intval($assuranceid)?>&csrf=<?=make_csrf('admdelassurance')?>" onclick="return confirm('<?=_("Are you sure you want to revoke this assurance?")?>');"><?=_("Revoke")?></a><?=$emclose?></td> <? } } @@ -361,7 +375,7 @@ $apoints = calc_experience ($row,$points,$experience,$sum_experience,$revoked); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['to'])); $email = show_email_link ($fromuser['email'],intval($row['to'])); - output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$apoints,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); } } @@ -378,7 +392,7 @@ calc_assurances ($row,$points,$experience,$sum_experience,$awarded,$revoked); $name = show_user_link ($fromuser['fname']." ".$fromuser['lname'],intval($row['from'])); $email = show_email_link ($fromuser['email'],intval($row['from'])); - output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); + output_assurances_row (intval($row['id']),$row['date'],$row['when'],$email,$name,$awarded,intval($row['points']),$row['location'],$row['method']==""?"":_(sprintf("%s", $row['method'])),$experience,$userid,$support,$revoked); } } |