diff options
| author | Markus Warg <mw@it-sls.de> | 2010-08-12 09:54:30 +0200 |
|---|---|---|
| committer | Markus Warg <mw@it-sls.de> | 2010-08-12 09:54:30 +0200 |
| commit | 95c4843e6d81300fb326829265c7f0fd3f99c2b6 (patch) | |
| tree | 58b0f838145c4328635d72af328278efe908bcf5 /pages | |
| parent | 138ac2425dc9bc5ee3908e2a08f3d3b35be66e97 (diff) | |
| download | cacert-devel-95c4843e6d81300fb326829265c7f0fd3f99c2b6.tar.gz cacert-devel-95c4843e6d81300fb326829265c7f0fd3f99c2b6.tar.xz cacert-devel-95c4843e6d81300fb326829265c7f0fd3f99c2b6.zip | |
source code taken from cacert-20100805.tar.bz2
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/account/49.php | 14 | ||||
| -rwxr-xr-x | pages/index/16.php | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pages/account/49.php b/pages/account/49.php index 8b22399..688b9a4 100644 --- a/pages/account/49.php +++ b/pages/account/49.php @@ -24,7 +24,7 @@ $domainsearch = "%$domain%"; if(preg_match("/^\d+$/",$domain)) $domainsearch = ""; - $query = "select `users`.`id` as `id`, `domains`.`domain` as `domain` from `users`,`domains` + $query = "select `users`.`id` as `id`, `domains`.`domain` as `domain`, `domains`.`id`as `domid` from `users`,`domains` where `users`.`id`=`domains`.`memid` and (`domains`.`domain` like '$domainsearch' or `domains`.`id`='$domain') and `domains`.`deleted`=0 and `users`.`deleted`=0 and @@ -41,15 +41,16 @@ { ?> <tr> <td class="DataTD"><?=_("Domain")?>:</td> + <td class="DataTD"><?=$row['domid']?></td> <td class="DataTD"><a href="account.php?id=43&userid=<?=$row['id']?>"><?=sanitizeHTML($row['domain'])?></a></td> </tr> <? } if(mysql_num_rows($res) >= 100) { ?> <tr> - <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td> + <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td> </tr> <? } else { ?> <tr> - <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> + <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> </tr> <? } ?> </table><br><br> @@ -60,7 +61,7 @@ printf(_("No personal domains found matching %s"), sanitizeHTML($domain)); } - $query = "select `orgid`,`domain` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100"; + $query = "select `orgid`,`domain`,`id` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100"; $res = mysql_query($query); if(mysql_num_rows($res) >= 1) { ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> @@ -72,15 +73,16 @@ { ?> <tr> <td class="DataTD"><?=_("Domain")?>:</td> + <td class="DataTD"><?=$row['id']?></td> <td class="DataTD"><a href="account.php?id=26&orgid=<?=intval($row['orgid'])?>"><?=sanitizeHTML($row['domain'])?></a></td> </tr> <? } if(mysql_num_rows($res) >= 100) { ?> <tr> - <td class="DataTD" colspan="2"><?=_("Only the first 100 rows are displayed.")?></td> + <td class="DataTD" colspan="3"><?=_("Only the first 100 rows are displayed.")?></td> </tr> <? } else { ?> <tr> - <td class="DataTD" colspan="2"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> + <td class="DataTD" colspan="3"><? printf(_("%s rows displayed."), mysql_num_rows($res)); ?></td> </tr> <? } ?> </table><br><br> diff --git a/pages/index/16.php b/pages/index/16.php index 5b75815..ad493f2 100755 --- a/pages/index/16.php +++ b/pages/index/16.php @@ -15,6 +15,9 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> + +<p><?=sprintf(_("You are bound by the %s Root Distribution Licence %s for any re-distributions of CAcert's roots."),"<a href='/policy/RootDistributionLicense.php'>","</a>")?></p> + <p> Class 1 <?=_("PKI Key")?><br> <a href="index.php?id=17"><?=_("Click here if you want to import the root certificate into Microsoft Internet Explorer 5.x/6.x")?></a><br> |