From da58aac91883859f06f4dda2656c5e290615e5b2 Mon Sep 17 00:00:00 2001 From: Wytze van der Raay Date: Wed, 27 Jul 2011 10:41:01 +0000 Subject: [PATCH] Fix for https://bugs.cacert.org/view.php?id=921 (Privacy Policy). --- includes/account_stuff.php | 2 +- includes/general_stuff.php | 2 +- pages/account/39.php | 78 +----------- pages/index/10.php | 78 +----------- www/policy/CAcertCommunityAgreement.php | 2 +- www/policy/CertificationPracticeStatement.php | 6 +- www/policy/PrivacyPolicy.html | 114 ++++++++++++++++++ www/policy/index.php | 5 + 8 files changed, 137 insertions(+), 150 deletions(-) create mode 100644 www/policy/PrivacyPolicy.html diff --git a/includes/account_stuff.php b/includes/account_stuff.php index 7c8980c..b6fdd7a 100644 --- a/includes/account_stuff.php +++ b/includes/account_stuff.php @@ -278,7 +278,7 @@ function hideall() {
| | | - | + | | ©2002-
diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 6747c84..088c39e 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -132,7 +132,7 @@ if(!function_exists("showfooter"))
| | | - | + | | | ©2002-
diff --git a/pages/account/39.php b/pages/account/39.php index f89187d..9e09bb8 100644 --- a/pages/account/39.php +++ b/pages/account/39.php @@ -15,76 +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 */ ?> -

- -

- -

- -

1.

-

- -

- -

2.

-

- -

-

- -

- -

3.

-

- -

- -

4.

-

- -

-

- -

- -

5.

-

- -

- -

6.

-

- -

- -

7.

-

- -

- -

8.

-

- -

- -

9.

-

- - -

- -

10.

-

- -http://www.privacy.gov.au/ for further details.")?> - -

- - -

-

-CAcert Inc.
-P.O. Box 4107
-Denistone East NSW 2112
-Australia +

+', ''); +?>

diff --git a/pages/index/10.php b/pages/index/10.php index f89187d..9e09bb8 100644 --- a/pages/index/10.php +++ b/pages/index/10.php @@ -15,76 +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 */ ?> -

- -

- -

- -

1.

-

- -

- -

2.

-

- -

-

- -

- -

3.

-

- -

- -

4.

-

- -

-

- -

- -

5.

-

- -

- -

6.

-

- -

- -

7.

-

- -

- -

8.

-

- -

- -

9.

-

- - -

- -

10.

-

- -http://www.privacy.gov.au/ for further details.")?> - -

- - -

-

-CAcert Inc.
-P.O. Box 4107
-Denistone East NSW 2112
-Australia +

+', ''); +?>

diff --git a/www/policy/CAcertCommunityAgreement.php b/www/policy/CAcertCommunityAgreement.php index cf9b4e6..3106eb1 100644 --- a/www/policy/CAcertCommunityAgreement.php +++ b/www/policy/CAcertCommunityAgreement.php @@ -457,7 +457,7 @@ You are also bound by Dispute Resolution Policy (DRP => COD7).
  • - + Privacy Policy (PP => COD5).
  • diff --git a/www/policy/CertificationPracticeStatement.php b/www/policy/CertificationPracticeStatement.php index 7d7abc1..739dec3 100644 --- a/www/policy/CertificationPracticeStatement.php +++ b/www/policy/CertificationPracticeStatement.php @@ -69,7 +69,7 @@ a:hover { CAcert Policy Status
    Creation date: 20060726
    Status: DRAFT p20091108
    - + @@ -3623,7 +3623,7 @@ or rulings by Arbitrator. Privacy is covered by the CCA (COD9) and the Privacy Policy -(COD5). +(COD5).

    9.4.1. Privacy plan

    @@ -3999,7 +3999,7 @@ obligations, risks and liabilities on the parties.

    See the Privacy Policy -(COD5). +(COD5).

    9.15.3 Legal Process from External Forums

    diff --git a/www/policy/PrivacyPolicy.html b/www/policy/PrivacyPolicy.html new file mode 100644 index 0000000..6670e92 --- /dev/null +++ b/www/policy/PrivacyPolicy.html @@ -0,0 +1,114 @@ + + + +Privacy Policy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PP    
    POLICY m20060629   + 20060629 +
    COD5   
      Privacy Policy  
    + +

    0. Preliminaries

    +

    + This policy discloses what information we gather about you when you visit any of our Web site, and when you issue or use our certificates. It describes how we use that information and how you can control it. +

    + + + +

    1. Website information

    +

    +We collect two kinds of information about website users: 1) data that users volunteer by signing up to our website or when you send us an email via our contact form; and 2) aggregated tracking data we collect when users interact with our site. +

    + +

    2. Personal information

    +

    +When you post to the contact form, you must provide your name and email address. When you sign up to the website, you must provide your name, email address, date of birth and some lost pass phrase question and answers. +

    +

    +We only share your information with any other organisation when so instructed by a CAcert arbitrator. +

    + +

    3. Aggregated tracking information

    +

    +We analyse visitors' use of our sites by tracking information such as page views, traffic flow, search terms, and click through. We use this information to improve our sites. We also share this anonymous traffic and demographic information in aggregate form with advertisers and other business partners. We do not share any information with advertisers that can identify an individual user. +

    + +

    4. Cookies

    +

    +Some of our advertisers use a third-party ad server to display ads. These ads may contain cookies. The ad server receives these cookies, and we don't have access to them. +

    +

    +We don't use cookies to store personal information, we do use sessions, and if cookies are enabled, the session will be stored in a cookie, and we do not look for cookies, apart from the session id. However if cookies are disabled then no information will be stored on or looked for on your computer. +

    + +

    5. Notification of changes

    +

    +If we change our Privacy Policy, we will post those changes on www.CAcert.org. If we decide to use personally identifiable information in a manner different from that stated at the time it was collected, we will notify users via email. Users will be able to opt out of any new use of their personal information. +

    + +

    6. How to update, correct, or delete your information

    +

    +You are able to update, add and remove your information at any time via our web interface, log into the 'My Account' and then click on the 'My Details' section, and then click the relevant link +

    + +

    7. Privacy of certificates

    +

    +CAcert does not automatically publish the certificates through a directory service or the website to other people than the user who requested the certificate. In the future, the user might be able to opt-in for publication of the certificates through a directory server by CAcert. +

    + +

    8. Privacy of user data

    +

    +CAcert Assurers can see the name, birthday and the number of points by looking up the correct email address. No other person related data is published by CAcert. +

    + +

    9. Exceptions

    +

    +A CAcert arbitrator may override this policy in a dispute. +To obtain access to confidential data, a dispute has to be filed. +

    + +

    10. Legal mandates

    +

    +CAcert adopts the Australian privacy regulations. +Please see http://www.privacy.gov.au/ for further details. +Governmental warrants and civil supoenas will be processed through the dispute resolution system, which ensures that valid authority is given to whoever complies with the supoena or the warrant. +

    + + +

    If you need to contact us in writing, address your mail to:

    +

    +CAcert Inc.
    +P.O. Box 4107
    +Denistone East NSW 2112
    +Australia +

    + + + diff --git a/www/policy/index.php b/www/policy/index.php index d3bfb06..7101c1f 100644 --- a/www/policy/index.php +++ b/www/policy/index.php @@ -23,6 +23,11 @@ showheader(_("CAcert - Policies"));
      $filename\n"; +} + foreach (glob("*.php") as $filename) { if($filename != "index.php" && $filename != "NRPDisclaimerAndLicence.php")