summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authordirk <beliebige_email_adresse@fidocon.de>2011-11-23 09:38:35 +0100
committerdirk <beliebige_email_adresse@fidocon.de>2011-11-23 09:38:35 +0100
commit7dd8b7a0ecaa847fb9d48725bce1aa60b006044f (patch)
treed7200ca1ad2a689316874ee64d6b95e23da70f60 /www
parent490f6a8d248599e2fd14ef8dd82de6e58ca3c503 (diff)
parent675711c4992ba8204abbeeec6596769d7648afa6 (diff)
downloadcacert-devel-7dd8b7a0ecaa847fb9d48725bce1aa60b006044f.tar.gz
cacert-devel-7dd8b7a0ecaa847fb9d48725bce1aa60b006044f.tar.xz
cacert-devel-7dd8b7a0ecaa847fb9d48725bce1aa60b006044f.zip
Merge branch 'release' of ssh://dirk@git-cacert.it-sls.de/var/cache/git/cacert-devel into bug-894
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)
{