From 80f83cdb0ad0f916c0502f7b9b4534244bfeda49 Mon Sep 17 00:00:00 2001 From: Philipp Dunkel Date: Mon, 1 Jun 2009 23:06:41 +0000 Subject: [PATCH] Update from Dirk --- www/cap.php | 92 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/www/cap.php b/www/cap.php index 0b12bf9..b618eca 100644 --- a/www/cap.php +++ b/www/cap.php @@ -80,13 +80,13 @@ $this->Write(4,recode($_SESSION['_config']['recode'], _("It's encouraged that you tear the top of this form off and give it to the person you are assuring as a reminder to sign up, and as a side benefit the tear off section also contains a method of offline verification of our fingerprints."))); // Assuree Section - $top = 130; - $this->Rect(11, $top, $this->w - 25, 50, "D"); + $top = 120; + $this->Rect(11, $top, $this->w - 25, 60, "D"); //50 -> 60 $this->SetXY(11, $top + 5); $this->SetFont("Arial", "BUI", "20"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','BUI',20); - $this->Write(0, recode($_SESSION['_config']['recode'],_("Applicant's Statement"))); + $this->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's Statement"))); $this->Rect(13, $top + 10, $this->w - 29, 6, "D"); $this->Line(80, $top + 10, 80, $top + 16); $this->SetXY(15, $top + 13); @@ -140,10 +140,17 @@ $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','',9); - $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I hereby confirm that the information stated above is both true and correct, and request the CAcert Assurer (identified below) to witness my identity in the CAcert Assurance Programme."))); - $this->SetXY(17, $top + 45); + $this->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I hereby confirm that the information stated above is both true and correct, and request the CAcert Assurer (identified below) to verify me according to CAcert Assurance Policy."))); +// new da start + $this->SetXY(13, $top + 42); + $this->SetFont("Arial", "", "9"); + if($_SESSION['_config']['language'] == "ja_JP") + $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->Write(0, recode($_SESSION['_config']['recode'], _("Applicant's signature")).": __________________________________"); - $this->SetXY(135, $top + 45); + $this->SetXY(135, $top + 55);//45->55 $this->Write(0, recode($_SESSION['_config']['recode'], _("Date (YYYY-MM-DD)")).": "); if($date == "") { @@ -156,8 +163,8 @@ } // Assurer Section - $top += 55; - $this->Rect(11, $top, $this->w - 25, 63, "D"); + $top += 65; // 55->65 + $this->Rect(11, $top, $this->w - 25, 83, "D"); //63->93 $this->SetXY(11, $top + 5); $this->SetFont("Arial", "BUI", "20"); if($_SESSION['_config']['language'] == "ja_JP") @@ -177,28 +184,30 @@ } else { $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's Name")).": ________________________________________________________________"); } +//moved down +// $this->SetFont("Arial", "", "9"); +// if($_SESSION['_config']['language'] == "ja_JP") +// $this->SetFont('SJIS','',9); +// $this->SetXY(17, $top + 22); +// $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's signature")).": __________________________________"); +// $this->SetXY(135, $top + 22); +// $this->Write(0, recode($_SESSION['_config']['recode'], _("Date (YYYY-MM-DD)")).": "); +// if($date == "") +// { +// $this->Write(0, "20___-___-___"); +// } else { +// $this->SetFont("Arial", "U", "10"); +// if($_SESSION['_config']['language'] == "ja_JP") +// $this->SetFont('SJIS','U',10); +// $this->Write(0, str_pad($date, 13, " ")); +// } +// end $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','',9); $this->SetXY(17, $top + 22); - $this->Write(0, recode($_SESSION['_config']['recode'], _("Assurer's signature")).": __________________________________"); - $this->SetXY(135, $top + 22); - $this->Write(0, recode($_SESSION['_config']['recode'], _("Date (YYYY-MM-DD)")).": "); - if($date == "") - { - $this->Write(0, "20___-___-___"); - } else { - $this->SetFont("Arial", "U", "10"); - if($_SESSION['_config']['language'] == "ja_JP") - $this->SetFont('SJIS','U',10); - $this->Write(0, str_pad($date, 13, " ")); - } - $this->SetFont("Arial", "", "9"); - if($_SESSION['_config']['language'] == "ja_JP") - $this->SetFont('SJIS','',9); - $this->SetXY(17, $top + 25); $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 + 35); + $this->SetXY(17, $top + 30); if($document1 == "") { $this->Write(0, "1. __________________________________________________________________"); @@ -212,7 +221,7 @@ $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','',9); - $this->SetXY(17, $top + 40); + $this->SetXY(17, $top + 35); if($document2 == "") { $this->Write(0, "2. __________________________________________________________________"); @@ -226,7 +235,7 @@ $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','',9); - $this->SetXY(17, $top + 50); + $this->SetXY(17, $top + 45); $this->Write(0, recode($_SESSION['_config']['recode'], _("Location of Face-to-face Meeting")).": "); if($location == "") { @@ -240,13 +249,38 @@ $this->SetFont("Arial", "", "9"); if($_SESSION['_config']['language'] == "ja_JP") $this->SetFont('SJIS','',9); - $this->SetXY(17, $top + 55); + $this->SetXY(17, $top + 50); $this->Write(0, recode($_SESSION['_config']['recode'], _("Points Allocated")).": ______________"); if($maxpoints > 0) { - $this->SetXY(17, $top + 60); + $this->SetXY(17, $top + 50); $this->Write(0, recode($_SESSION['_config']['recode'], _("Maximum Points")).": ".$maxpoints); } +//from above + $this->SetFont("Arial", "", "9"); + if($_SESSION['_config']['language'] == "ja_JP") + $this->SetFont('SJIS','',9); + $this->SetXY(17, $top + 57); + $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->MultiCell($this->w - 29, 3, recode($_SESSION['_config']['recode'], _("I have read and agree to the CAcert Community Agreement")."( http://www.cacert.org/policy/CAcertCommunityAgreement.php )")); + + $this->SetFont("Arial", "", "9"); + if($_SESSION['_config']['language'] == "ja_JP") + $this->SetFont('SJIS','',9); + $this->SetXY(17, $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)")).": "); + if($date == "") + { + $this->Write(0, "20___-___-___"); + } else { + $this->SetFont("Arial", "U", "10"); + if($_SESSION['_config']['language'] == "ja_JP") + $this->SetFont('SJIS','U',10); + $this->Write(0, str_pad($date, 13, " ")); + } + } }