diff options
| -rw-r--r-- | pages/account/0.php | 3 | ||||
| -rw-r--r-- | pages/account/40.php | 9 | ||||
| -rw-r--r-- | pages/account/49.php | 12 | ||||
| -rw-r--r-- | pages/index/0.php | 42 | ||||
| -rw-r--r-- | pages/index/11.php | 11 | ||||
| -rw-r--r-- | pages/index/13.php | 5 | ||||
| -rw-r--r-- | pages/index/21.php | 10 | ||||
| -rw-r--r-- | pages/wot/4.php | 25 | ||||
| -rw-r--r-- | scripts/db_migrations/version2.sh | 96 | ||||
| -rw-r--r-- | www/cap.php | 2 | ||||
| -rw-r--r-- | www/policy/PrivacyPolicy.html | 4 |
11 files changed, 139 insertions, 80 deletions
diff --git a/pages/account/0.php b/pages/account/0.php index 84b581e..b9b150c 100644 --- a/pages/account/0.php +++ b/pages/account/0.php @@ -29,5 +29,4 @@ <p><?=_("Once you have verified your company you will see these menu options. They allow you to issue as many certificates as you like without proving individual email accounts as you like, further more you are able to get your company details on the certificate.")?></p> <h4><?=_("CAcert Web of Trust")?></h4> <p><?=_("The Web of Trust system CAcert uses is similar to that many involved with GPG/PGP use, they hold face to face meetings to verify each others photo identities match their GPG/PGP key information. CAcert differs however in that we have modified things to work within the PKI framework, for you to gain trust in the system you must first locate someone already trusted. The trust person depending how many people they've trusted or meet before will determine how many points they can issue to you (the number of points they can issue is listed in the locate assurer section). Once you've met up you can show your ID and you will need to fill out a CAP form which the person assuring your details must retain for verification reasons.")?></p> -<p><b><?=_("The former TTP (Trusted Third Party) System has been stopped, and is currently not available.")?></b></p> -<? // "You can also get trust points via the Trust Third Party system where you go to a lawyer, bank manager, accountant, or public notary/juctise of the peace and they via your ID and fill in the TTP form to state they have viewed your ID documents and it appears authentic and true. More information on the TTP system can be found in the TTP sub-menu</p> ?> +<p><b><?=sprintf(_("For information about the TTP-assisted-assurance program please read %s"),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?></b></p> diff --git a/pages/account/40.php b/pages/account/40.php index b1a7fdb..4877d79 100644 --- a/pages/account/40.php +++ b/pages/account/40.php @@ -65,21 +65,14 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s </form> <p><b><?=_("Security Issues")?></b></p> -<p><? sprintf(_("Please use any of the following ways to report security ". +<p><?=sprintf(_("Please use any of the following ways to report security ". "issues: You can use the above contact form for sensitive information. ". "You can email us to %s. You can file a bugreport on %s and mark it as ". "private."), "<a href='mailto:support@cacert.org'>support@cacert.org</a>", "<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p> -<p><b><?=_("Snail Mail")?></b></p> -<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p> -<p><?=_("Postal Address:")?><br> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia</p> <script type="text/javascript"> <!-- diff --git a/pages/account/49.php b/pages/account/49.php index a5345e6..0218fa0 100644 --- a/pages/account/49.php +++ b/pages/account/49.php @@ -58,7 +58,11 @@ $row = mysql_fetch_assoc($res); $_GET['userid'] = intval($row['id']); } else { - printf(_("No personal domains found matching %s"), sanitizeHTML($domain)); + ?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><?printf(_("No personal domains found matching %s"), sanitizeHTML($domain));?></td> + </tr> + </table><br><br><? } $query = "select `orgid`,`domain`,`id` from `orgdomains` where `domain` like '$domainsearch' or `id`='$domain' limit 100"; @@ -90,7 +94,11 @@ $row = mysql_fetch_assoc($res); $_GET['userid'] = intval($row['id']); } else { - printf(_("No organisational domains found matching %s"), sanitizeHTML($domain)); + ?><table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper"> + <tr> + <td colspan="5" class="title"><?printf(_("No organisational domains found matching %s"), sanitizeHTML($domain));?></td> + </tr> + </table><br><br><? } } diff --git a/pages/index/0.php b/pages/index/0.php index d1d3fef..81ab2b1 100644 --- a/pages/index/0.php +++ b/pages/index/0.php @@ -121,6 +121,7 @@ <ul> <li>Account Name: CAcert Inc</li> +<li>SWIFT: WPACAU2S</li> <li>BSB: 032073</li> <li>Account No.: 180264</li> </ul> @@ -128,44 +129,3 @@ <?=_("If you want to participate in CAcert.org, have a look")?> <a href="http://wiki.cacert.org/wiki/HelpingCAcert"><?=_("here")?></a> <?=_("and")?> <a href="http://wiki.cacert.org/wiki/SystemTasks"><?=_("here")?></a>. -<!-- -<h3><?=_("For CAcert Association Members")?></h3> - -<b><?=_("Have you paid your CAcert Association membership fees for the year?")?></b> -<p><?=_("If not then select this PayPal button to pay your US$10 membership fee for the year.")?></p> -<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> -<input type="hidden" name="cmd" value="_s-xclick"> -<input type="image" src="/images/payment2.png" border="0" name="submit" alt="Make payments with PayPal"> -<input type="hidden" name="encrypted" value="-----BEGIN PKCS7-----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-----END PKCS7----- -"> -</form> -<p><?=_("If you are located in Australia, you can use bank transfer instead and pay the equivalent of US$10 in AU$.")?></p> - -<p><?=_("Please also include Your name in the transaction so we know who it came from or send an email to robert at cacert dot org with the details:")?></p> - -<ul> -<li>Account Name: CAcert Inc</li> -<li>BSB: 032073</li> -<li>Account No.: 180264</li> -</ul> -<br/><br/> ---> - - -<!-- -<h3><?=_("Introduction")?></h3> - -<p><?=_("It's been a long time coming, but the wait was worthwhile, finally you are able to get security at the right price... Free!")?></p> - -<p><?=_("For years we've all been charged high amounts of money to pay for security that doesn't and shouldn't cost the earth.")?></p> - -<p><?=_("The primary goals are:")?> -<ul> -<li><?=_("Inclusion into mainstream browsers!")?></li> -<li><?=_("To provide a trust mechanism to go with the security aspects of encryption.")?></li> -</ul> - -<p><?=sprintf(_("For general documentation and help please see our %s site"), "<a href='http://wiki.CAcert.org'>"._("Wiki Documentation")."</a>")?>.</p> ---> - - diff --git a/pages/index/11.php b/pages/index/11.php index 60c8941..01eca3a 100644 --- a/pages/index/11.php +++ b/pages/index/11.php @@ -65,16 +65,7 @@ if(!array_key_exists('secrethash',$_SESSION['_config'])) $_SESSION['_config']['s </form> <p><b><?=_("Security Issues")?></b></p> -<p><?=_("Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on <a href='https://bugs.cacert.org/'>bugs.cacert.org</a> and mark it as private.")?></p> - -<p><b><?=_("Snail Mail")?></b></p> -<p><?=_("Alternatively you can get in contact with us via the following methods:")?></p> - -<p><?=_("Postal Address:")?><br> -CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia</p> +<p><?=sprintf(_("Please use any of the following ways to report security issues: You can use the above contact form for sensitive information. You can email us to support@cacert.org. You can file a bugreport on %s and mark it as private."),"<a href='https://bugs.cacert.org/'>bugs.cacert.org</a>")?></p> <script type="text/javascript"> <!-- diff --git a/pages/index/13.php b/pages/index/13.php index f2ea173..612422f 100644 --- a/pages/index/13.php +++ b/pages/index/13.php @@ -35,8 +35,9 @@ printf(_("CAcert Inc. is a non-profit association which is legally able to accep <pre> Account Name: CAcert Inc -BSB: 032073 -Account No.: 180264 +SWIFT: WPACAU2S +BSB: 032073 +Account No.: 180264 </pre> <p><?=_("ANY amount will be appreciated - the more funding CAcert receives, the sooner it can achieve the goals of the community.")?></p> diff --git a/pages/index/21.php b/pages/index/21.php index 4d2599c..0521f67 100644 --- a/pages/index/21.php +++ b/pages/index/21.php @@ -15,7 +15,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ ?> - +<? /* +page called from the following pages + a. https://wiki.cacert.org/Price [^] + b. https://wiki.cacert.org/CacertMembership/DE [^] + c. https://wiki.cacert.org/CacertMembership [^] + d. https://wiki.cacert.org/CAcertInc [^] + e. https://wiki.cacert.org/Brain/CAcertInc [^] + */ ?> <h3><?=_("For CAcert Association Members")?></h3> <b><?=_("Have you paid your CAcert Association membership fees for the year?")?></b> @@ -40,6 +47,7 @@ <ul> <li>Account Name: CAcert Inc</li> +<li>SWIFT: WPACAU2S</li> <li>BSB: 032073</li> <li>Account No.: 180264</li> </ul> diff --git a/pages/wot/4.php b/pages/wot/4.php index 0da72da..04997ba 100644 --- a/pages/wot/4.php +++ b/pages/wot/4.php @@ -15,18 +15,21 @@ 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> - <br> + <h3><?=_("Trusted Third Parties")?></h3> -<p><?=_("A trusted 3rd party is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on. Other people are allowed to be authoritative in this area as well, such as bank managers, accountants and lawyers.")?></p> +<p><?=_("The Trusted Third Party (TTP) programme is intended to be used in areas without many CAcert Assurers.")?></p> + +<p><?=_("A Trusted Third Party (TTP) is simply someone in your country that is responsible for witnessing signatures and ID documents. This role is covered by many different titles such as public notary, justice of the peace and so on.")?></p> + +<p><?=_("With the TTP programme you can potentially gain assurance up to a maximum of 100 assurance points.")?></p> + +<p><?=_("Currently CAcert has only developed the TTP programme to the level that you can gain 70 assurance points by TTP assurances.") ?></p> + +<p><?=_("We are working to develop a process that will fill the gap of the missing 30 assurance points to allow you to get the maximum 100 assurance points.")?> </p> + +<p><?=_("In the meanwhile you would need to close this gap with face to face assurances with CAcert Assurers. Think not only travelling to populated countries, but also remember that assurers may occasionally visit your country or area.")?></p> -<p><?=_("You can become a CAcert Assurer by seeking out trusted 3rd parties. You will also need to download and print out a copy of the TTP Form (found under 'CAP/TTP Forms') and fill in your sections. You will need to produce a photo copy of your ID, which the person assuring you will inspect against the originals. Once they are satisfied the documents appear to be genuine they need to sign the back of the photo copies, and fill in their sections of the TTP document. Once you have had your ID verified by 2 different people, pop the copies + forms in an envelope and post them to:")?></p> +<p><?=sprintf(_("If you are interested in the TTP programme, read the pages %s for the basic way how the TTP programme works for you, and %s whether the TTP programme affects the country where you are located."),"<a href='//wiki.cacert.org/TTP/TTPuser'>https://wiki.cacert.org/TTP/TTPuser</a>","<a href='//wiki.cacert.org/TTP/TTPAL'>https://wiki.cacert.org/TTP/TTPAL</a>")?> </p> -<p>CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> -Australia</p> +<p><?=sprintf(_("If you want to take part in the TTP programme, send an email to %s with your name, the main email address of your CAcert account and the country that you want to see the TTP. CAcert will then send you the needed forms and guide you through the process."),"<a href='mailto:support@cacert.org'>support@cacert.org</a>")?></p> diff --git a/scripts/db_migrations/version2.sh b/scripts/db_migrations/version2.sh new file mode 100644 index 0000000..7d940ff --- /dev/null +++ b/scripts/db_migrations/version2.sh @@ -0,0 +1,96 @@ +#!/bin/sh +# LibreSSL - CAcert web application +# Copyright (C) 2004-2011 CAcert Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + + +# script to do database migrations + +# This particular version migrates from the preversioned state to version 1 +# If you want to reuse it for further migrations you probably should pay special +# attention because you have to adjust it a bit + +set -e # script fails if any command fails + +STDIN=0 +STDOUT=1 +STDERR=2 + +if [ "$1" = "--help" ]; then + cat >&$STDERR <<- USAGE + Usage: $0 [MYSQL_OPTIONS] + You have to specify all options needed by "mysql" as if you had started + the MySQL command line client directly (including the name of the + database to operate on). The MySQL user used has to have enough + privileges to do all necessary operations (among others CREATE, ALTER, + DROP, UPDATE, INSERT, DELETE). + You might need to enter the mysql password multiple times if you + specify the -p option. + USAGE + exit 1 +fi + +mysql_opt=" --batch --skip-column-names $@" + +schema_version=$( mysql $mysql_opt <<- 'SQL' + + SELECT MAX(`version`) FROM `schema_version`; +SQL +) +if [ $schema_version != 1 ]; then + cat >&$STDERR <<- ERROR + Error: database schema is not in the right version to do the migration! + Expected version: 1 (i.e. the version before there was versioning) + ERROR + exit 2 +fi + +mysql $mysql_opt <<- 'SQL' + + -- Organisation Assurance bug #1118 + ALTER TABLE `orgemailcerts` ADD `ou` varchar(50) NOT NULL + DEFAULT ''; + + + -- Bugs #855, #863, #864, #888, #1118 + ALTER TABLE `notary` + -- add "TTP-Assisted" as method for point transfers (for TTP) + MODIFY `method` + enum( + 'Face to Face Meeting', + 'Trusted Third Parties', + 'Thawte Points Transfer', + 'Administrative Increase', + 'CT Magazine - Germany', + 'Temporary Increase', + 'Unknown', + 'TOPUP', + 'TTP-Assisted' + ) NOT NULL DEFAULT 'Face to Face Meeting'; + + + + + -- Update schema version number + INSERT INTO `schema_version` + (`version`, `when`) VALUES + ('2' , NOW() ); +SQL + + +echo "Database successfully migrated to version 2" +exit 0 + diff --git a/www/cap.php b/www/cap.php index 73380e1..dc283fb 100644 --- a/www/cap.php +++ b/www/cap.php @@ -48,7 +48,7 @@ $this->SetFont('Arial','I',8); if($_SESSION['_config']['language'] == "ja") $this->SetFont('SJIS','I',8); - $this->Cell(0,0,'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.CAcert.org',0,0,'C'); + $this->Cell(0,0,'CAcert Inc. - PO Box 66 - Oatley NSW 2223 - Australia - http://www.CAcert.org',0,0,'C'); $this->Ln(3); $this->SetFont('Arial','',6); if($_SESSION['_config']['language'] == "ja") diff --git a/www/policy/PrivacyPolicy.html b/www/policy/PrivacyPolicy.html index 6670e92..8aa0837 100644 --- a/www/policy/PrivacyPolicy.html +++ b/www/policy/PrivacyPolicy.html @@ -105,8 +105,8 @@ Governmental warrants and civil supoenas will be processed through the dispute r <p>If you need to contact us in writing, address your mail to:</p> <p> CAcert Inc.<br> -P.O. Box 4107<br> -Denistone East NSW 2112<br> +PO Box 66 <br> +Oatley NSW 2223<br> Australia </p> |