From babc43c0140fc21e17ec4cf0c2b756ff65c45732 Mon Sep 17 00:00:00 2001
From: Philipp Dunkel <philipp@cacert.org>
Date: Tue, 23 Jun 2009 20:44:25 +0000
Subject: [PATCH] Update from Dirk

---
 www/cap.php | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/www/cap.php b/www/cap.php
index fe3d251..6b08d38 100644
--- a/www/cap.php
+++ b/www/cap.php
@@ -148,7 +148,7 @@
 				$this->SetFont('SJIS','',9);
 			$this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I agree to the CAcert Community Agreement.")." ( http://www.cacert.org/policy/CAcertCommunityAgreement.php )"));
 // new da end
-			$this->SetXY(17, $top + 55); //45->55
+			$this->SetXY(13, $top + 55); //45->55
 			$this->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's signature")).": __________________________________");
 			$this->SetXY(135, $top + 55);//45->55
 			$this->Write(0, recode($_SESSION['_config']['recode'], _("Date (YYYY-MM-DD)")).": ");
@@ -173,23 +173,25 @@
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 15);
+			$this->SetXY(13, $top + 15);
 			if($assurer)
 			{
 				$this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ");
-				$this->SetFont("Arial", "U", "10");
+				$this->SetFont("Arial", "", "10");
 				if($_SESSION['_config']['language'] == "ja_JP")
 					$this->SetFont('SJIS','U',10);
+//				$this->MultiCell($this->w - 70, 2, recode($_SESSION['_config']['recode'], $assurer));
 				$this->Write(0, str_pad($assurer, 50, " "));
 			} else {
+				$this->SetFont("Arial", "U", "10");
 				$this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ________________________________________________________________");
 			}
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 22);
+			$this->SetXY(13, $top + 22);
 			$this->MultiCell($this->w - 34, 3, recode($_SESSION['_config']['recode'], _("Photo ID Shown: (ID types, not numbers. eg Drivers license, Passport)")));
-			$this->SetXY(17, $top + 30);
+			$this->SetXY(13, $top + 30);
 			if($document1 == "")
 			{
 				$this->Write(0, "1. __________________________________________________________________");
@@ -203,7 +205,7 @@
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 35);
+			$this->SetXY(13, $top + 35);
 			if($document2 == "")
 			{
 				$this->Write(0, "2. __________________________________________________________________");
@@ -217,7 +219,7 @@
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 45);
+			$this->SetXY(13, $top + 45);
 			$this->Write(0, recode($_SESSION['_config']['recode'], _("Location of Face-to-face Meeting")).": ");
 			if($location == "")
 			{
@@ -231,23 +233,25 @@
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 50);
-			$this->Write(0, recode($_SESSION['_config']['recode'], _("Points Allocated")).": ______________");
+			$this->SetXY(13, $top + 50);
 			if($maxpoints > 0)
 			{
-				$this->SetXY(17, $top + 50);
 				$this->Write(0, recode($_SESSION['_config']['recode'], _("Maximum Points")).": ".$maxpoints);
+			} else {
+				$this->Write(0, recode($_SESSION['_config']['recode'], _("Points Allocated")).": ______________");
 			}
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 56);
-			$this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I, the Assurer, hereby confirm that I have verified the Member according to CAcert Assurance Policy.")."\n"._("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points.")));
+			$this->SetXY(13, $top + 54);
+			$this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I, the Assurer, hereby confirm that I have verified the Member according to CAcert Assurance Policy.")));
+			$this->SetXY(13, $top + 59);
+			$this->MultiCell($this->w - 33, 3, recode($_SESSION['_config']['recode'], _("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points.")));
 
 			$this->SetFont("Arial", "", "9");
 			if($_SESSION['_config']['language'] == "ja_JP")
 				$this->SetFont('SJIS','',9);
-			$this->SetXY(17, $top + 74);  //22->67
+			$this->SetXY(13, $top + 74);  //22->67
 			$this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's signature")).": __________________________________");
 			$this->SetXY(135, $top + 74); //22->67
 			$this->Write(0, recode($_SESSION['_config']['recode'], _("Date (YYYY-MM-DD)")).": ");