summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-07-21 14:41:54 +0200
committerMichael Tänzer <neo@nhng.de>2011-07-21 14:41:54 +0200
commita9cf76bebbae1d26b558f55daf6fa59ebfda91b1 (patch)
tree1e52292bc7c2ad24c3fb7ff7a20013dc3ce7422e
parentad05aab44ae1995a9db6323785fe29402a1a5e69 (diff)
parentf3c4fd715d125b83cbb35746787b840431270560 (diff)
downloadcacert-devel-a9cf76bebbae1d26b558f55daf6fa59ebfda91b1.tar.gz
cacert-devel-a9cf76bebbae1d26b558f55daf6fa59ebfda91b1.tar.xz
cacert-devel-a9cf76bebbae1d26b558f55daf6fa59ebfda91b1.zip
Merge branch 'bug-897' into release
-rw-r--r--includes/about_menu.php2
-rw-r--r--pages/index/19.php94
-rw-r--r--www/index.php7
3 files changed, 15 insertions, 88 deletions
diff --git a/includes/about_menu.php b/includes/about_menu.php
index 2f3080d..f34a274 100644
--- a/includes/about_menu.php
+++ b/includes/about_menu.php
@@ -4,7 +4,7 @@
<li><a href="http://blog.cacert.org/"><?=_("CAcert News")?></a></li>
<li><a href="http://wiki.CAcert.org/"><?=_("Wiki Documentation")?></a></li>
<li><a href="/policy/"><?=_("Policies")?></a></li>
- <li><a href="/index.php?id=19"><?=_("Point System")?></a></li>
+ <li><a href="//wiki.cacert.org/FAQ/Privileges"><?=_("Point System")?></a></li>
<li><a href="http://bugs.CAcert.org/"><?=_("Bug Database")?></a></li>
<? // <li><a href="/index.php?id=47">< = _ ("PR Materials" ) > </a></li> ?>
<? // <li><a href="/logos.php">< ? = _ ( " CAcert Logos " ) ? > </a></li> ?>
diff --git a/pages/index/19.php b/pages/index/19.php
index c58eb68..b44960d 100644
--- a/pages/index/19.php
+++ b/pages/index/19.php
@@ -15,90 +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
*/ ?>
-<span style="background-color: #FF8080; font-size: 150%">
-Note that the <strong>TTP</strong> programme is effectively <strong>Frozen</strong><br>
-Until a subsidiary policy under AP is written, it is against AP rules.<br>
-</span>
-&nbsp;<br>
-<h3><?=_("Information")?></h3>
-<table border="0" align="center" cellspacing="0" cellpadding="0">
- <tr>
- <td class="title" colspan="2"><?=_("What can CAcert provide to you, to increase your privacy and security for free?")?></td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Client certificates (un-assured)")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("You can send digitally signed/encrypted emails; others can send encrypted emails to you.")?><br /><br />
- <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 6 months. Only the email address itself can be entered into the certificate (not your full name)")?>.<br /><br />
- <u><?=_("Verification needed")?>:</u> <?=_("You must confirm it is your email address by responding to a 'ping' email sent to it.")?><br /><br />
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Assured client certificates")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("Same as above plus you can include your full name in the certificates.")?><br /><br />
- <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 24 months.")?><br /><br />
- <u><?=_("Verification needed")?>:</u> <?=_("Same as above, plus you must get a minimum of 50 assurance points by meeting with one or more assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br /><br />
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Code signing certificates")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("Digitally sign code, web applets, installers, etc. including your name and location in the certificates.")?><br><br>
- <u><?=_("Limitations")?>:</u> <?=sprintf(_("Certificates expire in 12 months. Certificates %s must%s include your full name."),"<u>","</u>")?><br /><br />
- <u><?=_("Verification needed")?>:</u> <?=_("Same as above plus get 100 assurance points by meeting with multiple assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br><br>
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Server certificates (un-assured)")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("Enable encrypted data transfer for users accessing your web, email, or other SSL enabled service on your server; wildcard certificates are allowed.")?><br><br>
- <u><?=_("Limitations")?>:</u> <?=_("Certificates expire in 6 months; only the domain name itself can be entered into the certificates (not your full name, company name, location, etc.).")?><br><br>
- <u><?=_("Verification needed")?>:</u> <?=_("You must confirm that you are the owner (or authorized administrator) of the domain by responding to a 'ping' email sent to either the email address listed in the whois record, or one of the RFC-mandatory addresses (hostmaster/postmaster/etc).")?><br><br>
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Assured server certificates")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("Same as above.")?><br><br>
- <u><?=_("Limitations")?>:</u> <?=_("Same as above, except certificates expire in 24 months.")?><br><br>
- <u><?=_("Verification needed")?>:</u> <?=_("Same as above, plus get 50 assurance points by meeting with assurer(s) from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents.")?><br><br>
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Become an assurer in CAcert Web of Trust")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("The ability to assure other new CAcert users; contribute to the strengthening and broadening of the CAcert Web of Trust.")?><br><br>
- <u><?=_("Limitations")?>:</u> <?=_("The number of assurance point you have will limit the maximum assurance points you can issue for people you assure.")?><br><br>
- <u><?=_("Verification needed")?>:</u> <?=_("You will need to be issued 100 points by meeting with existing assurers from the CAcert Web of Trust, who verify your identity using your government issued photo identity documents; OR if it is too difficult to meet up with existing assurers in your area, meet with two Trusted Third Party assurers (notary public, justice of the peace, lawyer, bank manager, accountant) to do the verifying.")?><br><br>
- </td>
- </tr>
- <tr>
- <td class="DataTD">
- <h4><?=_("Become a member of the CAcert Association")?></h4>
- </td>
- <td class="DataTD">
- <u><?=_("Benefits")?>:</u> <?=_("You get a vote in how CAcert (a non-profit association incorporated in Australia) is run; be eligible for positions on the CAcert board.")?><br><br>
- <u><?=_("Limitations")?>:</u> <?=_("None, the sky is the limit for CAcert.")?><br><br>
- <u><?=_("Verification needed")?>:</u> <?=_("None; $10 USD per year membership fee.")?><br><br>
- </td>
- </tr>
- <tr>
- <td class="DataTD" colspan="2">
- (*) <?=_("Please note a general limitation is that, unlike long-time players like Verisign, CAcert's root certificate is not included by default in mainstream browsers, email clients, etc. This means people to whom you send encrypted email, or users who visit your SSL-enabled web server, will first have to import CAcert's root certificate, or they will have to agree to pop-up security warnings (which may look a little scary to non-techy users).")?>
- </td>
- </tr>
-</table>
-<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/FAQ/Privileges">', '</a>');
+?>
+</p> \ No newline at end of file
diff --git a/www/index.php b/www/index.php
index fb215c6..13e8dc6 100644
--- a/www/index.php
+++ b/www/index.php
@@ -627,6 +627,13 @@
if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900)
$_SESSION['signup']['year'] = "19XX";
+
+ if ($id == 19)
+ {
+ $protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
+ $newUrl = $protocol . '://wiki.cacert.org/FAQ/Privileges';
+ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
+ }
showheader(_("Welcome to CAcert.org"));
includeit($id);