summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-07 15:52:20 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-07 15:52:20 +0200
commit7346b38590e4e96a3864509466dc4b7b706102d4 (patch)
tree3036a3849502ac50e9508f7f5d23c76b45dc45ca
parentd4fc958ec322938c7d8f43b4809feb9d247ac528 (diff)
downloadcacert-devel-7346b38590e4e96a3864509466dc4b7b706102d4.tar.gz
cacert-devel-7346b38590e4e96a3864509466dc4b7b706102d4.tar.xz
cacert-devel-7346b38590e4e96a3864509466dc4b7b706102d4.zip
bug 1138: Reorder if clauses for better readability
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--includes/notary.inc.php42
1 files changed, 21 insertions, 21 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index c3351aa..3249bfe 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1679,58 +1679,58 @@ function output_client_cert($row, $support=0){
?>
<tr>
<?
- if ($verified != _("Pending") && $verified != _("Revoked")) {
+ if ($verified == _("Pending")) {
if (1 != $support) {
?>
<td class="DataTD">
- <input type="checkbox" name="revokeid[]" value="<?=$row['id']?>">
+ <input type="checkbox" name="delid[]" value="<?=$row['id']?>">
</td>
<?
}
?>
<td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
<?
+ } elseif ($verified == _("Revoked")) {
if (1 != $support) {
?>
- <td class="DataTD">
- <a href="account.php?id=6&amp;cert=<?=$row['id']?>">
- <?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?>
- </a>
- </td>
- <?
- } else {
- ?>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
+ <td class="DataTD">&nbsp;</td>
<?
}
- } elseif ($verified != _("Revoked")) {
+ ?>
+ <td class="DataTD"><?=$verified?></td>
+ <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
+ <?
+
+ } else {
if (1 != $support) {
?>
<td class="DataTD">
- <input type="checkbox" name="delid[]" value="<?=$row['id']?>">
+ <input type="checkbox" name="revokeid[]" value="<?=$row['id']?>">
</td>
<?
}
?>
<td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
<?
- } else {
if (1 != $support) {
?>
- <td class="DataTD">&nbsp;</td>
+ <td class="DataTD">
+ <a href="account.php?id=6&amp;cert=<?=$row['id']?>">
+ <?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?>
+ </a>
+ </td>
+ <?
+ } else {
+ ?>
+ <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
<?
}
-
- ?>
- <td class="DataTD"><?=$verified?></td>
- <td class="DataTD"><?=(trim($row['CN'])=="" ? _("empty") : $row['CN'])?></td>
- <?
}
?>