summaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-01-15 00:56:16 +0100
committerMichael Tänzer <neo@nhng.de>2014-01-15 00:56:16 +0100
commit41e6ea88f5a2a6ac374f26f2239f87e1d7164255 (patch)
treeadc5f3491472a47c5d8ed2b6decf7de4a39b6035 /pages
parentf0f37eabcb2554f78900396248a05cdee1626975 (diff)
parent2c4c29221f7efcaa98ff3150e8563b2616d143da (diff)
downloadcacert-devel-41e6ea88f5a2a6ac374f26f2239f87e1d7164255.tar.gz
cacert-devel-41e6ea88f5a2a6ac374f26f2239f87e1d7164255.tar.xz
cacert-devel-41e6ea88f5a2a6ac374f26f2239f87e1d7164255.zip
Merge remote-tracking branch 'origin/bug-1195' into release
Diffstat (limited to 'pages')
-rw-r--r--pages/account/5.php2
-rw-r--r--pages/account/6.php22
2 files changed, 3 insertions, 21 deletions
diff --git a/pages/account/5.php b/pages/account/5.php
index 44763e2..934ca0c 100644
--- a/pages/account/5.php
+++ b/pages/account/5.php
@@ -91,7 +91,7 @@
<td class="DataTD"><?=$row['revoke']?></td>
<td class="DataTD"><?=$row['expires']?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
+ <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":'checked="checked"'?>/>
<input type="hidden" name="cert_<?=$row['id']?>" value="1" />
</td>
<td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
diff --git a/pages/account/6.php b/pages/account/6.php
index 0054b7a..8455499 100644
--- a/pages/account/6.php
+++ b/pages/account/6.php
@@ -115,7 +115,6 @@ if (array_key_exists('format', $_REQUEST)) {
echo "<pre>$cert</pre>";
?>
-<form method="post" action="account.php">
<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
<tr>
<td colspan="2" class="title"><?=_("Information about the certificate")?></td>
@@ -133,16 +132,6 @@ if (array_key_exists('format', $_REQUEST)) {
$row['revoke'] = _("Not Revoked");
?>
<tr>
- <td class="DataTD"><?=_("Renew/Revoke/Delete")?></td>
-<? if($verified != _("Pending") && $verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox" name="revokeid[<?=$row['id']?>]" ></td>
-<? } else if($verified != _("Revoked")) { ?>
- <td class="DataTD"><input type="checkbox" name="delid[<?=$row['id']?>]"></td>
-<? } else { ?>
- <td class="DataTD">&nbsp;</td>
-<? } ?>
- </tr>
- <tr>
<td class="DataTD"><?=_("Status")?></td>
<td class="DataTD"><?=$verified?></td>
</tr>
@@ -165,21 +154,14 @@ if (array_key_exists('format', $_REQUEST)) {
<tr>
<td class="DataTD"><?=_("Login")?></td>
<td class="DataTD">
- <input type="checkbox" name="disablelogin" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
+ <input type="checkbox" name="disablelogin" disabled="disabled" value="1" <?=$row['disablelogin']?"":"checked='checked'"?>/>
</td>
</tr>
<tr>
<td class="DataTD"><?=_("Comment")?></td>
- <td class="DataTD"><input type="text" name="description" maxlength="100" size=100 value="<?=htmlspecialchars($row['description'])?>"></td>
- </tr>
- <tr>
- <td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"> </td>
+ <td class="DataTD"><?=htmlspecialchars($row['description'])?></td>
</tr>
</table>
-<input type="hidden" name="oldid" value="6">
-<input type="hidden" name="certid" value="<?=$certid?>">
-</form>
-
<?
showfooter();
exit;