summaryrefslogtreecommitdiff
path: root/pages/account/12.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-06-15 13:40:57 +0200
committerMichael Tänzer <neo@nhng.de>2013-06-15 13:40:57 +0200
commiteac1f92e5f27e7c65dfb624744666091ccab328f (patch)
tree30bbe367f6b828f62eed30a5ba8ec49e37df0549 /pages/account/12.php
parenta3dbfe74d3521763418f44943a7ccfd974bc33bd (diff)
parentd2ad5c5c27f4daeabd3f53268cdeab2b706e6e97 (diff)
downloadcacert-devel-eac1f92e5f27e7c65dfb624744666091ccab328f.tar.gz
cacert-devel-eac1f92e5f27e7c65dfb624744666091ccab328f.tar.xz
cacert-devel-eac1f92e5f27e7c65dfb624744666091ccab328f.zip
Merge branch 'release' into bug-782
Conflicts: includes/account.php pages/account/12.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/account/12.php')
-rw-r--r--pages/account/12.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/pages/account/12.php b/pages/account/12.php
index 32524e2..6d4e86e 100644
--- a/pages/account/12.php
+++ b/pages/account/12.php
@@ -38,7 +38,7 @@
UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`,
`domaincerts`.`description`
from `domaincerts`,`domains`
- where `memid`='".intval($_SESSION['profile']['id'])."' and `deleted`=0 and `domaincerts`.`domid`=`domains`.`id` ";
+ where `memid`='".intval($_SESSION['profile']['id'])."' and `domaincerts`.`domid`=`domains`.`id` ";
if($viewall != 1)
{
$query .= "AND `revoked`=0 AND `renewed`=0 ";
@@ -51,7 +51,7 @@
{
?>
<tr>
- <td colspan="8" class="DataTD"><?=_("No domains are currently listed.")?></td>
+ <td colspan="6" class="DataTD"><?=_("No certificates are currently listed.")?></td>
</tr>
<? } else {
while($row = mysql_fetch_assoc($res))
@@ -95,8 +95,10 @@
<td class="DataTD" colspan="2"><input type="submit" name="change" value="<?=_("Change settings")?>"/> </td>
</tr>
<? } ?>
+ <tr>
+ <td class="DataTD" colspan="6"><?=_("From here you can delete pending requests, or revoke valid certificates.")?></td>
+ </tr>
</table>
<input type="hidden" name="oldid" value="<?=$id?>"/>
<input type="hidden" name="csrf" value="<?=make_csrf('srvcerchange')?>"/>
</form>
-<p><?=_("From here you can delete pending requests, or revoke valid certificates.")?></p>