summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-11-24 17:12:57 +0100
committerMichael Tänzer <neo@nhng.de>2011-11-24 17:12:57 +0100
commit8ce107ef51d6fd9618d4275b6bca16678aa6bc75 (patch)
treedea72d37df7ade178f6729ecd64c6ca2b92a3171 /www
parentab9b6452a8752f473c20b07f5efa78fe8f97e1a3 (diff)
parent57b85e209da09da2e21b666aebce41b85e56d446 (diff)
downloadcacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.tar.gz
cacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.tar.xz
cacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.zip
Merge branch 'bug-965' into release
Diffstat (limited to 'www')
-rw-r--r--www/account.php4
-rw-r--r--www/index.php7
2 files changed, 11 insertions, 0 deletions
diff --git a/www/account.php b/www/account.php
index 434053f..d1dd695 100644
--- a/www/account.php
+++ b/www/account.php
@@ -64,6 +64,10 @@
die("No such file.");
}
exit;
+ } else if ($id == 37) {
+ $protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
+ $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs';
+ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
} else {
showheader(_("My CAcert.org Account!"));
includeit($id, "account");
diff --git a/www/index.php b/www/index.php
index a139c4a..5f7fc14 100644
--- a/www/index.php
+++ b/www/index.php
@@ -632,6 +632,13 @@
if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900)
$_SESSION['signup']['year'] = "19XX";
+
+ if ($id == 12)
+ {
+ $protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
+ $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs';
+ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
+ }
if ($id == 19)
{