CAcert Code Development list.

[Wytze van der Raay <wytze AT cacert.org>]

Hi Michael,

Op 10-12-2012 0:07, Michael Tänzer schreef:
> We have a fix for https://bugs.cacert.org/view.php?id=1114
> "Change CAcert postal address to the current one on index/11.php"
> 
> The fix was reviewed by Benny Baumann (BenBE) and me (NEOatNHNG) and
> tested by Ulrich Schröter (Uli60) and Marcus Mängel (INOPIAE).
> 
> Diff is attached. Please also run the locale makefile so that our
> translators see the new strings (if present) on
> https://translations.cacert.org and new translations get imported into
> the system.
> 
> Changed files:
> pages/account/40.php
> pages/index/11.php
> www/cap.php
> www/policy/PrivacyPolicy.html

The patch has been installed on the production server on December 11,
2012. See also the attached log message that was sent out. In addition
the translation data has been uploaded and downloaded as requested, and
the apache2 webserver has been restarted to ensure activation of the
updated translations.

Regards,
-- wytze

--- Begin Message ---

• From: Wytze van der Raay <wytze AT cacert.org>
• To: cacert-systemlog AT lists.cacert.org
• Subject: Fwd: [cvs.cacert.org checkin notification]
• Date: Tue, 11 Dec 2012 15:40:04 +0100
• Organization: CAcert

Fix for https://bugs.cacert.org/view.php?id=1114
"Change CAcert postal address to the current one on index/11.php"

In conjunction with the attached CVS changes a new tarball has been
made available incorporating all updates. The new tarball is available
through http://www.cacert.org/src-lic.php

-- end

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Tue, 11 Dec 2012 15:32:59 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
40.php 1.30 1.31
Tue Dec 11 15:32:59 CET 2012
Update of /var/lib/cvs/cacert/pages/account
In directory hlin:/home/cacert/www/pages/account

Modified Files:
        40.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1114
"Change CAcert postal address to the current one on index/11.php"

===================================================================
RCS file: /var/lib/cvs/cacert/pages/account/40.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- 40.php      2012/09/17 08:46:30     1.30
+++ 40.php      2012/12/11 14:32:58     1.31
@@ -65,21 +65,14 @@
 </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 AT cacert.org'>support AT 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">
 <!--

--- End Message ---

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Tue, 11 Dec 2012 15:33:03 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
11.php 1.27 1.28
Tue Dec 11 15:33:03 CET 2012
Update of /var/lib/cvs/cacert/pages/index
In directory hlin:/home/cacert/www/pages/index

Modified Files:
        11.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1114
"Change CAcert postal address to the current one on index/11.php"

===================================================================
RCS file: /var/lib/cvs/cacert/pages/index/11.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- 11.php      2012/09/17 08:46:34     1.27
+++ 11.php      2012/12/11 14:33:03     1.28
@@ -65,16 +65,7 @@
 </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 AT 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 AT 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">
 <!--

--- End Message ---

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Tue, 11 Dec 2012 15:33:07 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
cap.php 1.18 1.19
Tue Dec 11 15:33:07 CET 2012
Update of /var/lib/cvs/cacert/www
In directory hlin:/home/cacert/www/www

Modified Files:
        cap.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1114
"Change CAcert postal address to the current one on index/11.php"

===================================================================
RCS file: /var/lib/cvs/cacert/www/cap.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cap.php     2012/01/24 14:26:05     1.18
+++ cap.php     2012/12/11 14:33:07     1.19
@@ -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")

--- End Message ---

--- Begin Message ---

• From: "root" <root AT cvs.cacert.org>
• To: critical-admin AT cacert.org
• Subject: cvs.cacert.org checkin notification
• Date: Tue, 11 Dec 2012 15:33:11 +0100 (CET)

uid=0(root) gid=0(root) groups=0(root)
PrivacyPolicy.html 1.1 1.2
Tue Dec 11 15:33:11 CET 2012
Update of /var/lib/cvs/cacert/www/policy
In directory hlin:/home/cacert/www/www/policy

Modified Files:
        PrivacyPolicy.html 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1114
"Change CAcert postal address to the current one on index/11.php"

===================================================================
RCS file: /var/lib/cvs/cacert/www/policy/PrivacyPolicy.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PrivacyPolicy.html  2011/07/27 10:41:01     1.1
+++ PrivacyPolicy.html  2012/12/11 14:33:11     1.2
@@ -105,8 +105,8 @@
 <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>
 

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening

--- End Message ---

Attachment: smime.p7s
Description: S/MIME-cryptografische ondertekening