From 8de28bd12565f66b7b168767a17210bb29a5a0aa Mon Sep 17 00:00:00 2001
From: Bernhard Froehlich <ted@convey.de>
Date: Sun, 25 Sep 2011 00:12:09 +0200
Subject: Changes from https://bugs.cacert.org/view.php?id=965#c2374

---
 pages/account/37.php | 21 +++++++--------------
 pages/account/38.php |  6 +++++-
 www/account.php      |  4 ++++
 3 files changed, 16 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 www/account.php

diff --git a/pages/account/37.php b/pages/account/37.php
index 4b021e0..48c737a 100755
--- a/pages/account/37.php
+++ b/pages/account/37.php
@@ -15,17 +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
 */ ?>
-<H3><?=_("About CAcert.org")?></H3>
-
-<p><?=_("CAcert.org is a community driven, Certificate Authority that issues certificates to the public at large for free.")?></p>
-
-<p><? printf(_("CAcert's goal is to promote awareness and education on computer security through the use of encryption, specifically with the X.509 family of standards. We have compiled a %sdocument base%s that has helpful hints and tips on setting up encryption with common software, and general information about Public Key Infrastructures (PKI)."), "<a href='http://wiki.cacert.org/'>", "</a>"); ?></p>
-
-<p><?=_("For the enthusiast looking to dip their toe in the water, we have an easy way of obtaining certificates you can use with your email program. You can use these not only to encrypt, but to prove to your friends and family that your email really does come from you.")?></p>
-
-<p><?=_("For administrators looking to protect the services they offer, we provide host and wild card certificates which you can issue almost immediately. Not only can you use these to protect websites, but also POP3, SMTP and IMAP connections, to list but a few. Unlike other certificate authorities, we don't limit the strength of the certificates, or the use of wild card certificates. Everyone should have the right to security and to protect their privacy, not just those looking to run ecommerce sites.")?></p>
-
-<p><?=_("If you're extremely serious about encryption, you can join CAcert's Assurance Programme and Web of Trust. This allows you to have your identity verified to obtain added benefits, including longer length certificates and the ability to include your name on email certificates."); ?></p>
-
-<p><?=_("CAcert Inc. is a non-profit association, incorporated in New South Wales Australia.")?></p>
-<p><?=_("More information about CAcert Incorporated:")?><a href="http://wiki.cacert.org/wiki/CAcertIncorporated">http://wiki.cacert.org/wiki/CAcertIncorporated</a></p>
+<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/FAQ/AboutUs">', '</a>');
+?>
+</p>
diff --git a/pages/account/38.php b/pages/account/38.php
index 34cbea4..f311bf5 100755
--- a/pages/account/38.php
+++ b/pages/account/38.php
@@ -19,7 +19,11 @@
 
 <h4><?=_("If I'd like to donate to CAcert Inc., how can I do it?")?></h4>
 
-<p><?=_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to strict guidelines about how this money can to be used. If you'd like to make a donation, you can do so via")?> 
+<p>
+<?
+printf(_("CAcert Inc. is a non-profit association which is legally able to accept donations. CAcert adheres to %sstrict guidelines%s about how this money can to be used. If you'd like to make a donation, you can do so via"),
+	'<a href="//wiki.cacert.org/FAQ/DonationsGuideline">', '</a>');
+?> 
 
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post">
 <input type="hidden" name="cmd" value="_s-xclick">
diff --git a/www/account.php b/www/account.php
old mode 100644
new mode 100755
index 434053f..d1dd695
--- 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");
-- 
cgit v1.2.1