summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorINOPIAE <inopiae@cacert.org>2014-01-26 10:36:38 +0100
committerINOPIAE <inopiae@cacert.org>2014-01-26 10:36:38 +0100
commitff8d08880cd536b3e153a0224c4167642d81ec76 (patch)
tree8ab9ffb6cfdd171e20134d68b2c415ab0f1fb848
parent89702110de33ccc80f956a3fae684e2816525076 (diff)
downloadcacert-devel-ff8d08880cd536b3e153a0224c4167642d81ec76.tar.gz
cacert-devel-ff8d08880cd536b3e153a0224c4167642d81ec76.tar.xz
cacert-devel-ff8d08880cd536b3e153a0224c4167642d81ec76.zip
bug 550: fixed the wording for org client output
-rw-r--r--includes/notary.inc.php6
-rw-r--r--pages/account/18.php8
2 files changed, 7 insertions, 7 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index d71cb2d..337d8d5 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1333,9 +1333,9 @@ function output_orgclientcert_table_header($orgname){
<td class="DataTD"><?=_("Status")?></td>
<td class="DataTD"><?=_("CommonName")?></td>
<td class="DataTD"><?=_("SerialNumber")?></td>
- <td class="DataTD"><?=_("SerialNumber")?></td>
+ <td class="DataTD"><?=_("Created by")?></td>
<td class="DataTD"><?=_("Revoked")?></td>
- <td class="DataTD"><?=_("SerialNumber")?></td>
+ <td class="DataTD"><?=_("Revoked by")?></td>
<td class="DataTD"><?=_("Expires")?></td>
<td colspan="2" class="DataTD"><?=_("Comment *")?></td>
</tr>
@@ -1366,7 +1366,7 @@ function output_orgclient_table_row($verified, $row, $support = 0){
<td class="DataTD"><?=$row['serial']?></td>
<td class="DataTD"><?=$row['cfname'] . ' ' . $row['clname']?></td>
<td class="DataTD"><?=$row['revoke']?></td>
- <td class="DataTD"><?=$row['cfname'] . ' ' . $row['clname']?></td>
+ <td class="DataTD"><?=$row['rfname'] . ' ' . $row['rlname']?></td>
<td class="DataTD"><?=$row['expires']?></td>
<? if($support == 1) { ?>
<td class="DataTD"><?=htmlspecialchars($row['description'])?></td>
diff --git a/pages/account/18.php b/pages/account/18.php
index 3641cd4..8c74b75 100644
--- a/pages/account/18.php
+++ b/pages/account/18.php
@@ -155,12 +155,12 @@ $status = array_key_exists('status',$_SESSION['_config']) ? intval($_SESSION['_c
if($row['revoked'] > 0)
$verified = _("Revoked");
if($row['revoked'] == 0)
- $row['revoke'] = _("Not Revoked");
- if(!$row['cfname'] && !!$row['clname'] ){
+ $row['revoke'] = _("Not revoked");
+ if(!$row['cfname'] && !$row['clname'] ){
$row['cfname'] = _("Not recorded");
- $row['clname'] = _("");
+ $row['clname'] = '';
$row['rfname'] = _("Not recorded");
- $row['rlname'] = _("");
+ $row['rlname'] = '';
}
/*?>