Subject: CAcert Code Development list.
List archive
- From: Michael Tänzer <michael.taenzer AT cacert.org>
- To: "critical-admin AT cacert.org" <critical-admin AT cacert.org>
- Cc: cacert-devel AT lists.cacert.org, Ulrich Schröter CAce rt <ulrich AT cacert.org>, Dirk Astrath <dirk.astrath AT cacert.org>, Marcus Mängel <inopiae AT cacert.org>, Martin Gummi <martin.gummi AT cacert.org>
- Subject: Patch request: Bug #1075
- Date: Wed, 25 Jul 2012 02:16:52 +0200
- Openpgp: id=9940BEF1
Hi folks,
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
--
Have a nice day,
Michael Tänzer
diff --git a/pages/wot/6.php b/pages/wot/6.php index e648ed4..28c1875 100644 --- a/pages/wot/6.php +++ b/pages/wot/6.php @@ -17,10 +17,6 @@ */ ?> <? -function makecap() -{ -} - if(!array_key_exists('notarise',$_SESSION['_config'])) { echo "Error: No user data found."; @@ -44,8 +40,6 @@ function makecap() $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 @@ function makecap() 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."&format=letter\" target=\"_blank\">US - "._("WoT Form")."</a>"); AssureFoot($id,_("I confirm this Assurance")); ?>
Attachment:
smime.p7s
Description: S/MIME Cryptographic Signature
- Patch request: Bug #1075, Michael Tänzer, 07/25/2012
- Re: Patch request: Bug #1075, Wytze van der Raay, 07/25/2012
Archive powered by MHonArc 2.6.16.