diff options
author | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-19 22:18:41 +0200 |
---|---|---|
committer | Bernhard Fröhlich <bernhard@cacert.org> | 2011-09-19 22:18:41 +0200 |
commit | 76fe6db23eea88d836c3eb534abda8d87f873a67 (patch) | |
tree | 8c9625f821cd80a5583e11e4d489b3774efe7070 /pages | |
parent | 9ffc1df372018525e7626f9e11cd429f1bd28f8a (diff) | |
download | cacert-devel-76fe6db23eea88d836c3eb534abda8d87f873a67.tar.gz cacert-devel-76fe6db23eea88d836c3eb534abda8d87f873a67.tar.xz cacert-devel-76fe6db23eea88d836c3eb534abda8d87f873a67.zip |
Revert "Fix proposed by Uli"
This reverts commit 9ffc1df372018525e7626f9e11cd429f1bd28f8a.
Diffstat (limited to 'pages')
-rw-r--r--[-rwxr-xr-x] | pages/account/43.php | 78 |
1 files changed, 6 insertions, 72 deletions
diff --git a/pages/account/43.php b/pages/account/43.php index 6be9d2a..a286ec6 100755..100644 --- a/pages/account/43.php +++ b/pages/account/43.php @@ -178,7 +178,7 @@ <td class="DataTD"><a href="account.php?id=43&codesign=<?=$row['id']?>&csrf=<?=make_csrf('admcodesign')?>"><?=$row['codesign']?></a></td> </tr> <tr> - <td class="DataTD"><?=_("Org Assurer")?>:</td> + <td class="DataTD"><?=_("Org Admin")?>:</td> <td class="DataTD"><a href="account.php?id=43&orgadmin=<?=$row['id']?>&csrf=<?=make_csrf('admorgadmin')?>"><?=$row['orgadmin']?></a></td> </tr> <tr> @@ -318,79 +318,15 @@ <br> <? } ?> -<? // Begin - Debug infos - - // list total, expired, deleted, latest_expire_date ? - - $query = "select COUNT(*) as countdomains from `domains` inner join `domaincerts` on `domaincerts`.`domid` = `domains`.`id` where `memid`='".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - $rc = $drow['countdomains']; -?> -<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> - <tr> - <td colspan="2" class="title"><?=_("Total Certificates State")?></td> - </tr> - - <tr> - <td class="DataTD"><?=_("Total domain-certificates")?>:</td> -<? - if($rc > 0) { -?> - <td class="DataTD"><?=_("Yes")?></td> - </tr> -<? } else { ?> - <td class="DataTD"><?=_("None")?></td> - </tr> -<? } - - $query = "select COUNT(*) as countemailcerts from `emailcerts` where `memid`='".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - if($drow['countemailcerts'] > 0) { -?> - <tr> - <td class="DataTD"><?=_("Total email-certificates")?>:</td> - <td class="DataTD"><?=_("Yes")?></td> - </tr> -<? } else { ?> - <tr> - <td class="DataTD"><?=_("Total email-certificates")?>:</td> - <td class="DataTD"><?=_("None")?></td> - </tr> -<? } - $query = "select COUNT(*) as countgpgcerts from `gpg` where `memid`='".intval($row['id'])."' "; - $dres = mysql_query($query); - $drow = mysql_fetch_assoc($dres); - if($drow['countgpgcerts'] > 0) { -?> - <tr> - <td class="DataTD"><?=_("Total GPG keys")?>:</td> - <td class="DataTD"><?=_("Yes")?></td> - </tr> -<? } else { ?> - <tr> - <td class="DataTD"><?=_("Total GPG keys")?>:</td> - <td class="DataTD"><?=_("None")?></td> - </tr> -<? } ?> -</table> -<br> -<? - // End - Debug infos -?> - - <? if(array_key_exists('assuredto',$_GET) && $_GET['assuredto'] == "yes") { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="8" class="title"><?=_("Assurance Points")?></td> + <td colspan="7" class="title"><?=_("Assurance Points")?></td> </tr> <tr> - <td class="DataTD"><b><?=_("Assurance When")?></b></td> <td class="DataTD"><b><?=_("Date")?></b></td> <td class="DataTD"><b><?=_("Who")?></b></td> <td class="DataTD"><b><?=_("Email")?></b></td> @@ -409,7 +345,6 @@ $points += $drow['points']; ?> <tr> - <td class="DataTD"><?=sanitizeHTML($drow['when'])?></td> <td class="DataTD"><?=sanitizeHTML($drow['date'])?></td> <td class="DataTD"><a href="wot.php?id=9&userid=<?=intval($drow['from'])?>"><?=sanitizeHTML($fromuser['fname'])." ".sanitizeHTML($fromuser['lname'])?></td> <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> @@ -420,7 +355,7 @@ </tr> <? } ?> <tr> - <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> + <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td> <td class="DataTD"><?=$points?></td> <td class="DataTD" colspan="3"> </td> </tr> @@ -436,10 +371,9 @@ ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> - <td colspan="8" class="title"><?=_("Assurance Points The User Issued")?></td> + <td colspan="7" class="title"><?=_("Assurance Points The User Issued")?></td> </tr> <tr> - <td class="DataTD"><b><?=_("When")?></b></td> <td class="DataTD"><b><?=_("Date")?></b></td> <td class="DataTD"><b><?=_("Who")?></b></td> <td class="DataTD"><b><?=_("Email")?></b></td> @@ -458,7 +392,6 @@ $points += $drow['points']; ?> <tr> - <td class="DataTD"><?=$drow['when']?></td> <td class="DataTD"><?=$drow['date']?></td> <td class="DataTD"><a href="wot.php?id=9&userid=<?=$drow['to']?>"><?=$fromuser['fname']." ".$fromuser['lname']?></td> <td class="DataTD"><a href="account.php?id=43&userid=<?=intval($drow['to'])?>"><?=sanitizeHTML($fromuser['email'])?></a></td> @@ -469,7 +402,7 @@ </tr> <? } ?> <tr> - <td class="DataTD" colspan="4"><b><?=_("Total Points")?>:</b></td> + <td class="DataTD" colspan="2"><b><?=_("Total Points")?>:</b></td> <td class="DataTD"><?=$points?></td> <td class="DataTD" colspan="3"> </td> </tr> @@ -481,3 +414,4 @@ <? } ?> <br><br> <? } } ?> + |