summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2011-09-20 21:44:23 +0200
committerBernhard Fröhlich <bernhard@cacert.org>2011-09-20 21:44:23 +0200
commit8fffc62bc13a2429baab9714085c492490903e56 (patch)
tree4a6a53984030873101e94193dac81a997513d9d4
parent0f14457e5f24a78de02af90b535b9a1d80ce6281 (diff)
parentb04202b91ae74c1a36b3a876226b651d0fd844ed (diff)
downloadcacert-devel-8fffc62bc13a2429baab9714085c492490903e56.tar.gz
cacert-devel-8fffc62bc13a2429baab9714085c492490903e56.tar.xz
cacert-devel-8fffc62bc13a2429baab9714085c492490903e56.zip
Merge branch 'bug-910' into release
-rw-r--r--pages/index/8.php18
-rw-r--r--www/index.php7
2 files changed, 13 insertions, 12 deletions
diff --git a/pages/index/8.php b/pages/index/8.php
index e45090d..4d515a6 100644
--- a/pages/index/8.php
+++ b/pages/index/8.php
@@ -15,16 +15,10 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ ?>
-<p><b><? printf(_("The current %s board, and roles."), "CAcert Inc."); ?></b></p>
-<p>
-Lambert Hofstra - <?=_("President")?><br/>
-Peter Yuill - <?=_("Vice President")?><br/>
-Alexander Prinsier - <?=_("Treasurer")?><br/>
-Mario Lipinski - <?=_("Secretary")?><br/>
-Piers Lauder - <?=_("member")?><br/>
-Ian Grigg - <?=_("member")?><br/>
-Dirk Astrath - <?=_("member")?><br/>
+<p style="background-color: #FF8080; font-size: 150%">
+<?
+printf(_("This page has been moved to the %swiki%s. Please update your ".
+ "bookmarks and report any broken links."),
+ '<a href="//wiki.cacert.org/Board">', '</a>');
+?>
</p>
-Kevin Dawson - <?=_("Public Officer")?><br />
-<br />
-More detailed informations can be found in the CAcert wiki under <a href="//wiki.cacert.org/Board"><?=_("CAcert Board")?></a>
diff --git a/www/index.php b/www/index.php
index a4c50fc..a139c4a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -640,6 +640,13 @@
header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
}
+ if ($id == 8)
+ {
+ $protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
+ $newUrl = $protocol . '://wiki.cacert.org/Board';
+ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
+ }
+
showheader(_("Welcome to CAcert.org"));
includeit($id);
showfooter();