summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-12-11 23:57:48 +0100
committerMichael Tänzer <neo@nhng.de>2012-12-11 23:57:48 +0100
commit861aaeff82307087364e397d9b9256cb74c04ca1 (patch)
tree0c17605ac05e5b1a6c11f44e187249ccdd4c3381 /www
parentaf9600cf5d74085d6d25f1999432d3a31db7701f (diff)
downloadcacert-devel-861aaeff82307087364e397d9b9256cb74c04ca1.tar.gz
cacert-devel-861aaeff82307087364e397d9b9256cb74c04ca1.tar.xz
cacert-devel-861aaeff82307087364e397d9b9256cb74c04ca1.zip
Source code taken from cacert-20121211.tar.bz2
Diffstat (limited to 'www')
-rw-r--r--www/api/ccsr.php3
-rw-r--r--www/cap.php2
-rw-r--r--www/policy/PrivacyPolicy.html4
-rw-r--r--www/wot.php14
4 files changed, 15 insertions, 8 deletions
diff --git a/www/api/ccsr.php b/www/api/ccsr.php
index a4ec71e..7efdf8d 100644
--- a/www/api/ccsr.php
+++ b/www/api/ccsr.php
@@ -15,6 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+require_once '../../includes/lib/check_weak_key.php';
+
$username = mysql_real_escape_string($_REQUEST['username']);
$password = mysql_real_escape_string($_REQUEST['password']);
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>
diff --git a/www/wot.php b/www/wot.php
index 2878534..c6c0568 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -333,12 +333,16 @@ $iecho= "c";
if(($drow['total'] + $newpoints) >= 100 && $newpoints > 0)
{
-// $body .= _("You now have over 100 points and can start assuring others.")."\n\n";
- $body .= _("You have at least 100 Assurance Points, if you want to become an assurer try the")." ";
- $body .= _("Assurer Challenge")." ( https://cats.cacert.org )\n\n";
- $body .= _("To make it easier for others in your area to find you, it's helpful to list yourself as an assurer (this is voluntary), as well as a physical location where you live or work the most. You can flag your account to be listed, and add a comment to the display by going to:")."\n\n";
+ $body .= _("You have at least 100 Assurance Points. If you want ".
+ "to become an assurer try the Assurer Challenge").
+ " ( https://cats.cacert.org ).\n\n";
+ $body .= _("To make it easier for others in your area to find ".
+ "you, it's helpful to list yourself as an assurer (this ".
+ "is voluntary), as well as a physical location where you ".
+ "live or work the most. You can flag your account to be ".
+ "listed, and add a comment to the display by going to:")."\n";
$body .= "https://www.cacert.org/wot.php?id=8\n\n";
- $body .= _("You can list your location by going to:")."\n\n";
+ $body .= _("You can list your location by going to:")."\n";
$body .= "https://www.cacert.org/wot.php?id=13\n\n";
}