diff options
| author | Bernhard Fröhlich <bernhard@cacert.org> | 2011-08-08 00:03:52 +0200 |
|---|---|---|
| committer | Bernhard Fröhlich <bernhard@cacert.org> | 2011-08-08 00:03:52 +0200 |
| commit | 439d69582da6ec48e195cbed37862d76656d6e9b (patch) | |
| tree | 479d4571c7dd7af020b8fb552ab0ed4c690810e4 /pages | |
| parent | 1262ff0b1c8cf748c0dc6ed502d80c579ae672ca (diff) | |
| parent | c0afd35630115a7e186b912d2404f2c34f1f18b3 (diff) | |
| download | cacert-devel-439d69582da6ec48e195cbed37862d76656d6e9b.tar.gz cacert-devel-439d69582da6ec48e195cbed37862d76656d6e9b.tar.xz cacert-devel-439d69582da6ec48e195cbed37862d76656d6e9b.zip | |
Merge branch 'bug-827' into release
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/wot/10.php | 23 | ||||
| -rw-r--r-- | pages/wot/15.php | 29 |
2 files changed, 51 insertions, 1 deletions
diff --git a/pages/wot/10.php b/pages/wot/10.php index 51ed019..bc76a86 100644 --- a/pages/wot/10.php +++ b/pages/wot/10.php @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> <? + $thawte = false; + ?> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -43,6 +45,11 @@ <td class="DataTD"><?=sprintf(_("You have made %s assurances which ranks you as the #%s top assurer."), intval($rc), intval($rank))?></td> </tr> </table> +<center> +<br> +<?=sprintf(_("The calculation of points will be changed in the near future. Please check the %s new calculation %s"), "<a href='/wot.php?id=15'>", "</a>")?> +<br> +</center> <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> @@ -71,13 +78,27 @@ <td class="DataTD"><?=$row['location']?></td> <td class="DataTD"><?=_(sprintf("%s", $row['method']))?></td> </tr> -<? } ?> +<? + $thawte = ($row['method'] == "Thawte Points Transfer") || $thawte; +} ?> <tr> <td class="DataTD" colspan="3"><b><?=_("Total Points")?>:</b></td> <td class="DataTD"><?=intval($_SESSION['profile']['points'])?></td> <td class="DataTD" colspan="2"> </td> </tr> </table> +<? +if ($thawte) +{ +?> +<br> +<center> +<strong style='color: red'> +<?=_("Your Thawte-Points will be revoked in the near future. Please check new calculation!");?> +<br> +</strong> +</center> +<?}?> <br> <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> <tr> diff --git a/pages/wot/15.php b/pages/wot/15.php new file mode 100644 index 0000000..8579588 --- /dev/null +++ b/pages/wot/15.php @@ -0,0 +1,29 @@ +<? /* + LibreSSL - CAcert web application + Copyright (C) 2004-2011 CAcert Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + + include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php"); + + $userid = intval($_SESSION['profile']['id']); + + output_ranking($userid); + output_summary($userid); + output_given_assurances($userid); + output_received_assurances($userid); + + output_end_of_page(); +?> |