summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-06-09 22:55:22 +0200
committerBenny Baumann <BenBE@geshi.org>2015-06-09 22:55:22 +0200
commitde1eeb532805380bf7a747582c94fdfc62ce3401 (patch)
tree38641cfa85e58eff87e181848815a4faa08f1c72
parent52063341061ad1fa6907d055c769a3323c837032 (diff)
parenteadb03311454c5dc6234c45a76eb5943612568e0 (diff)
downloadcacert-devel-de1eeb532805380bf7a747582c94fdfc62ce3401.tar.gz
cacert-devel-de1eeb532805380bf7a747582c94fdfc62ce3401.tar.xz
cacert-devel-de1eeb532805380bf7a747582c94fdfc62ce3401.zip
Merge branch 'bug-1042' into testserver-stable
-rw-r--r--includes/notary.inc.php10
-rw-r--r--pages/account/43.php2
2 files changed, 4 insertions, 8 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 6d50ac3..4d1def9 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -417,15 +417,11 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
*/
function output_assurances_header($title, $support, $log)
{
- if ($support == 1) {
- $log = 1;
- }
-
$colspan = 7;
if ($support == 1) {
$colspan += 2;
}
- if ($log == 1) {
+ if ($log == 1 || $support == 1) {
$colspan += 1;
}
?>
@@ -451,7 +447,7 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
<td class="DataTD"><strong><?=_("Method")?></strong></td>
<td class="DataTD"><strong><?=_("Experience Points")?></strong></td>
<?
- if ($log == 1)
+ if ($log == 1 || $support == 1)
{
?>
<td class="DataTD"><strong><?=_("Revoked")?></strong></td>
@@ -487,7 +483,7 @@ define('THAWTE_REVOCATION_DATETIME', '2010-11-16 00:00:00');
<td class="DataTD"><strong><?=$experience_txt?>:</strong></td>
<td class="DataTD"><?=intval($sumexperience)?></td>
<?
- if ($log == 1)
+ if ($log == 1 || $support == 1)
{
?>
<td class="DataTD">&nbsp;</td>
diff --git a/pages/account/43.php b/pages/account/43.php
index a8af12d..279da15 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -398,7 +398,7 @@ if(intval($_REQUEST['userid']) > 0) {
?>
<tr>
<td class="DataTD"><?=_("Assurance Points")?>:</td>
- <td class="DataTD"><?=intval($drow['points'])?></td>
+ <td class="DataTD"><?=get_received_total_points(intval($row['id']))?></td>
</tr>
<?
// show account history