CAcert Code Development list.

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

Hi Michael,

Op 25-7-2012 2:16, Michael Tänzer schreef:
> We have a fix for https://bugs.cacert.org/view.php?id=1075
> 
> The fix was reviewed by Dirk Astrath (dastrath) and me (NEOatNHNG) and
> tested by Ulrich Schröter (Uli60), Marcus Mängel (INOPIAE), Martin Gummi
> (MartinGummi).
> 
> 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/wot/6.php

The patch has been applied to the production server on July 25, 2012.
See also the attached log message. The translations have also been
updated in both directions.

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: Wed, 25 Jul 2012 17:18:14 +0200
• Organization: CAcert

Fix for https://bugs.cacert.org/view.php?id=1075
On the assure someone page the links to the CAP-forms do not work.

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: Wed, 25 Jul 2012 17:14:15 +0200 (CEST)

uid=0(root) gid=0(root) groups=0(root)
6.php 1.35 1.36
Wed Jul 25 17:14:15 CEST 2012
Update of /var/lib/cvs/cacert/pages/wot
In directory hlin:/home/cacert/www/pages/wot

Modified Files:
        6.php 
Log Message:
Fix for https://bugs.cacert.org/view.php?id=1075
On the assure someone page the links to the CAP-forms do not work.

===================================================================
RCS file: /var/lib/cvs/cacert/pages/wot/6.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- 6.php       2012/05/30 17:48:19     1.35
+++ 6.php       2012/07/25 15:14:14     1.36
@@ -17,10 +17,6 @@
 */ ?>
 <?
 
-function makecap()
-{
-}
-
         if(!array_key_exists('notarise',$_SESSION['_config']))
        {
           echo "Error: No user data found.";
@@ -44,8 +40,6 @@
        $name = $fname." ".$mname." ".$lname." ".$suffix;
        $_SESSION['_config']['wothash'] = md5($name."-".$dob);
 
-       
$cap=makecap($fname,$mname,$lname,$suffix,$dob,$row['email'],$_SESSION['profile']['fname'],$_SESSION['profile']['mname'],$_SESSION['profile']['lname'],$_SESSION['profile']['suffix']);
-
        
include_once($_SESSION['_config']['filepath']."/includes/wot.inc.php");
 
        AssureHead(_("Assurance Confirmation"),sprintf(_("Please check the 
following details match against what you witnessed when you met %s in person. 
You MUST NOT proceed unless you are sure the details are correct. You may be 
held responsible by the CAcert Arbitrator for any issues with this 
Assurance."), $fname));
@@ -61,6 +55,5 @@
        AssureInboxLine("points",_("Points"),"","<br />(Max. 
".maxpoints().")");
        AssureCCABoxLine("CCAAgreed",sprintf(_("Check this box only if %s 
agreed to the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert 
Community Agreement</a>"),$fname));
        AssureCCABoxLine("CCAAgree",_("Check this box only if YOU agree to 
the <a href=\"/policy/CAcertCommunityAgreement.php\">CAcert Community 
Agreement</a>"));
-       AssureTextLine(_("WoT Form"),"<a href=\"".$cap."\" 
target=\"_blank\">A4 - "._("WoT Form")."</a> <a 
href=\"".$cap."&amp;format=letter\" target=\"_blank\">US - "._("WoT 
Form")."</a>");
        AssureFoot($id,_("I confirm this Assurance"));
 ?>

--- End Message ---

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

--- End Message ---

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