diff options
| author | Michael Tänzer <neo@nhng.de> | 2014-04-07 01:06:20 +0200 |
|---|---|---|
| committer | Michael Tänzer <neo@nhng.de> | 2014-04-07 01:06:20 +0200 |
| commit | 7aced7401aa7f21bb2f39d0d28f92b22bba3a068 (patch) | |
| tree | 659565ca9dc17ddad7990dd9e9134fb2a9894efc /pages/account | |
| parent | efcc291e3a7e1413bf6340ba76ae1ae11b62b05f (diff) | |
| download | cacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.tar.gz cacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.tar.xz cacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.zip | |
bug 1138: don't alias columns that could cause ambiguities
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/account')
| -rw-r--r-- | pages/account/12.php | 5 | ||||
| -rw-r--r-- | pages/account/5.php | 4 | ||||
| -rw-r--r-- | pages/account/6.php | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pages/account/12.php b/pages/account/12.php index 9058a07..5ca8ce7 100644 --- a/pages/account/12.php +++ b/pages/account/12.php @@ -34,7 +34,8 @@ $query = "select UNIX_TIMESTAMP(`domaincerts`.`created`) as `created`, UNIX_TIMESTAMP(`domaincerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`domaincerts`.`expire`) as `expired`, - `domaincerts`.`expire` as `expires`, `revoked` as `revoke`, + `domaincerts`.`expire`, + `domaincerts`.`revoked` as `revoke`, UNIX_TIMESTAMP(`revoked`) as `revoked`, `CN`, `domaincerts`.`serial`, `domaincerts`.`id` as `id`, `domaincerts`.`description` from `domaincerts`,`domains` @@ -79,7 +80,7 @@ <td class="DataTD"><a href="account.php?id=15&cert=<?=$row['id']?>"><?=$row['CN']?></a></td> <td class="DataTD"><?=$row['serial']?></td> <td class="DataTD"><?=$row['revoke']?></td> - <td class="DataTD"><?=$row['expires']?></td> + <td class="DataTD"><?=$row['expire']?></td> <td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td> <td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td> </tr> diff --git a/pages/account/5.php b/pages/account/5.php index 934ca0c..cca2f6f 100644 --- a/pages/account/5.php +++ b/pages/account/5.php @@ -34,7 +34,7 @@ $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`, UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`, - `emailcerts`.`expire` as `expires`, + `emailcerts`.`expire`, `emailcerts`.`revoked` as `revoke`, UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, `emailcerts`.`id`, @@ -89,7 +89,7 @@ <? } ?> <td class="DataTD"><?=$row['serial']?></td> <td class="DataTD"><?=$row['revoke']?></td> - <td class="DataTD"><?=$row['expires']?></td> + <td class="DataTD"><?=$row['expire']?></td> <td class="DataTD"> <input type="checkbox" name="disablelogin_<?=$row['id']?>" value="1" <?=$row['disablelogin']?"":'checked="checked"'?>/> <input type="hidden" name="cert_<?=$row['id']?>" value="1" /> diff --git a/pages/account/6.php b/pages/account/6.php index 8455499..0803406 100644 --- a/pages/account/6.php +++ b/pages/account/6.php @@ -25,7 +25,7 @@ if(array_key_exists('cert',$_REQUEST)) { $query = "select UNIX_TIMESTAMP(`emailcerts`.`created`) as `created`, UNIX_TIMESTAMP(`emailcerts`.`expire`) - UNIX_TIMESTAMP() as `timeleft`, UNIX_TIMESTAMP(`emailcerts`.`expire`) as `expired`, - `emailcerts`.`expire` as `expires`, + `emailcerts`.`expire`, `emailcerts`.`revoked` as `revoke`, UNIX_TIMESTAMP(`emailcerts`.`revoked`) as `revoked`, `emailcerts`.`id`, @@ -149,7 +149,7 @@ if (array_key_exists('format', $_REQUEST)) { </tr> <tr> <td class="DataTD"><?=_("Expires")?></td> - <td class="DataTD"><?=$row['expires']?></td> + <td class="DataTD"><?=$row['expire']?></td> </tr> <tr> <td class="DataTD"><?=_("Login")?></td> |