From b3007006ab35289035e53145ae9fc5101b4d4e58 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 2 Mar 2009 23:09:05 +0000 Subject: [PATCH] Added new files and new versions --- www/cap.html.php | 247 ++++++++++++++ www/capnew.php | 848 +++++++++++++++++++++++++--------------------- www/coap.html.php | 350 +++++++++++++++++++ www/coapnew.php | 514 ++++++++++++++++------------ 4 files changed, 1356 insertions(+), 603 deletions(-) create mode 100644 www/cap.html.php create mode 100644 www/coap.html.php diff --git a/www/cap.html.php b/www/cap.html.php new file mode 100644 index 0000000..5fccac3 --- /dev/null +++ b/www/cap.html.php @@ -0,0 +1,247 @@ +', "\n"; + echo '', "\n"; + + echo '', "\n"; + echo '', "\n"; + echo ''._("Identity Verification Form (CAP) form").'', "\n"; + echo '', "\n"; + + echo '', "\n"; + echo '

', "\n"; + echo '

CAcert logo'; + echo '
', "\n"; + echo '

', "\n"; + echo '

', "\n"; + echo '

', "\n"; + echo ''._("CAcert Assurance Programme").'
', "\n"; + echo '
', "\n"; + echo '
', "\n"; + echo ''._("Identity Verification Form (CAP) form").'
', "\n"; + echo '
', "\n"; + echo '
'.'CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.cacert.org/
', "\n"; + + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '
', "\n"; + echo '
'._("CAcert's Root Certificate sha1 fingerprints").'class 1: 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33
class 3: DB4C 4269 073F E9C2 A37D 890A 5C1B 18C4 184E 2A2D
', "\n"; + echo '

', "\n"; + echo _("The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face to face witnessing of government-issued photo identity documents."); + echo _("The Applicant asks the Assurer to verify to the CAcert Community that the Assurer has met and verified the Applicant's identity against original documents."); + echo _("Assurer may leave a copy of the details with the Applicant, and may complete and sign her final form after the meeting."); + echo _("If there are any doubts or concerns about the Applicant's identity, do not allocate points. You are encouraged to perform a mutual Assurance."); + echo '
', "\n"; + echo _("For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit:"); + echo ' http://www.cacert.org/
', "\n"; + echo _("A CAcert Arbitrator can require the Assurer to deliver the completed form in the event of a dispute. After 7 years this form should be securely disposed of to prevent identity misuse. E.g. shred or burn the form. The Assurer does not retain copies of ID at all."); + echo '
', "\n"; + echo _("For the CAcert Organisation Assurance Programme there is a separate special COAP form."); +/* + echo '

', "\n"; +*/ + + echo '
', "\n"; + + echo '', "\n"; + echo ' ', "\n", ' ', "\n", '', "\n", '', "\n"; + echo '
', "\n"; + echo '
'; + echo '
'._("Date and location of the face-to-face meeting").':', "\n"; + echo '', "\n"; + echo '
'; + echo '
('._("yyyy-dd-mm").')'; + echo '
', "\n"; + echo '
', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', " \n", '', "\n"; +/* + echo '', "\n"; + echo '', "\n"; +*/ + echo '', "\n"; + echo ' ', "\n".'', "\n"; + echo '', "\n". ' ', "\n".'', "\n"; +/* + echo '', "\n"; + echo '', "\n"; +*/ + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '
'._("Applicant's Identity Information").''; + /* echo _("points").'
'._("allocated"); */ + echo str_replace(" ", '
', _("points allocated")); + echo '
'._("Exact full name on the ID").': (', "\n"._("type of ID shown").')', "\n"._("max").'35
', "\n"; + echo '
', "\n"; + echo '
', "\n"; + echo '
'._("Email address").':
'._("Date of Birth").' ('._("yyyy-mm-dd").')'.'
'._("Applicant's Statement").'
'._("Make sure you have read and agreed with the CAcert Community Agreement"); + echo '(CCA)
', "\n"; + echo '
'; + echo _("I hereby confirm that the information stating my Identity Information above is both true and correct and request the CAcert Assurer (see below) to witness my identity in the CAcert Assurance Programme."); + echo '
'; + echo _("I agree to the CAcert Community Agreement.").' ('; + echo 'CCA)', "\n"; + echo '
'._("Date").' ('._("yyyy-mm-dd").')'.'
 '._("Applicant's signature").'
', "\n"; + echo '
', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; +/* + echo '', "\n"; + echo '', "\n"; +*/ + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; +/* + echo '', "\n"; + echo '', "\n"; +*/ + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '
'._("Assurer's Statement").'', "\n"; + echo '
'._("Assurer's Name").'
'.'('._("optional").')'.'', "\n"; + echo _("Date of Birth").' ('._("yyyy-mm-dd").')'; + echo '
'._("Assurer's email address").'', "\n"; + echo '('._("optional").')'.'
'; + echo _("I, the Assurer, hereby confirm that I have verified the Applicant's Identity Information, I will witness the Applicant's identity in the CAcert Assurance Programme, and allocate Assurance Points."); + echo '
'; + echo _("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points."); + echo '
'._("Date").' ('._("yyyy-mm-dd").')'; + echo '
'._("Assurer's signature").'
', "\n"; + echo '
© '.date('Y').' CAcert Inc., V5, '.date('Y-n-j').'
', "\n"; + echo '
', "\n"; + echo '

', "\n"; + echo '', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '
'._("How To Print this CAP form").'', "\n"; + echo '
', "\n"; + echo '

'; + echo _("A printer ready file with the form and attachments can be generated as follows:"); + echo '

', "\n"; + echo '
'._("2-up"); + echo ' '._("portrait").' '._("1-up").')'; + echo '
', "\n"; + echo '
A4', "\n"; + echo ' A5', "\n"; + echo ' Letter '._("paper format"); + echo '
', "\n"; + echo '
'._("no"); + echo ' '._("yes, the CCA is attached to the form."); + echo '
', "\n"; + echo '
', "\n"; + echo _("Submit the form").': ', "\n"; + echo '

', "\n"; + echo '
', "\n"; + + echo '', "\n"; + echo '', "\n"; +?> diff --git a/www/capnew.php b/www/capnew.php index d36dd22..130ff89 100644 --- a/www/capnew.php +++ b/www/capnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: capnew.php,v 1.1 2008/11/14 23:39:10 root Exp $ -define('REV', '$Revision: 1.1 $'); +// $Id: capnew.php,v 1.2 2009/03/02 23:09:05 root Exp $ +define('REV', '$Revision: 1.2 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -36,7 +36,7 @@ define('REV', '$Revision: 1.1 $'); ** PDF generation package (tcpdf/tcpdf.php): ** TCPDF package + define the TCPDF_DIR install directory (GPL) ** tcpdf package is patched for text subtypes see tcpdf diff file. -** Add free embedding zapfdingbat font: e.g. ITC_Zapf_Dingbats_Medium.ttf +** Add free embedding zapfdingbat font ** ttf2pt1 -F zapfdinbats.ttf -> zapfdingbats.utf metrics file ** php -q makefont.php zapfsdingbats.ttf zapfdingbats.utf -> .php,.ctg.z,.z ** install files: zapfdingbats.{php,z,ctg.z} in tcpdf/fonts dir @@ -53,8 +53,8 @@ define('REV', '$Revision: 1.1 $'); ** see UTF8_ASCII definition for location requirements ** Thirdly: if not found transliteration feature is disabled. ** -** CCA pdf inclusion: -** if on one page: define holder for CCA file (CCA_FILE) (disabled now) +** policy documents for pdf inclusion: +** define CCA file (default policy) ** LOGO: CAcert logo logos directory is LOGO ** ** Functionality: @@ -71,8 +71,8 @@ define('REV', '$Revision: 1.1 $'); ** PDF URL links are used to web, wiki, and faq for more info search ** Only on non-ascii chars in a name the utf8 routines are loaded ** PDF reader has wiki info url's and easy email feedback -** DISABLED: -** CCA generates only on request (to be changed when it fits on one page) +** ENABLED: +** included is the CCA generates 2 extra pages (needs work to limit vert spacing) ** ** For other re-use of some routines: ** abbreviate() abbreviate a name on std way @@ -91,10 +91,13 @@ define('REV', '$Revision: 1.1 $'); ** If not provided: should check every string is transcoded? ** recode(), recode_string(0 is said to have too many (japanese) defeats ** recode_string() is only used on GET[] input (html->utf-8), -** own translate fie _() is expected to provide utf-8 (own recode() ) ** UTF-8 use routines from http://www.sourceforge.net/projects/phputf8 ** which replaces php recode() package. ** on many places own utf-8 handling code exists and is loaded (tcpdf problem) +** _() translation routine. The returned HTML string is translated to utf-8 string. +** the GET() routines expects utf-8 code (see test defs) but might be changed +** to use html entity conversion routine of PHP (5.2 has a problem...). +** ** PDF compression zlib: (now disabled) ** if PHP lib zcompress() is present, generated PDF is compressed ** @@ -103,11 +106,10 @@ define('REV', '$Revision: 1.1 $'); ** Latter font is no longer for free download ** For now: FreeVeraSans is used now and embedded (std in TCPDF package) ** ZapfDingbat font: some Open Source readers have bad font handling or -** no zapfdingbat font. So it is embedded: e.g. free ITC_Zapf_Dingbats_Medium.ttf +** no zapfdingbat font. So one is embedded ** To be generated with tooling in util directory. ** ** TO DO, to CHECK and KNOWN PROBLEMS: -** _() translation routine returns recoded and checks UTF-8 chars? ** Japanse package (maybe not needed with TCPDF?) ** CCA informal should be on one page (no CCA printed yet) ** form field checks, print button (Java script) @@ -161,17 +163,18 @@ define('REV', '$Revision: 1.1 $'); ** $_GET['location'] location of assurance ** $_GET['maxpoints'] max points allocated depends on assurer default 35 ** $_GET['nocca'] do not print CCA on back side (dflt: false) +** $_GET['policy<%d>'] to include policy document(s) in pdf file %d = 1-9 (new) ** $_GET['noform'] do not print form (dflt: true) (new) ** $_GET['format'] paper format required A0-A6,Letter, Folio, B0-B6 (dflt A4) ** $_GET['watermark'] watermark on the page -** $_GET['orientation'] paper orientation default "landscape" default 2-up (new) -** $_SESSION['_config']['language'] for "ja_JP" japanese default != ja_JP -** $_SESSION['_config']['recode'] = "format" recode() uses it: needed ? +** $_GET['orientation'] paper orientation default 'portrait' +** $_SESSION['_config']['language'] for 'ja_JP' japanese default != ja_JP +** $_SESSION['_config']['recode'] = 'format' recode() uses it: needed ? ** recode() is aliased to php lib function recode_string() ** $_REQUEST['bw'] if exists use black/white, default use colour ** ** Output, package generates: -** PDF display screen is scaled to 100% A4 size +** PDF display screen is scaled to 150% A5 size ** PDF property fields have CAcert info ** on non empty _GET strings, the package generates prefilled form fields. ** PDF form field variables (Java Script): @@ -202,7 +205,7 @@ define( 'TEST', true ); // make sure packages are installed here define('RT','./'); define('TCPDF_DIR', '/usr/share/tcpdf_php4'); -define('UTF8',RT."/utf8/native/core.php"); +define('UTF8',RT.'/utf8/native/core.php'); if( file_exists(RT.'/transtab.php') ) // wherever it is define('UTF8_ASCII', RT.'/transtab.php'); else @@ -213,58 +216,59 @@ if( defined( 'TEST' ) ) { // ONLY FOR TEST PURPOSES ===================================== /* test data */ - $_SESSION['_config']['recode'] = "html..utf-8"; // ???? + $_SESSION['_config']['recode'] = 'html..utf-8'; // ???? if( isset($_SERVER['LANG']) ) $_SESSION['_config']['language'] = $_SERVER['LANG']; if( array_key_exists('FORMAT',$_SERVER) AND $_SERVER['FORMAT'] ) $_GET['format'] = $_SERVER['FORMAT']; else { - //$_GET['format'] = "A5"; // margin scale problem... does not work - //$_GET['format'] = "Legal"; // ok - //$_GET['format'] = "Folio"; // ok - //$_GET['format'] = "Letter"; // letter little margin problem - //$_GET['format'] = "A4"; // A4, default ok + //$_GET['format'] = 'A5'; // ok, default + //$_GET['format'] = 'Legal'; // ok + //$_GET['format'] = 'Folio'; // ok + //$_GET['format'] = 'Letter'; // letter little margin problem + //$_GET['format'] = 'A4'; // ok } if( array_key_exists('ORIENTATION',$_SERVER) AND $_SERVER['ORIENTATION'] ) $_GET['orientation'] = $_SERVER['ORIENTATION']; else { - //$_GET['orientation'] = "portrait"; // default 2 pages, or portrait + //$_GET['orientation'] = 'portrait'; // default 2 pages, or portrait } - $_GET['nocca'] = isset($_SERVER['CCA']) ? $_SERVER['CCA'] : ""; - if( isset($_SERVER['FORM']) AND $_SERVER['FORM'] == "noform" ) - $_GET['noform'] = "true"; + $_GET['nocca'] = isset($_SERVER['CCA']) ? $_SERVER['CCA'] : ''; + //$_GET['policy1'] = 'policy/PolicyOnPolicy.php'; + if( isset($_SERVER['FORM']) AND $_SERVER['FORM'] == 'noform' ) + $_GET['noform'] = 'true'; if( array_key_exists('FORM',$_SERVER) AND $_SERVER['FORM'] != 'empty' ){ // assuree info part - $_GET['date'] = "2008-11-04"; - $_GET['name'] = "drs. T. Fabrice Ghuege-Denis"; // upwards competable + $_GET['date'] = '2008-11-04'; + $_GET['name'] = 'drs. T. Fabrice Ghuege-Denis'; // upwards competable $_GET['name1'] = $_GET['name']; // will void 'name' - $_GET['name1ID'] = "rijbewijs"; - //$_GET['name1Pnts'] = ""; - $_GET['name2'] = "drs. Teus F. Ghuege-Denis"; // second name - //$_GET['name2ID'] = ""; - $_GET['name2Pnts'] = "10"; // seems not to work properly yet - $_GET['name3'] = "Tänўs Iʼntèrnątiœñalîsàtïǿn Ĝügé"; // third, show of javascript error - $_GET['name3ID'] = "paspoort"; - $_GET['name3Pnts'] = "12"; - $_GET['name8'] = "This Should Be invisible"; - $_GET['dob'] = "1945-10-06"; - $_GET['document1'] = "führerschein"; - $_GET['document2'] = "paspoort"; - $_GET['email'] = "tesu.hagaen@thesu.xs4all.eu"; + $_GET['name1ID'] = 'rijbewijs'; + //$_GET['name1Pnts'] = ''; + $_GET['name2'] = 'drs. Teus F. Ghuege-Denis'; // second name + //$_GET['name2ID'] = ''; + $_GET['name2Pnts'] = '10'; // seems not to work properly yet + $_GET['name3'] = 'Tänўs Iʼntèrnątiœñalîsàtïǿn Ĝügé'; // third, show of javascript error + $_GET['name3ID'] = 'paspoort'; + $_GET['name3Pnts'] = '12'; + $_GET['name8'] = 'This Should Be invisible'; + $_GET['dob'] = '1945-10-06'; + $_GET['document1'] = 'führerschein'; + $_GET['document2'] = 'paspoort'; + $_GET['email'] = 'tesu.hagaen@thesu.xs4all.eu'; // assurer info - $_GET['assurer'] = "mr A. B. C. Äßurer";// one name only - $_GET['assurerdob'] = "2010-12-32"; // for mutual assurance - $_GET['assureremail'] = "assurer.email@cacert.org"; // for mutual assurance + $_GET['assurer'] = 'mr A. B. C. Äßurer';// one name only + $_GET['assurerdob'] = '2010-12-32'; // for mutual assurance + $_GET['assureremail'] = 'assurer.email@cacert.org'; // for mutual assurance // meeting info - $_GET['location'] = "Grubbenvorst, the Carabiën"; - $_GET['assurerdate'] = ""; - $_GET['assurancedate'] = "2008-12-31"; - $_GET['maxpoints'] = "20"; - $_GET['watermark'] = "just an EXAMPLE"; + $_GET['location'] = 'Grubbenvorst, the Carabiën'; + $_GET['assurerdate'] = ''; + $_GET['assurancedate'] = '2008-12-31'; + $_GET['maxpoints'] = '20'; + $_GET['watermark'] = 'just an EXAMPLE'; } else { - //$_GET['ALL'] = "empty"; + //$_GET['ALL'] = 'empty'; } //$_REQUEST[bw] = true; @@ -294,36 +298,35 @@ define('LIME', '#C7FF00'); // RGB 199 255 0 define('GREEN', '#00BE00'); // 0 190 0 define('POBOX','CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia'); -define('WEB', 'http://www.CAcert.org'); +define('WEB', 'http://www.cacert.org'); define('WIKI','http://wiki.cacert.org/wiki'); define('ROOTKEYS','http://www.cacert.org/index.php?id=3'); define('ASSCAP', WIKI.'/FAQ/AssuranceByCAP'); define('ASSHBK', WIKI.'/AssuranceHandbook'); define('ASSINFO', WIKI.'/FAQ/AssuranceInformationForCAP'); define('ASSINTRO', WIKI.'/FAQ/AssuranceIntroduction'); -define('ASSORG', WIKI."/OrganisationAssurance"); -define('ARBIT', WIKI."/ArbitrationForum"); +define('ASSORG', WIKI.'/OrganisationAssurance'); +define('ARBIT', WIKI.'/ArbitrationForum'); // CAcert Community Agreement -define('CCA', WEB."/policy/CAcertCommunityAgreement.php"); +define('CCA', 'CAcertCommunityAgreement'); // default policy to print +define('POLICY','policy/'); // default polciy doc directory +define('EXT','.php'); // default polciy doc extention, should be html /* finger print CAcert Root Key */ // should obtain this automatically -define("CLASS1_SHA1","135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33"); -define("CLASS3_SHA1","DB4C 4269 073F E9C2 A37D 890A 5C1B 18C4 184E 2A2D"); +define('CLASS1_SHA1','135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33'); +define('CLASS3_SHA1','DB4C 4269 073F E9C2 A37D 890A 5C1B 18C4 184E 2A2D'); // next two are not used on the form -define("CLASS1_MD5","A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B"); -define("CLASS3_MD5","73:3F:35:54:1D:44:C9:E9:5A:4A:EF:51:AD:03:06:B6"); -// place where CCA files resides -if( file_exists('../CAcertCommunityAgreement.html') ) - define('CCA_FILE', '../CAcertCommunityAgreement.html'); -//else -// define('CCA_FILE', CCA); // this greps the page from internet !! +define('CLASS1_MD5','A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B'); +define('CLASS3_MD5','73:3F:35:54:1D:44:C9:E9:5A:4A:EF:51:AD:03:06:B6'); +// if on draft provide std message +define('WATERMARK',''); // other definitions for the form -define("MAX_COLS", 2); // max coulumns per page Landscape is printed with 2-up +define('MAX_COLS', 2); // max coulumns per page Landscape is printed with 2-up // put next to 200 and it will disable printout -define("MINH", 98.5); // in A5 mm is current estimated left over space on one page -define("H", 5); // height of a name entry field +define('MINH', 98.5); // in A5 mm is current estimated left over space on one page +define('H', 5); // height of a name entry field //set margins -define("MARGIN",11.296); // 2-up will be scaled +define('MARGIN',11.296); // 2-up will be scaled // base of font size define( 'F_SIZE', 7 ); @@ -333,7 +336,7 @@ define('DFL_FORMAT', 'html..utf-8'); // Japanese is not supported? if( array_key_exists('_config', $_SESSION) ) { if( isset($_SESSION['_config']['language']) ) { - if($_SESSION['_config']['language'] == "ja_JP") + if($_SESSION['_config']['language'] == 'ja_JP') define('FONT','SJIS'); else define( 'FONT', 'freesans'); } @@ -353,7 +356,7 @@ else function my_recode($strg = NULL ) { static $format = NULL; - if( $strg == NULL OR !$strg ) return ( "" ); + if( $strg == NULL OR !$strg ) return ( '' ); if( $format == NULL ) { if( array_key_exists('_config', $_SESSION) ) { if( isset( $_SESSION['_config']['recode']) ) @@ -363,7 +366,7 @@ function my_recode($strg = NULL ) else $format = DFL_FORMAT; } // newer tcpdf package is full UTF-8 Voided by this package? - if( function_exists("recode_string" ) ) + if( function_exists('recode_string' ) ) return ( recode_string($format, $strg) ); else return( $strg ); } @@ -384,38 +387,99 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class CAPPDF extends TCPDF { - // do cap form version numbering automatically "$Revision: 1.1 $" + // do cap form version numbering automatically '$Revision: 1.2 $' /*public*/ function Version() { - strtok(REV, " "); - return(strtok(" ")); + strtok(REV, ' '); + return(strtok(' ')); } - - function Header() + + /*public*/ function myHeader( $msg = NULL, $url = NULL ) { - $this->setXY($this->lMargin, $this->lMargin); + static $my_url = NULL; + if( $msg != NULL ) { + $this->my_header_msg = $msg; $my_url = $url; return; + } + if( $this->my_header_msg == NULL ) return; + if( $this->msg_page_nr > 0 ) { + $font_fam = $this->FontFamily; + $font_style = $this->FontStyle.($this->underline ? 'U' : '').($this->linethrough ? 'D' : ''); + $font_size = $this->getFontSize(); + $this->SetFont(FONT,'', F_SIZE-1); + $this->setXY($this->lMargin, MARGIN-3); + $this->Cell($this->colwidth, 3,$this->my_header_msg, 0, 0, 'R'); + if( !empty($font_fam ) ) + $this->SetFont($font_fam,$font_style,$font_size); + if( $my_url != NULL AND $my_url != '' ) + $this->myLink($this->lMargin+$this->colwidth/2,$this->lMargin-4,$this->colwidth,(F_SIZE+5)/2.9,$my_url); + } + $this->setXY($this->lMargin, MARGIN+3); + $this->y0 = $this->getY(); + } + + // undefine default header and footer handling + // default routines do not handle columns + function Footer() { } + function Header() { } + function Mark( $string = '' ) { + return array( $string, 1+substr_count($string,'.') ); } - function Footer() + + /*public*/ function myFooter( $msg = NULL, $url = NULL ) { - if( $this->footer_msg == NULL ) return; + static $my_url = NULL; + if( $msg != NULL ) { + $this->my_footer_msg = $msg; $this->msg_page_nr = 0; + $my_url = $url; return; + } + if( $this->my_footer_msg == NULL ) return; + $this->InFooter = true; + $this->msg_page_nr++; + $font_fam = $this->FontFamily; + $font_style = $this->FontStyle.($this->underline ? 'U' : '').($this->linethrough ? 'D' : ''); + $font_size = $this->getFontSize(); $this->SetFont(FONT,'', F_SIZE-1); - $strg = "© ". date("Y"). " CAcert Inc.". $this->footer_msg; - if( $this->GetGroupPageNo() > 0 ) { - $this->SetXY(0, $this->GetPageHeight()/$this->scale*100.0-7); - $this->Cell($this->GetPageWidth()/$this->scale*100.0, 3, - sprintf("%s %d/%d", _("page"), $this->GetGroupPageNo()+1, - $this->GetNumPages()), 0, 0, 'C'); + if( $this->msg_page_nr > 1 ) { + $this->SetXY($this->lMargin, $this->GetPageHeight()/$this->scale*100.0-6); + $this->Cell($this->colwidth, 3, + sprintf("%s %d", $this->unhtmlentities( _('page') ), $this->msg_page_nr), + 0, 0, 'C'); } - $this->SetXY(MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-7); - $this->Cell($this->GetPageWidth()/$this->scale*100.0-MARGIN, 3, $strg, 0, 0, 'R'); + if( $this->my_footer_msg != '' ) { + $strg = '© '. date('Y'). ' CAcert Inc.'.', '. $this->my_footer_msg; + $this->SetXY($this->lMargin+MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-6); + $this->Cell($this->colwidth, 3, $strg, 0, 0, 'R'); + if( $my_url != NULL AND $my_url != '' ) + $this->myLink($this->lMargin+MARGIN/2,$this->GetPageHeight()/$this->scale*100.0-6,$this->colwidth,(F_SIZE+5)/2.9,$my_url); + } + if( $this->Watermark != '' ) { + $this->StartTransform(); + $savex = $this->GetX(); $savey = $this->GetY(); + $this->SetFont(FONT,'', F_SIZE*7); + $l = $this->GetStringWidth($this->Watermark); + $h = $this->GetPageHeight()/$this->scale*100.0/2; + $w = $this->colwidth/2+MARGIN; + $this->SetXY(0,0); + $this->TranslateY($h+(F_SIZE*7)/2.9); + $this->TranslateX($w-MARGIN+$this->lMargin); + $this->Rotate(rad2deg(atan($h/$w))); + $this->Text(-$l/2,0,$this->Watermark, 0.8); + $this->StopTransform(); + $this->SetXY($savex,$savey); + } + + if( !empty($font_fam ) ) + $this->SetFont($font_fam,$font_style,$font_size); + $this->InFooter = false; } // user and print preferences // NumCopies, PrintPageRange, DisplayDocTitle, HideMenuBar, HideToolBar, ... /*public*/ var $ViewerPrefs = array( 'Duplex' => 'Simplex', - 'NumCopies'=> '1', - 'DisplayDocTitle' => 'CAcert Assurance Programme (CAP) form', - 'HideToolBar' => 'true' + 'NumCopies'=> 2, + 'DisplayDocTitle' => 'CAcert Assurance Programme (CAP)', + 'HideToolBar' => true, + 'FitWindow' => true, ); //number of colums @@ -436,34 +500,36 @@ class CAPPDF extends TCPDF { // scaling factor /*protected*/ var $scale = 100.0; - // print form (footer msg) - /*protected*/ var $footer_msg = NULL; + // print header and footer + /*protected*/ var $my_footer_msg = NULL; + /*protected*/ var $my_header_msg = NULL; + /*protected*/ var $msg_page_nr = 0; // print short watermark on the page - /*public*/ var $Watermark = ""; + /*public*/ var $Watermark = WATERMARK; - /*public*/ function SetFormat( $format = "A4" ) { + /*public*/ function SetFormat( $format = 'a5' ) { switch( strtolower($format) ) { // there is some scale problems with margins... - case "a1": - case "b1": + case 'a1': + case 'b1': $this->scale *= 1.4142; - case "a2": - case "b2": + case 'a2': + case 'b2': $this->scale *= 1.4142; - case "a3": - case "b3": + case 'a3': + case 'b3': $this->scale *= 1.4142; break; - case "a5": - case "b5": + case 'a5': + case 'b5': $this->scale /= 1.4142; break; - case "letter": + case 'letter': $this->scale *= 0.97; break; - default: $format = "A4"; - case "a4": - case "b4": - case "folio": - case "legal": + default: $format = 'a4'; + case 'a4': + case 'b4': + case 'folio': + case 'legal': break; } $this->SetDisplayMode(intval($this->scale), 'SinglePage', 'UseOC'); @@ -471,14 +537,16 @@ class CAPPDF extends TCPDF { } //Set position at a given column - /*private*/ function SetCol($col = 0) { + /*private*/ function SetCol($col = -1) { static $pagecolwidth = 1.0; static $column_space = 1.0; + $this->InFooter = true; + if( $col == -1 ) $col = $this->col+1; if( $this->colwidth == 0 ) { // only once at start; set default values //set margins - $this->addPage(); + $this->addPage(); $col = 0; // reset to zero $this->SetMargins(MARGIN, MARGIN, MARGIN); if( $this->CurOrientation != 'L' ) { $this->scale *= 1.4142; @@ -498,11 +566,18 @@ class CAPPDF extends TCPDF { } $this->y0 = $this->GetY(); } - $this->PrintTable("", -1); // if pending table close up table + else { + if( $col == $this->col ) { // reset on close of this column + $x = MARGIN + $this->col*($pagecolwidth+$column_space); + $this->SetLeftMargin($x); + //$this->SetRightMargin($this->w - $x - $this->colwidth); + } + $this->PrintTable('', -1); // if pending table close up table + $this->myFooter(); // print footer msg if defined + } if( $col >= $this->ncols ) { - $this->addPage(); + $this->addPage(); $col = 0; $this->ScaleXY($this->scale,0,0); - $col = 0; $this->y0 = 0; //no header/footer done... } elseif ( $col > 0 AND $col < $this->ncols) { // print column separator @@ -520,24 +595,40 @@ class CAPPDF extends TCPDF { $this->SetLeftMargin($x); $this->SetRightMargin($this->w - $x - $this->colwidth); $this->SetXY($x, $this->y0); - $this->PrintTable("", 0); // if in table reprint title table + $this->myHeader(); //print header msg if defined + $this->PrintTable('', 0); // if in table reprint title table + $this->InFooter = false; } - //Method accepting or not automatic page break /*public*/ function AcceptPageBreak() { - if($this->col < ($this->ncols-1)) { - //Go to next column - $this->SetCol($this->col+1); - //Set ordinate to top - $this->SetY($this->y0); - //Keep on page - return false; - } else { - //Go back to first column - $this->SetCol($this->ncols); - //Page break - return false; + $this->SetCol(); + return false; + } + + // redefine this routine from tcpdf.php due to scaling bug + /*protected*/ function checkPageBreak($h) { + if (((($this->y + $h)*$this->scale/100.0) > $this->PageBreakTrigger) ) { + if ( !$this->InFooter ) { + if ( ($this->AcceptPageBreak())) { + $rs = ''; + //Automatic page break + $x = $this->x; + $ws = $this->ws; + if ($ws > 0) { + $this->ws = 0; + $rs .= '0 Tw'; + } + $this->AddPage($this->CurOrientation); + if ($ws > 0) { + $this->ws = $ws; + $rs .= sprintf('%.3f Tw', $ws * $k); + } + $this->_out($rs); + $this->y = $this->tMargin; + $this->x = $x; + } + } } } @@ -560,13 +651,13 @@ class CAPPDF extends TCPDF { // put Link in user space /*private*/ function myLink( $x, $y, $w, $h, $Lnk = NULL, $Type = array('SubType'=>'Link') ) { if( $Lnk == NULL ) return; - if( $Lnk == "" ) $Lnk = WEB; + if( $Lnk == '' ) $Lnk = WEB; $this->Annotation( $this->S($x), $this->S($y), $this->S($w), $this->S($h), $Lnk, $Type); } - //require_once("../utf8/native/core.php"); - // only for to upper case //require_once("../utf8/utils/unicoe.php"); + //require_once('../utf8/native/core.php'); + // only for to upper case //require_once('../utf8/utils/unicoe.php'); //setlocale(LC_ALL, 'de_DE'); // try to abbreviate a full name, returns name if abbreviation was/is done @@ -574,7 +665,7 @@ class CAPPDF extends TCPDF { // is based that given names and family names starts with capital // all names between first given name and surname are secondary names // will use utf8 routines only when needed and available - /*private*/ function Abbreviate( $name = "") { + /*private*/ function Abbreviate( $name = '') { // need to change this for utf8 uppercase detection // substr and strtoupper arte dependent of setlocale... $substr = 'substr'; @@ -585,7 +676,7 @@ class CAPPDF extends TCPDF { $fam = -1; $married = 0; $i = 0; $success = FALSE; $first_name = -1; for( $j = 0; $j < $cnt ; $j++ ) { $tk = $tokens[$j]; - $nm = $tk[0]; if( $nm == "" ) continue; + $nm = $tk[0]; if( $nm == '' ) continue; // not utf8 $ltr = $substr( $nm, 0, 1 ); if(preg_match('/[^\x09\x20-\x7E]/',$ltr) !== 1 AND // it is utf8 @@ -607,12 +698,12 @@ class CAPPDF extends TCPDF { $married++; } } - $name = ""; + $name = ''; for( $j = 0; $j < $cnt; $j++ ){ $tk = $tokens[$j]; if( !isset($tk[0]) ) continue; - $nm = $tk[0]; if( $nm == "" ) continue; - if( $name != "") $name .= " "; + $nm = $tk[0]; if( $nm == '' ) continue; + if( $name != '') $name .= ' '; $ltr = $substr( $nm, 0, 1 ); if( $j == $fam ) $name .= $nm; elseif( $strtoupper($ltr) != $ltr ) $name .= $nm; // lower case @@ -621,8 +712,8 @@ class CAPPDF extends TCPDF { // not utf8 // and abbreviate if( $j == $first_name ) - $abr = "(". $substr( $nm, 1 ) . ")"; - else $abr = "."; + $abr = '('. $substr( $nm, 1 ) . ')'; + else $abr = '.'; $name .= $ltr . $abr; $success = TRUE; // is abbreviated } else $name .= $nm; } @@ -635,7 +726,7 @@ class CAPPDF extends TCPDF { if( $ext < 0 ) $ext = $j+1; if( preg_match('/\./', $nm ) ) { $success = TRUE; break; } } - return( $success? $name : "" ); // and return abbriviated name + return( $success? $name : '' ); // and return abbriviated name } // set formfield coordinates @@ -666,21 +757,21 @@ class CAPPDF extends TCPDF { } // print Date on left or right side - /*private*/ function PrintDate( $x=10, $y=10, $dstrg="teus", $dvalue="1945-10-6", $field = NULL , $RL = 'L') + /*private*/ function PrintDate( $x=10, $y=10, $dstrg='teus', $dvalue='1945-10-6', $field = NULL , $RL = 'L') { - static $TextProps = array('strokeColor' => LLBLUE, 'value' => "", 'fillColor' => LBLUE , 'textSize' => '11', 'charLimit'=> 10); + static $TextProps = array('strokeColor' => LLBLUE, 'value' => '', 'fillColor' => LBLUE , 'textSize' => '11', 'charLimit'=> 10); // next statements will cause php to go into an infinite loop - //if( $dstrg != NULL AND $dstrg == "") - // $TextProps['userName'] = _("On mutual assurance provide Assurer date of birth (yyyy-mm-dd)"); + //if( $dstrg != NULL AND $dstrg == '') + // $TextProps['userName'] = $this->unhtmlentities( _("On mutual assurance provide Assurer date of birth (yyyy-mm-dd)") ); //else - $TextProps['userName'] = _("yyyy-mm-dd"); + $TextProps['userName'] = $this->unhtmlentities( _("yyyy-mm-dd") ); $this->SetFont( FONT, '', F_SIZE); $this->SetXY($RL == 'L'? $x : $x-50, $y); $this->Cell(50, 3, $dstrg, 0, 0, $RL); if($dvalue) { $this->SetXY($RL == 'L'? $x :$x-50, $y+3.5); - $this->SetFont(FONT, "B", F_SIZE); + $this->SetFont(FONT, 'B', F_SIZE); $this->Cell(50, 3, $dvalue, 0 , 0, $RL); } if( $field == NULL ) return; @@ -690,85 +781,106 @@ class CAPPDF extends TCPDF { } // Add import HTML text eg from CCA - /*private*/ function CCAinfo() { - $error = ""; - if( !defined('CCA_FILE') ) return; - $data = file_get_contents(CCA_FILE); - if( !$data ) $error = "\nInternal Error: no ".CCA_FILE." found."; - $regs = array(); - preg_match('/<[Bb][oO][Dd][yY]\s*>/', $data, $regs); - if( count($regs) < 1 ) $error .= "\nInternal Error: not a html body tag found."; + /*private*/ function PrintHTML( $url = NULL ) { + if( $url == NULL OR $url == '' ) return; + $error = ''; $title = ''; $url = POLICY.$url.EXT; + if( ! file_exists($url) ) $url = WEB.'/'.$url; + $data = file_get_contents($url); + if( !$data ) $error = "\nInternal Error: no ".$url.' found.'; else { - $start = strpos($data, $regs[0]) + strlen($regs[0]); - $data = substr($data, $start); + $regs = array(); + preg_match('/<[Tt][Ii][Tt][Ll][Ee][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no open tag title found on $url."; + else { + $start = strpos($data, $regs[0]) + strlen($regs[0]); + $data = substr($data, $start); + } + $regs = array(); + preg_match('/<\/[Tt][Ii][Tt][Ll][Ee][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no close title tag found on $url."; + else { + $end = strpos($data, $regs[0]); + $title = trim(substr($data,0,$end)); + $data = substr($data, $end+strlen($regs[0])); + } + $regs = array(); + preg_match('/<[Bb][oO][Dd][yY][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no open html body tag found on $url."; + else { + $start = strpos($data, $regs[0]) + strlen($regs[0]); + $data = substr($data, $start); + } + $regs = array(); + preg_match('/<\/[Bb][oO][Dd][yY][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no closing html body tag found on $url."; + else { + $end = strpos($data, $regs[0])-1; + $data = substr($data, 1, $end); + } } - $regs = array(); preg_match('/<\/[Bb][oO][Dd][yY]\s*>/', $data, $regs); - if( count($regs) < 1 ) $error .= "\nInternal Error: not closing html body tag found."; - else { - $end = strpos($data, $regs[0])-1; - $data = substr($data, 1, $end); - } + if( !$title ) $title = $url; + $this->SetCol(); $this->setFont(FONT, F_SIZE); - if( !$error ) - $this->writeHTMLCell($this->colwidth,2.5,$this->lMargin+1,$this->GetY()+2.5, + if( !$error ) { + $this->PrintHeader($this->unhtmlentities( _($title) ), $this->unhtmlentities( _('policy document') ), strncmp($url,WEB,strlen(WEB))==0? $url : (WEB.'/'.$url)); + if( $title ) $this->Bookmark($title,0); + $this->writeHTMLCell($this->colwidth,2.5,$this->lMargin+1,$this->GetY()+2.5, $data, 0,2,0,'L'); + } else - $this->MultiCell($this->colwidth, 3, $error); + $this->MultiCell($this->colwidth, 3, $error); } - // Add CAcert Community Agreement - /*private*/ function PrintCCA(){ - $this->PrintHeader(_("CAcert Community Agreement"), _("(informal, one page version)"), defined('CCA')? CCA:""); - $this->CCAinfo(); - $this->PrintFooter(""); - } - /*private*/ function PrintCAP($assuree = NULL, $assurer = NULL, $assurance = NULL, $page = NULL ) { - $this->PrintHeader(_('CAcert Assurance Programme'), _('Identity Verification Form (CAP) form'), defined('ASSCAP')?ASSCAP:"",defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,"/")) : ""); - $this->AssuranceInfo($assurance); - $this->InfoAssuree($assuree, $assurer, $assurance); - $this->StatementAssuree( $assuree['date']); - $this->StatementAssurer( $assurer, $assurance ); - $this->PrintFooter(", V". substr($this->Version(), 0, strpos($this->Version(), '.')).", ". _("generated")." ".date("Y-n-j")); + $this->SetCol(); + $this->PrintHeader($this->unhtmlentities( _('CAcert Assurance Programme') ), $this->unhtmlentities( _('Identity Verification Form (CAP) form') ), defined('ASSCAP')?ASSCAP:'',defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,'/')) : ''); + // define slightly different footer message + $this->myFooter('V'. substr($this->Version(), 0, strpos($this->Version(), '.')).', '. $this->unhtmlentities( _('generated') ).' '.date('Y-n-j'), NULL); + $this->AssuranceInfo($assurance); + $this->InfoAssuree($assuree, $assurer, $assurance); + $this->StatementAssuree( $assuree['date']); + $this->StatementAssurer( $assurer, $assurance ); } //Add form and/or CCA (on duplex only when more as one page is printed) /*public*/ function PrintForm( $assuree = NULL, $assurer = NULL, $assurance = NULL, $page = NULL ) { - $col = 0; - if( !isset( $page['form']) OR $page['form'] ) { - for( ; $col < $this->ncols; $col++ ) { - $this->SetCol($col); + for($cnt=0 ; $cnt < $this->ncols; $cnt++ ) { + if( !isset( $page['form']) OR $page['form'] ) { + // the form is one page, use new room? if ( $assuree == NULL OR $assurer == NULL OR $assurance == NULL ) - $this->Error("Assuree or Assurer data records failure"); + $this->Error('Assuree or Assurer data records failure'); $this->PrintCap( $assuree, $assurer, $assurance); } - } else $page['cca'] = true; // on no form sure we print CCA - - // do the Community Agreement print - if( isset($page['cca']) AND $page['cca'] ) { - if( $col >= $this->ncols ) { - // and on duplex print back side with Community Agreement - if( $this->CurOrientation == 'P' ) - $this->ViewerPrefs['Duplex'] = 'DuplexFlipLongEdge'; - else - $this->ViewerPrefs['Duplex'] = 'DuplexFlipShortEdge'; - } - for( $col = 0; $col < $this->ncols; $col++) { - $this->SetCol($col); - $this->PrintCCA(); + + // print off policy documents to be included in pdf file + foreach( $page['policies'] as $i => $file ) { + $this->Watermark = WATERMARK; // no watermark on these pages + if( $file ) $this->PrintHTML( $file ); } + if( $this->col > 0 OR $this->getPage() > 1 ) break; + } + if( $this->getPage() > 1 ) { + // and on duplex print back side with Community Agreement + if( $this->CurOrientation == 'P' ) + $this->ViewerPrefs['Duplex'] = 'DuplexFlipLongEdge'; + else + $this->ViewerPrefs['Duplex'] = 'DuplexFlipShortEdge'; } + // close up this column, make sure footer is printed. + $this->my_header_msg = NULL; $this->SetCol($this->col); } // Set form title (right align) -/*public*/ function PrintHeader($title1 = " ", $title2 = " " , $url1 = NULL, $url2 = NULL) { +/*public*/ function PrintHeader($title1 = ' ', $title2 = ' ' , $url1 = NULL, $url2 = NULL) { // store current top margin value $tSide = $this->tMargin; // CAcert logo // eps should be better, but it does not seem to work with CAcert logo $this->rMargin -= 1; + $this->myFooter($title1,$url1); + $this->myHeader($title2,$url2); if( LOGO_TYPE == '.eps' ) $this->ImageEPS(BW?LOGO.'mono'.LOGO_TYPE:LOGO.'colour'.LOGO_TYPE, ($this->lMargin+$this->colwidth)-51,$tSide-3,51); @@ -783,17 +895,19 @@ class CAPPDF extends TCPDF { $this->SetY($tSide+5); $this->SetX($this->lMargin); $l = $this->GetStringWidth($title1); $this->Cell($this->colwidth+1,14,$title1,0,0,'R',0,NULL); - $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url1); + if( $url1 != NULL AND $url1 != '' ) + $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url1); $this->Ln(5); $this->SetX($this->lMargin); $l = $this->GetStringWidth($title2); $this->Cell($this->colwidth+1,14,$title2,0,0,'R',0,NULL); - $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url2); + if( $url2 != NULL AND $url2 != '' ) + $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url2); // CAcert Inc. postbox address $this->Ln(6); $this->SetX($this->lMargin); $this->SetFont(FONT,'',F_SIZE); $savex = $this->GetX(); $savey = $this->GetY(); - $strg = POBOX ." - ". WEB; + $strg = POBOX .' - '. WEB; $this->SetXY($this->lMargin+$this->colwidth-$this->GetStringWidth($strg)-1.1,$this->GetY()+3.5); // right align if( !BW ) $this->SetTextColor(17,86,140); $ret = $this->Write(0, $strg, NULL); @@ -804,7 +918,7 @@ class CAPPDF extends TCPDF { $this->SetXY($savex,$savey); // sha1 fingerprint CAcert rootkeys class 1 and class 3 - $strg = _("CAcert's Root Certificate sha1 fingerprints") . ", class 1: ". CLASS1_SHA1 . ", class 3: " . CLASS3_SHA1; + $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha1 fingerprints") ) . ', class 1: '. CLASS1_SHA1 . ', class 3: ' . CLASS3_SHA1; $this->Ln(3); $this->SetX($this->lMargin); $this->SetFont(FONT,'',F_SIZE * $this->colwidth / ($this->GetStringWidth($strg) +1)); $this->Cell($this->colwidth,10, $strg,0,0,'C',0,NULL); @@ -821,7 +935,7 @@ class CAPPDF extends TCPDF { } // Set general form information - /*private*/ function PrintInfo( $strg = "", $url = "") { + /*private*/ function PrintInfo( $strg = '', $url = '') { // store current margin values // Print text blurb paragraph at top of page @@ -829,7 +943,7 @@ class CAPPDF extends TCPDF { $this->SetXY($this->lMargin, $this->GetY()-1.5); $y = $this->GetY(); $x = $this->GetX(); $cnt=$this->MultiCell($this->colwidth+1, 0, $strg,0,'L',0,2); - if ( $url != "" ) // link should be in user space + if ( $url != '' ) // link should be in user space $this->myLink($x, $y, $this->colwidth, $this->GetY()-$y, $url); return($cnt); } @@ -839,17 +953,17 @@ class CAPPDF extends TCPDF { // store current margin values $cellcnt = 0; $this->SetY($this->GetY()+0.5); - $this->Bookmark(_("CAcert CAP form"),0,$this->S($this->GetY())); + $this->Bookmark($this->unhtmlentities( _('CAcert CAP form') ),0,$this->S($this->GetY())); // Show text blurb at top of page - $strg = _("The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face to face witnessing of government-issued photo identity documents."); - $strg .= " ". _("The Applicant asks the Assurer to verify to the CAcert Community that the Assurer has met and verified the Applicant's identity against original documents."); - $strg .= " ". _("Assurer may leave a copy of the details with the Applicant, and may complete and sign her final form after the meeting."); - $strg .= " ". _("If there are any doubts or concerns about the Applicant's identity, do not allocate points. You are encouraged to perform a mutual Assurance."); - $cellcnt += $this->PrintInfo( $strg, defined('ASSINTRO')? ASSINTRO:""); - $cellcnt += $this->PrintInfo( _("For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit:")." ".WEB, defined('ASSCAP')?ASSCAP:""); - $cellcnt += $this->PrintInfo( _("A CAcert Arbitrator can require the Assurer to deliver the completed form in the event of a dispute. After 7 years this form should be securely disposed of to prevent identity misuse. E.g. shred or burn the form. The Assurer does not retain copies of ID at all."),defined('ARBIT')?ARBIT:""); - $cellcnt += $this->PrintInfo( _("For the CAcert Organisation Assurance Programme there is a separate special COAP form."),defined('ASSORG')?ASSORG:""); + $strg = $this->unhtmlentities( _('The CAcert Assurance Programme (CAP) aims to verify the identities of Internet users through face to face witnessing of government-issued photo identity documents.') ); + $strg .= ' '. $this->unhtmlentities( _("The Applicant asks the Assurer to verify to the CAcert Community that the Assurer has met and verified the Applicant's identity against original documents.") ); + $strg .= ' '. $this->unhtmlentities( _('Assurer may leave a copy of the details with the Applicant, and may complete and sign her final form after the meeting.') ); + $strg .= ' '. $this->unhtmlentities( _("If there are any doubts or concerns about the Applicant's identity, do not allocate points. You are encouraged to perform a mutual Assurance.") ); + $cellcnt += $this->PrintInfo( $strg, defined('ASSINTRO')? ASSINTRO:''); + $cellcnt += $this->PrintInfo( $this->unhtmlentities( _('For more information about the CAcert Assurance Programme, including detailed guides for CAcert Assurers, please visit:') ).' '.WEB, defined('ASSCAP')?ASSCAP:''); + $cellcnt += $this->PrintInfo( $this->unhtmlentities( _('A CAcert Arbitrator can require the Assurer to deliver the completed form in the event of a dispute. After 7 years this form should be securely disposed of to prevent identity misuse. E.g. shred or burn the form. The Assurer does not retain copies of ID at all.') ),defined('ARBIT')?ARBIT:''); + $cellcnt += $this->PrintInfo( $this->unhtmlentities( _('For the CAcert Organisation Assurance Programme there is a separate special COAP form.') ),defined('ASSORG')?ASSORG:''); $this->SetY($this->GetY()-0.1); $this->PrintLocation( $assurance ); $this->SetY($this->GetY()+1); @@ -860,10 +974,10 @@ class CAPPDF extends TCPDF { /*private*/ function PrintTable( $strg = NULL, $height = -1, $ext = 0 ) { // store current margin values static $tSide = -1; - static $title = ""; + static $title = ''; if( $height < 0 ) { // mark table position, leave room for title - if( $strg != "" ) $title = $strg; - if( $title == "" ) return ($this->GetY()); // nothing to do + if( $strg != '' ) $title = $strg; + if( $title == '' ) return ($this->GetY()); // nothing to do $tSide = $this->GetY()+1; // background if ( BW ) { @@ -873,13 +987,13 @@ class CAPPDF extends TCPDF { $this->SetFillColor(173,197,215); $this->SetDrawColor(173,197,215); } - $this->Rect($this->lMargin-1,$tSide-1,1,9, "F"); - $this->Rect($this->lMargin-1,$tSide-1,$this->colwidth,1, "F"); + $this->Rect($this->lMargin-1,$tSide-1,1,9, 'F'); + $this->Rect($this->lMargin-1,$tSide-1,$this->colwidth,1, 'F'); $this->SetFillColor(255); if ( BW ) { $this->SetFillColor(125); } else { $this->SetFillColor(17,86,140); } - $this->Rect($this->lMargin,$tSide,$this->colwidth,7, "DF"); + $this->Rect($this->lMargin,$tSide,$this->colwidth,7, 'DF'); $this->SetFillColor(255); $this->SetDrawColor(0); $this->SetXY($this->lMargin+1, $tSide+0.6); @@ -895,12 +1009,12 @@ class CAPPDF extends TCPDF { elseif( $tSide < 0 ) return( $this->GetY()); if( $height == 0 ) { // interrupted bottum of column reached $height = $this-GetY() - $tSide; $save = $title; - $this->PrintTable("", $height); // finish till bottumn page + $this->PrintTable('', $height); // finish till bottumn page $tSide = $this->originalMargin; $title = $save; return( $this->GetY()); } - if( $strg != "" ) $title = $strg; // just to be defensive + if( $strg != '' ) $title = $strg; // just to be defensive // background if ( BW ) { @@ -910,9 +1024,9 @@ class CAPPDF extends TCPDF { $this->SetFillColor(173,197,215); $this->SetDrawColor(173,197,215); } - $this->Rect($this->lMargin-1,$tSide,1,$height-1+$ext, "F"); + $this->Rect($this->lMargin-1,$tSide,1,$height-1+$ext, 'F'); if( $ext ) - $this->Rect($this->lMargin-1,$tSide+$height,$this->colwidth,$ext, "F"); + $this->Rect($this->lMargin-1,$tSide+$height,$this->colwidth,$ext, 'F'); $this->SetFillColor(255); // borders of the table left, bottumn, right $this->Line($this->lMargin,$tSide+$height-1, $this->lMargin, $tSide+$height); @@ -920,21 +1034,21 @@ class CAPPDF extends TCPDF { $this->Line($this->lMargin+$this->colwidth,$tSide-1, $this->lMargin+$this->colwidth, $tSide+$height); $this->SetDrawColor(0); $this->SetY($tSide + $height + 1); // set Y ordinate to plus 7 - $tSide = -1; $title = ""; + $tSide = -1; $title = ''; return($this->GetY()); } // assuree information /*private*/ function PrintName( $names = NULL, $assurancemax = -1 ) { //$H = 5; // height of the name cell - $name = $names == NULL ? "": $names['name']; - $id_type = $names == NULL ? "" : $names['idtype']; + $name = $names == NULL ? '': $names['name']; + $id_type = $names == NULL ? '' : $names['idtype']; // store current margin values static $nr = 0; static $idtypes = NULL; static $listpoints = NULL; static $ComboProps = array( 'fillColor'=> LBLUE, 'strokeColor'=> LLBLUE, 'editable'=> 'true', 'textSize' => 9, 'rotate'=> '0'); - static $TextProps = array('strokeColor'=> LLBLUE, 'value' => " ", 'fillColor'=> LBLUE, 'doNotScrole'=> 'false', 'textSize' => 12, 'rotate'=> '0'); + static $TextProps = array('strokeColor'=> LLBLUE, 'value' => ' ', 'fillColor'=> LBLUE, 'doNotScrole'=> 'false', 'textSize' => 12, 'rotate'=> '0'); static $TextBlankProps = array('strokeColor'=> 'white', 'fillColor'=> 'white', 'readonly' => 'true', 'doNotScrole'=> 'true', /* 'lineWidth'=> '0'*/); $TextProps['textSize'] = 12/6*H; @@ -976,8 +1090,8 @@ class CAPPDF extends TCPDF { $this->Cell( 15, sprintf("(%d)", $namepoints), 0, 0, 'C'); } - $TextProps['value'] = $name ? $name : " "; $TextProps['textSize'] = 14; - $TextProps['userName'] = _("Exact full name as on shown ID for this name."); + $TextProps['value'] = $name ? $name : ' '; $TextProps['textSize'] = 14; + $TextProps['userName'] = $this->unhtmlentities( _('Exact full name as on shown ID for this name.') ); $this->TextField(sprintf('AssureeNames_%d_Name',$nr), $this->SetFieldXY($this->lMargin+2,$savey+0.9,$this->colwidth-40), 8/6*H, $TextProps); $this->SetFieldXY(); $this->SetXY($this->lMargin+2, $savey); @@ -993,20 +1107,20 @@ class CAPPDF extends TCPDF { !utf8_is_ascii_ctrl( $name) ) $ascii = utf8_to_ascii($name); else - $ascii = ""; + $ascii = ''; $abbr = $this->Abbreviate( $name ); if( strcmp($ascii,$name) != 0 OR strcmp($abbr,$name) != 0) { - $msg = _("The exact name of the assuree may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.\n"); - if( $ascii != "" AND strcmp($ascii,$name) != 0 ) $msg .= _("transliterated: "). $ascii.'\n'; - if( $abbr != "" AND strcmp($abbr, $name) != 0 ) $msg .= _("abbreviated: "). $abbr.'\n'; + $msg = $this->unhtmlentities( _('The exact name of the assuree may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.\n') ); + if( $ascii != '' AND strcmp($ascii,$name) != 0 ) $msg .= $this->unhtmlentities( _('transliterated: ') ). $ascii.'\n'; + if( $abbr != '' AND strcmp($abbr, $name) != 0 ) $msg .= $this->unhtmlentities( _('abbreviated: ') ). $abbr.'\n'; $this->myLink($this->lMargin-7, $savey+1, 3, 3, $msg, array('subtype'=> 'Text', 'Open' => 'false', 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On the assuree full name"))); + 't'=> $this->unhtmlentities( _('On the assuree full name') ))); } } else { - $id_type = ""; + $id_type = ''; // no name, give a line to write on $this->myLine($this->lMargin+2,$savey+H+0.3,$this->lMargin+$this->colwidth-37,$savey+H+0.3); // line under name } @@ -1018,11 +1132,11 @@ class CAPPDF extends TCPDF { if( $id_type ) { $token = $id_type; $token = strtok($token,'/'); - for( ; $token != ""; $i++) { + for( ; $token != ''; $i++) { $idtypes += array( $i => $token ); $token = strtok('/'); } } - $idtypes += array( $i => _("passport"), _("driver license"), _("ID card"), _("mil. ID"), _("certificate"), _("TTP") ); + $idtypes += array( $i => $this->unhtmlentities( _('passport') ), $this->unhtmlentities( _('driver license') ), $this->unhtmlentities( _('ID card') ), $this->unhtmlentities( _('mil. ID') ), $this->unhtmlentities( _('certificate') ), $this->unhtmlentities( _('TTP') ) ); } if( !$id_type ) { $this->myLine($this->lMargin+$this->colwidth-37,$savey+H+0.3,$this->lMargin+$this->colwidth -17,$savey+H+0.3);// line under ID @@ -1030,7 +1144,7 @@ class CAPPDF extends TCPDF { } else { $this->SetXY($this->lMargin+20, $savey+1); $this->SetFont(FONT, 'B', (F_SIZE+1)/6*H); - $this->Cell($this->colwidth-37, 2, "(".$id_type .")", 0, 0, 'R'); + $this->Cell($this->colwidth-37, 2, '('.$id_type .')', 0, 0, 'R'); // hide id type print on screen with the formfields, just nicety // one could extend the name field, but this has more drawbacks $this->TextField(sprintf('AssureeNames_%d_None',$nr), $this->SetFieldXY($this->lMargin+$this->colwidth-38,$savey+0.5,20), 7/6*H, $TextBlankProps); @@ -1050,32 +1164,32 @@ class CAPPDF extends TCPDF { if( $assurancemax <= 0 ) $assurancemax = 35; // Assuree Identity information part - $tSide = $this->PrintTable(_("Applicant's Identity Information"))+1; - - $msg = _("Some examples of possible standard transliterations in a full individual name. If more than one transliteration of a character is possible, it is denoted within parentheses."); - $msg .= _("Examples of accepted transliterations for the full name(s)").":"; - $msg .= "\n* ". _("J(ae|a)hny G(oe|o)le McName"); - $msg .= "\n\n"._("As an example standard abbreviation on given names is provided here. If a given name is counted as first given name part of the name is denoted with parentheses around the name."); - $msg .= _("Examples of accepted abbreviation(s) for full name(s)").":"; - $msg .= "\n* ". _("sir John G. McName"); + $tSide = $this->PrintTable($this->unhtmlentities( _("Applicant's Identity Information") ))+1; + + $msg = $this->unhtmlentities( _('Some examples of possible standard transliterations in a full individual name. If more than one transliteration of a character is possible, it is denoted within parentheses.') ); + $msg .= $this->unhtmlentities( _('a and y umlaut, and o/slash examples of accepted transliterations for the full name(s)') ).':'; + $msg .= "\n* ". 'J(ae|a)hny G(oe|o)le McName'; + $msg .= "\n\n".$this->unhtmlentities( _('As an example standard abbreviation on given names is provided here. If a given name is counted as first given name part of the name is denoted with parentheses around the name.') ); + $msg .= $this->unhtmlentities( _('Examples of accepted abbreviation(s) for full name(s)') ).':'; + $msg .= "\n* ". 'sir J(ähnÿ) G. McName'; $msg .= "\n"; // put hint on comparing names on title table $this->myLink($this->lMargin-7, $tSide-7, 5, 5, $msg, array('subtype'=> 'Text', 'Open' => 'true', 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On comparing names"))); + 't'=> $this->unhtmlentities( _('On comparing names') ))); // names of applicant $this->SetXY($this->lMargin+1, $tSide); $this->SetFont(FONT, '', F_SIZE+1); - $this->Write(0, _("Exact full name on the ID").": "); - $strg = "(". _("type of ID shown").")"; + $this->Write(0, $this->unhtmlentities( _('Exact full name on the ID') ).': '); + $strg = '('. $this->unhtmlentities( _('type of ID shown') ).')'; $this->SetFont(FONT, '', F_SIZE); $this->SetXY($this->lMargin+$this->colwidth-$this->GetStringwidth($strg)-19, $tSide); $this->Write(0, $strg); if( $assurancemax > 0 AND $assurancemax <= 50 ) { - $strg = sprintf(_("max") . " %d", $assurancemax); + $strg = sprintf($this->unhtmlentities( _('max') ) . " %d", $assurancemax); $this->SetFont(FONT, F_SIZE); $strg = $strg; $this->SetXY($this->lMargin+$this->colwidth-19, $tSide); @@ -1102,28 +1216,28 @@ class CAPPDF extends TCPDF { $this->myLine($this->lMargin+$this->colwidth-17,$tSide+3,$this->lMargin+$this->colwidth-17,$savey-0.7); // left points column $this->SetXY($this->lMargin+1, $savey); $this->SetFont(FONT, '', F_SIZE); - $strg = _("Email address").": "; + $strg = $this->unhtmlentities( _('Email address') ).': '; $l = $this->GetStringWidth($strg); $this->Write(0, $strg); if($email) { $this->SetFont(FONT, 'B', F_SIZE+1); if( !BW ) $this->SetTextColor(17,86,140); $this->SetXY($this->GetX(),$this->GetY()-0.35); $ret = $this->Write(0, $email); - $this->myLink($this->lMargin+2,$this->GetY(),$l, F_SIZE/2, "mailto:".$email."?subject=Your CAcert Assurance"); + $this->myLink($this->lMargin+2,$this->GetY(),$l, F_SIZE/2, 'mailto:'.$email.'?subject=Your CAcert Assurance'); $this->Ln(); if( !BW ) $this->SetTextColor(0); } // somehow fields are not scaled.... - $TextProps = array('strokeColor'=> LLBLUE, 'value' => "", 'fillColor'=> LBLUE, 'doNotScrole'=> 'true', /* 'lineWidth'=> '0', */ 'textSize' => '11', 'rotate'=>0, 'userName'=> _("email address as e.g. john.family@gmail.com") ); + $TextProps = array('strokeColor'=> LLBLUE, 'value' => '', 'fillColor'=> LBLUE, 'doNotScrole'=> 'true', /* 'lineWidth'=> '0', */ 'textSize' => '11', 'rotate'=>0, 'userName'=> $this->unhtmlentities( _('email address as e.g. john.family@gmail.com') ) ); $TextProps['value'] = $email; $this->TextField('AssureeEmail', $this->SetFieldXY($this->lMargin+2+$l, $savey,$this->colwidth-40-$l), 5, $TextProps); $this->SetFieldXY(); $this->SetXY($this->lMargin+$this->colwidth-25, $savey); // date of birth assuree - $strg = _("Date of Birth"); - if( $dob == "" ) - $strg .= " ("._("yyyy-mm-dd"). ")"; + $strg = $this->unhtmlentities( _('Date of Birth') ); + if( $dob == '' ) + $strg .= ' ('.$this->unhtmlentities( _("yyyy-mm-dd") ). ')'; $this->PrintDate( $this->lMargin+$this->colwidth-3, $savey, $strg, $dob, 'AssureeDoB', 'R'); $savey += 4; @@ -1131,16 +1245,16 @@ class CAPPDF extends TCPDF { $this->SetXY($this->lMargin+$this->colwidth-14.95, $tSide-8.7); $this->SetFont(FONT, '', F_SIZE); $this->SetTextColor(255); - $this->MultiCell(14.9,2, _("points allocated"), 0, 0, 'C'); + $this->MultiCell(14.9,2, $this->unhtmlentities( _("points allocated") ), 0, 0, 'C'); $this->SetTextColor(0); $this->SetXY($this->lMargin+1, $savey); $savey += 3; // save some room for DoB - $next = $this->PrintTable( "", $savey-$tSide, 5); + $next = $this->PrintTable( '', $savey-$tSide, 5); $this->SetY($next); } // print marked paragraph in the table - /*private*/ function PrintTicked( $strg = "", $tick = true ) { + /*private*/ function PrintTicked( $strg = '', $tick = true ) { // store current margin values $savey = $this->GetY(); @@ -1149,15 +1263,15 @@ class CAPPDF extends TCPDF { // use ✔ and ❑ of zapfdingbats font for OK tick $savex = $this->GetX(); $this->SetXY($this->GetX(), $savey+0.9); - $this->SetFont("zapfdingbats", F_SIZE+3); - $this->Write(0,"q"); // ❑ + $this->SetFont('zapfdingbats', F_SIZE+3); + $this->Write(0,'q'); // ❑ $this->SetXY($savex+0.1, $savey+0.1); if ( BW ) $this->SetTextColor(80); else $this->SetTextColor(17, 86, 140); //$this->SetTextColor(0,92,0); // #00BE00 lime - $this->Write(0,"4 ");// ✓ + $this->Write(0,'4 ');// ✓ $this->SetTextColor(0); } $this->SetXY($this->GetX(), $savey); @@ -1168,39 +1282,39 @@ class CAPPDF extends TCPDF { } // assuree statement -/*public*/ function StatementAssuree( $date = "" ) { +/*public*/ function StatementAssuree( $date = '' ) { // store current margin values $cellcnt = 0; // assuree statement section - $tSide = $this->PrintTable(_("Applicant's Statement")); // mark table header + $tSide = $this->PrintTable($this->unhtmlentities( _("Applicant's Statement") )); // mark table header - $cellcnt += $this->PrintTicked( _("Make sure you have read and agreed with the CAcert Community Agreement "), false /* no tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _("Make sure you have read and agreed with the CAcert Community Agreement") ), false /* no tick */); if( !BW ) $this->SetTextColor(17, 86, 140); - $ret = $this->Write($this->lasth, CCA, NULL); - $this->myLink($this->lMargin+1, $this->GetY()-F_SIZE/2.9, $this->colwidth-2, F_SIZE*2.9/2.9, CCA); + $ret = $this->Write($this->lasth, WEB.'/'.POLICY.CCA.EXT, NULL); + $this->myLink($this->lMargin+1, $this->GetY()-F_SIZE/2.9, $this->colwidth-2, F_SIZE*2.9/2.9, WEB.'/'.POLICY.CCA.EXT); $this->Ln(4); if( !BW ) $this->SetTextColor(0); - $cellcnt += $this->PrintTicked( _("I hereby confirm that the information stating my Identity Information above is both true and correct, and request the CAcert Assurer (see below) to witness my identity in the CAcert Assurance Programme."), true /* tick */); - $cellcnt += $this->PrintTicked( _("I agree to the CAcert Community Agreement."), true /* tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I hereby confirm that the information stating my Identity Information above is both true and correct, and request the CAcert Assurer (see below) to witness my identity in the CAcert Assurance Programme.') ), true /* tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I agree to the CAcert Community Agreement.') ), true /* tick */); $this->Ln(0.5); $this->SetFont(FONT, F_SIZE+1); $savey = $this->GetY(); - $strg = _("Date"); - if($date == "") - $strg .= " (". _("yyyy-mm-dd") . ")"; + $strg = $this->unhtmlentities( _('Date') ); + if($date == '') + $strg .= ' ('. $this->unhtmlentities( _("yyyy-mm-dd") ) . ')'; $strg = $strg; $this->PrintDate( $this->lMargin+1, $savey+1, $strg, $date, 'AssureeDate', 'L'); - $strg = _("Applicant's signature"); + $strg = $this->unhtmlentities( _("Applicant's signature") ); $this->SetFont(FONT, '', F_SIZE); $l = $this->GetStringWidth( $strg ); $this->SetXY($this->lMargin+$this->colwidth-$l-3, $savey+1); $this->Write(0, $strg); $this->Ln(7) ; // and leave some room // draw the table borders and header at marked ordinate - $next = $this->PrintTable("", $this->GetY()-$tSide); + $next = $this->PrintTable('', $this->GetY()-$tSide); $this->SetY($next); } @@ -1210,49 +1324,49 @@ class CAPPDF extends TCPDF { if( $assurer == NULL OR $assurance == NULL ) return; // store current margin values - $TextProps = array('strokeColor'=> LLBLUE, 'value' => "", 'fillColor'=> LBLUE, 'doNotScrole'=> 'true', 'textSize' => '14', 'rotate'=>0); + $TextProps = array('strokeColor'=> LLBLUE, 'value' => '', 'fillColor'=> LBLUE, 'doNotScrole'=> 'true', 'textSize' => '14', 'rotate'=>0); $cellcnt = 0; - $tSide = $this->PrintTable(_("Assurer's Statement")); // mark table ordinate + $tSide = $this->PrintTable($this->unhtmlentities( _("Assurer's Statement") )); // mark table ordinate // put hint on mutaul assurance in pdf file for mouse over - $msg = _("One is advised for a mutual assurance. If done so the exact full name, email address and date of birth of the Assurer is also required on a form. In this case the Assuree assures the Assurer as well. In this case two copies are needed of the CAP form."); + $msg = $this->unhtmlentities( _('One is advised for a mutual assurance. If done so the exact full name, email address and date of birth of the Assurer is also required on a form. In this case the Assuree assures the Assurer as well. In this case two copies are needed of the CAP form.') ); $this->myLink($this->lMargin-7, $tSide-6, 5, 5, $msg, array('subtype'=> 'Text', 'Open' => 'true', 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On mutual assurance"))); + 't'=> $this->unhtmlentities( _('On mutual assurance') ))); // assurer identity info // name, meeting date, meeting location, // dob and email address string only is printed when info available $this->SetXY($this->lMargin+1, $tSide); $savey = $this->GetY()+2.5; $this->SetFont(FONT, '', F_SIZE); - $strg = _("Assurer's Name") . ": "; + $strg = $this->unhtmlentities( _("Assurer's Name") ) . ': '; if( $assurer['name'] AND function_exists('utf8_to_ascii') AND !utf8_is_ascii_ctrl( $assurer['name']) ) $ascii = utf8_to_ascii($assurer['name']); else - $ascii = ""; - if( $ascii == $assurer['name'] ) $ascii = ""; + $ascii = ''; + if( $ascii == $assurer['name'] ) $ascii = ''; $abbr = $this->Abbreviate( $assurer[ 'name'] ); - if( $ascii != "" OR $abbr != "") { - $msg = _("The exact name of the assurer may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.\n"); - if( $ascii != "" ) $msg .= '* '. $ascii . "\n"; - if( $abbr != "" ) $msg .= '* '. $abbr . "\n"; + if( $ascii != '' OR $abbr != '') { + $msg = $this->unhtmlentities( _('The exact name of the assurer may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.\n') ); + if( $ascii != '' ) $msg .= '* '. $ascii . "\n"; + if( $abbr != '' ) $msg .= '* '. $abbr . "\n"; $this->myLink($this->lMargin-7, $tSide+2, 3, 3, $msg, array('subtype'=> 'Text', 'Open' => 'false', 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On the full name of the Assurer"))); + 't'=> $this->unhtmlentities( _('On the full name of the Assurer') ))); } $this->Write(0, $strg); - $strg = ""; - if( $assurer['dob'] ) $strg = _("Date of Birth"); + $strg = ''; + if( $assurer['dob'] ) $strg = $this->unhtmlentities( _('Date of Birth') ); // if assurer dob is space we print format date - if( $assurer['dob'] == " " ) { - $strg .= " (". _("yyyy-mm-dd") .")"; - $assurer['dob'] = ""; + if( $assurer['dob'] == ' ' ) { + $strg .= ' ('. $this->unhtmlentities( _("yyyy-mm-dd") ) .')'; + $assurer['dob'] = ''; } $this->PrintDate($this->lMargin+$this->colwidth-3, $savey-2.5, $strg, $assurer['dob'], 'AssurerDoB', 'R'); $this->SetXY($this->lMargin+2, $savey); @@ -1260,39 +1374,39 @@ class CAPPDF extends TCPDF { $strg = $assurer[ 'name']; $this->SetFont(FONT, 'B', F_SIZE); $cellcnt += $this->MultiCell($this->colwidth-22, 3, $strg, 0, 1); - $this->SetFont(FONT, "", F_SIZE); + $this->SetFont(FONT, '', F_SIZE); if( $assurer['email'] ) { $sx = $this->GetX(); $sy = $this->GetY(); $sw = $this->GetStringWidth($strg) + 2; $this->SetXY( $this->lMargin+$sw+4, $sy-4.1); if( !BW ) $this->SetTextColor(17,86,140); - $ret = $this->Write(0, $assurer[ 'email'], "mailto:". $assurer[ 'email']); $this->Ln(); + $ret = $this->Write(0, $assurer[ 'email'], 'mailto:'. $assurer[ 'email']); $this->Ln(); if( !BW ) $this->SetTextColor(0); } } - $TextProps['value'] = $assurer[ 'name'] ? $assurer[ 'name'] : " "; - $TextProps['textSize'] = 11; $TextProps['userName'] = _("Full exact name of Assurer. On mutual assurance provide date of birth as well."); + $TextProps['value'] = $assurer[ 'name'] ? $assurer[ 'name'] : ' '; + $TextProps['textSize'] = 11; $TextProps['userName'] = $this->unhtmlentities( _('Full exact name of Assurer. On mutual assurance provide date of birth as well.') ); $this->TextField('AssurerName', $this->SetFieldXY($this->lMargin+2, $savey+1, $this->colwidth-60), 5, $TextProps ); $this->SetFieldXY(); - $TextProps['value'] = $assurer['email'] ? $assurer['email'] : _("email") . "?"; - $TextProps['userName'] = _("On mutual assurance provide email address of Assurer."); + $TextProps['value'] = $assurer['email'] ? $assurer['email'] : $this->unhtmlentities( _('email') ) . '?'; + $TextProps['userName'] = $this->unhtmlentities( _('On mutual assurance provide email address of Assurer.') ); $this->TextField('AssurerEmail', $this->SetFieldXY($this->lMargin+68.5, $savey+1, 35), 5, $TextProps ); $this->SetFieldXY(); $this->SetXY($this->lMargin+2, $savey+5); // assurer statements - $cellcnt += $this->PrintTicked( _("I, the Assurer, hereby confirm that I have verified the Applicant's Identity Information, I will witness the Applicant's identity in the CAcert Assurance Programme, and allocate Assurance Points."), true /* ticked */); - $cellcnt += $this->PrintTicked( _("I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points."), true /* ticked */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _("I, the Assurer, hereby confirm that I have verified the Applicant's Identity Information, I will witness the Applicant's identity in the CAcert Assurance Programme, and allocate Assurance Points.") ), true /* ticked */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I am a CAcert Community Member, have passed the Assurance Challenge, and have been assured with at least 100 Assurance Points.') ), true /* ticked */); $this->Ln(1); $savey = $this->GetY(); - $strg = _("Date"); - if( $assurer['date'] == "" ) $strg .= " (" . _("yyyy-mm-dd") . ")"; + $strg = $this->unhtmlentities( _('Date') ); + if( $assurer['date'] == '' ) $strg .= ' (' . $this->unhtmlentities( _("yyyy-mm-dd") ) . ')'; $strg = $strg; $this->PrintDate( $this->lMargin+1, $savey, $strg, $assurer['date'], 'AssurerDate', 'L'); $this->SetXY($this->lMargin+1, $savey); - $this->SetFont(FONT, "",F_SIZE); - $strg = _("Assurer's signature"); + $this->SetFont(FONT, '',F_SIZE); + $strg = $this->unhtmlentities( _("Assurer's signature") ); $this->SetXY($this->lMargin+$this->colwidth-$this->GetStringWidth($strg)-3, $savey); $this->Write(0, $strg ); $savey = $this->GetY()+7; // leave room for date and signature @@ -1301,7 +1415,7 @@ class CAPPDF extends TCPDF { $this->SetXY($this->lMargin+1, $savey); $l = $this->GetPageHeight()/$this->scale*100.0-$this->GetY() - MARGIN; if($l > 3 ) $l = 3; if( $l > 0 ) $this->Ln($l); // try to come close to margin - $next = $this->PrintTable("", $this->GetY()-$tSide); + $next = $this->PrintTable('', $this->GetY()-$tSide); $this->SetY($next); } @@ -1310,64 +1424,30 @@ class CAPPDF extends TCPDF { if( $assurance == NULL ) return; $savey = $this->GetY(); //$this->SetXY($this->GetX(), $savey); - $strg = _("Date and location of the face-to-face meeting"). ": "; + $strg = $this->unhtmlentities( _('Date and location of the face-to-face meeting') ). ': '; $this->SetFont(FONT,'I', F_SIZE); $this->Write(0, $strg); $l = $this->GetStringWidth($strg); $strg = $assurance['location']; if( $strg) { - if( $assurance['date'] ) $strg = $assurance['date'] . ", ". $strg; + if( $assurance['date'] ) $strg = $assurance['date'] . ', '. $strg; $strg = $strg; $this->SetFont(FONT, 'B', F_SIZE); $this->Write(0,$strg); } $TextProps['textSize'] = 11; - $TextProps['value'] = $assurance['location'] ? $assurance['location'] : " "; - $TextProps['userName'] = _("location of the assurance"); + $TextProps['value'] = $assurance['location'] ? $assurance['location'] : ' '; + $TextProps['userName'] = $this->unhtmlentities( _('location of the assurance') ); $this->TextField('AssuranceLocation', $this->SetFieldXY($this->lMargin+$l+19, $savey,$this->colwidth-$l-21), 5, $TextProps ); $this->SetFieldXY(); - $TextProps['value'] = $assurance['date'] ? $assurance['date'] : " "; + $TextProps['value'] = $assurance['date'] ? $assurance['date'] : ' '; $TextProps['charLimit'] = 10; - $TextProps['userName'] = _("yyyy-mm-dd")." ". _("date of assurance"); + $TextProps['userName'] = $this->unhtmlentities( _("yyyy-mm-dd") ).' '. $this->unhtmlentities( _('date of assurance') ); $this->TextField('AssuranceDate', $this->SetFieldXY($this->lMargin+1+$l, $savey, 17), 5, $TextProps ); $this->SetFieldXY(); $this->SetXY($this->lMargin,$savey+3); } -// print copy right on bottumn of page -/*public*/ function PrintFooter( $msg = NULL ) { - $this->InFooter = true; - $this->SetFont(FONT,'', F_SIZE-1); - if( $this->GetGroupPageNo() > 0 ) { - $this->SetXY($this->lMargin, $this->GetPageHeight()/$this->scale*100.0-6); - $this->Cell($this->colwidth, 3, - sprintf("%s %d/%d", _("page"), $this->GetGroupPageNo()+1, - $this->GetNumPages()), 0, 0, 'C'); - } - if( $msg == NULL ) return; - $strg = "© ". date("Y"). " CAcert Inc.". $msg; - $this->SetXY($this->lMargin+MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-6); - $this->Cell($this->colwidth, 3, $strg, 0, 0, 'R'); - - if( $this->Watermark != "" ) { - $this->StartTransform(); - $savex = $this->GetX(); $savey = $this->GetY(); - $this->SetFont(FONT,'', F_SIZE*7); - $l = $this->GetStringWidth($this->Watermark); - $h = $this->GetPageHeight()/$this->scale*100.0/2; - $w = $this->colwidth/2+MARGIN; - $this->SetXY(0,0); - $this->TranslateY($h+(F_SIZE*7)/2.9); - $this->TranslateX($w-MARGIN+$this->lMargin); - $this->Rotate(rad2deg(atan($h/$w))); - $this->Text(-$l/2,0,$this->Watermark, 0.8); - $this->StopTransform(); - $this->SetXY($savex,$savey); - } - - $this->InFooter = false; - } - // End of CAPPDF TCPDF class extension } @@ -1378,20 +1458,25 @@ class CAPPDF extends TCPDF { // FONT and BW are set already // import info -function GET( $key = "" ) { - return ( array_key_exists( $key, $_GET) ? $_GET[$key] : ""); +function GET( $key = '' ) { + return ( array_key_exists( $key, $_GET) ? $_GET[$key] : ''); } // form, CCA and page format info - $page['format'] = strtolower(GET('format')); // A3, A4, A5, letter, legal + $page['format'] = strtolower(GET('format')); // A3, A4, A5, letter, legal, etc. + if( !$page['format'] ) $page['format'] = 'a4'; // default // on landscape orientation we do two half pages $page['orientation'] = strtolower(GET('orientation')); - if( $page['orientation'] != 'l' AND $page['orientation'] != "landscape" ) { - $page['orientation'] = 'p'; // default is landscape and 2 up + if( $page['orientation'] != 'l' AND $page['orientation'] != 'landscape' ) { + // default portrait 1-up + $page['orientation'] = 'p'; // landscape implies 2-up } - $page['form'] = GET('noform') != "" ? false : true; + $page['form'] = GET('noform') != '' ? false : true; // dft is now true it should go to true - $page['cca'] = GET('nocca') != ""? true : false; + $page['policies'] = array(); + if( GET('nocca') == '' ) { + if( defined('CCA') ) $page['policies'][] = CCA; + } // set $page['form'] on 'simplex' or 'duplex' to get CCA on pdf page // Assurer info @@ -1403,7 +1488,7 @@ $assurer = array ( 'name' => my_recode(GET('assurer')) , 'date' => my_recode(GET('assurerdate')) ? my_recode(GET('assurerdate')) : my_recode(GET('date')) ); -if( $assurer['name'] != "" AND +if( $assurer['name'] != '' AND !utf8_is_ascii_ctrl($assurer['name']) AND !function_exists('utf8_to_ascii')) require_once ( UTF8_ASCII ); @@ -1422,48 +1507,56 @@ $assuree = array ( 'names' => array( ), 'namecnt' => 0, 'dob' => my_recode(GET('dob')), 'email' => my_recode(GET('email')), - 'date' => my_recode(GET('date')) == "now" ? date("Y-m-d") : + 'date' => my_recode(GET('date')) == 'now' ? date('Y-m-d') : my_recode(GET('date')) ); // defeats due to history -if( $assuree['date'] == "" AND $assurer['date'] ) $assuree['date'] = $assurer['date']; -if( $assurance['date'] == "" AND $assuree['date'] ) $assurance['date'] = $assuree['date']; -if( $assurer['date'] == "now" ) $assurer['date'] = date("Y-m-d"); -if( $assurance['date'] == "now" ) $assurance['date'] = date("Y-m-d"); +if( $assuree['date'] == '' AND $assurer['date'] ) $assuree['date'] = $assurer['date']; +if( $assurance['date'] == '' AND $assuree['date'] ) $assurance['date'] = $assuree['date']; +if( $assurer['date'] == 'now' ) $assurer['date'] = date('Y-m-d'); +if( $assurance['date'] == 'now' ) $assurance['date'] = date('Y-m-d'); $document = my_recode(GET('document1')); if( GET('document2') ) $document .= '/'. my_recode(GET('document2')); // for history sake do special, next can void other arguments... if( GET('name') ) $_GET['name1'] = GET('name'); if( $document ) $_GET['name1ID'] = $document; -function Dstr( $strg = "", $cnt = 1 ) { +function Dstr( $strg = '', $cnt = 1 ) { return( sprintf("name%d%s", $cnt, $strg)); } $j = 0; // after two successive empty names we stop for( $i = 1; $i <= 9 AND $j < 2; $i++) { // max 9 names we only print 4 max... - $name = my_recode(GET(Dstr("", $i))); + $name = my_recode(GET(Dstr('', $i))); if( $name ) { $j = 0; $assuree[ 'namecnt' ]++; $assuree[ 'names' ] [] = array ( - 'name' => $name ? $name : "", - 'idtype' => my_recode(GET(Dstr("ID",$i)))? my_recode(GET(Dstr("ID",$i))) : "", - 'points' => my_recode(GET(Dstr("Pnts",$i))) != "" ? intval(my_recode(GET(Dstr("Pnts",$i)))) : -1 + 'name' => $name ? $name : '', + 'idtype' => my_recode(GET(Dstr('ID',$i)))? my_recode(GET(Dstr('ID',$i))) : '', + 'points' => my_recode(GET(Dstr('Pnts',$i))) != '' ? intval(my_recode(GET(Dstr('Pnts',$i)))) : -1 ); - if( $name != "" AND + if( $name != '' AND !utf8_is_ascii_ctrl($name) AND !function_exists('utf8_to_ascii')) require_once ( UTF8_ASCII ); } else $j++; } +// try to get policy documents names to be printed off +$j = 0; // after two successive empty name we stop searching +for( $i = 1; $i <= 9 AND $j<2; $i++ ) { + $name = GET(sprintf("policy%d", $i)); + if( $name != '' ) { $page['policies'][] = $name; $j = 0; } + else $j++; +} + unset( $document ); unset( $i ); unset( $j); // unset($_GET); // end of arguments imports - header("Expires: ".gmdate("D, j M Y G:i:s \G\M\T", time()+10800)); - header("Content-Disposition: attachment; filename=CAcert cap.pdf"); - header("Cache-Control: public, max-age=10800"); - header("Pragma: cache"); + header('Expires: '.gmdate("D, j M Y G:i:s \G\M\T", time()+10800)); + header('Content-Disposition: attachment; filename=CAcert cap.pdf'); + header('Cache-Control: public, max-age=10800'); + header('Pragma: cache'); // Content-Type and Content Length is done by tcpdf package // create new PDF document ===================================================== @@ -1479,32 +1572,20 @@ unset( $document ); unset( $i ); unset( $j); // unset($_GET); // $pdf->SetProtection(array('print', 'annot-forms')); // set document property information - $pdf->SetCreator("LibreSSL - CAcert web application"); - $pdf->SetAuthor("© " . date("Y") . " CAcert Inc., Australia."); - $pdf->SetKeywords("X.509, Certificate Programme, CAP form"); - $pdf->SetTitle("CAcert Certificate Programme form"); - $pdf->SetSubject("CAP form V".$pdf->Version().", generated " . date("Y-n-j H:i:s T")); + $pdf->SetCreator('LibreSSL - CAcert web application'); + $pdf->SetAuthor('© ' . date('Y') . ' CAcert Inc., Australia.'); + $pdf->SetKeywords('X.509, Assurance Programme, CAP form, Community Agreement, Digital Certificates, CAcert'); + $pdf->SetTitle('CAcert Assurance Programme'); + $pdf->SetSubject('CAP form V'.$pdf->Version().', generated ' . date("Y-n-j H:i:s T")); if( GET('watermark') != '') $pdf->Watermark = my_recode(GET('watermark')); // requires zlib and will decrease response time but increase bandwidth // if no zlib is found, automatically no compression is done $pdf->SetCompression(true); // turn it off when more pperformance is needed -// set default header data - //$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING); -// set header and footer fonts - //$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); - //$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); // AddSJISFont function is not present in tcpdf package !!!! -// set default header data - //$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING); - -// set header and footer fonts - //$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); - //$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); - //set auto page breaks - $pdf->SetAutoPageBreak(TRUE, /* 4 */ MARGIN/2); + $pdf->SetAutoPageBreak(TRUE, MARGIN*0.707); //set image scale factor $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); @@ -1517,13 +1598,14 @@ unset( $document ); unset( $i ); unset( $j); // unset($_GET); // AND GENERATE THE FORM =================================== // generation properties which have been set from environment: - // BW (color), FONT (free Sans Vera), orientation (landscape, 2-up), format (A4) + // deflt: BW (color), FONT (free Sans Vera), portrait 1-up, A5, duplex, with CCA + // orientation landscape gives 2-up if ( FONT == 'SJIS') $pdf->AddSJISFont(); $pdf->PrintForm($assuree, $assurer, $assurance, $page); $pdf->setViewerPreferences($pdf->ViewerPrefs); //Close and output PDF document - $pdf->Output("CAcert CAP.pdf", "I"); + $pdf->Output('CAcert CAP.pdf', 'I'); //============================================================+ // END OF FILE diff --git a/www/coap.html.php b/www/coap.html.php new file mode 100644 index 0000000..13037a6 --- /dev/null +++ b/www/coap.html.php @@ -0,0 +1,350 @@ + + + + + + +'._("Organisation Information (COAP) form").'', "\n"; +?> + + + + + + +

+

CAcert logo
+ +

+

+

+'._("CAcert Organisation Assurance Programme").'
', "\n"; +?> +
+
+'._("Organisation Information (COAP) form").'
', "\n"; +?> +
+
CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia - http://www.cacert.org
+
+ + + +'._("CAcert's Root Certificate sha1 fingerprints").'', "\n"; +?> + + + + + + + + + + +
class 1: 135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33
class 3: DB4C 4269 073F E9C2 A37D 890A 5C1B 18C4 184E 2A2D
+

+\n"; + echo _("The Applicant asks the Organisation Assurer to verify to CAcert Community that the information provided by the Applicant is correct, and according to the official trade office registration bodies."), "
\n"; + echo _("For more information about the CAcert Organisation Assurance Programme, including detailed guides to CAcert Organisation Assurers, please visit:"), ' '; + echo ' http://www.cacert.org
'; + echo _("A CAcert Arbitrator can require the Organisation Assurer to deliver the completed forms and accompanying documents in the event of a dispute."), "
\n"; + echo _("For the CAcert Individual Assurance Programme there is a separate special CAP form."); +?> + +

+ +
+ + + +'._("Organisation Identity Information").'', "\n"; +?> + + + + +'. _("Name of the organisation").'', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo '', "\n"; +?> + + + +'. _("Jurisdiction info"). '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; +?> + + + +', "\n", ' ', "\n"; + for ( $j = 1; $j <= 3; $j++ ) { + printf(" \n", $j > 2 ? "right" : ($j > 2 ? "center" : "left") , $i * 3 + $j); + } + echo '', "\n"; + } +?> + + + +'. _("Trade Office info"). '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; +?> + + + +', "\n", ' ', "\n"; + for ( $j = 1; $j <= 3; $j++ ) { + printf(" \n", $j > 2 ? "right" : ($j > 2 ? "center" : "left"), $i * 3 + $j); + } + echo '', "\n"; + } +?> + + +', "\n", ' ', "\n"; + printf(" \n\n",$i); + echo "\n \n", $i); + echo " \n\n", $i); + } +?> + +
'. _("Address").' ('. _("comma separated"). ')'; + echo '
'. _("type"). ''. _("state"). ''. _("country code"). '
'; + if ( $i < 1 ) { echo _("Registered Trade Names");} + echo '
'. _("reg. number"). ''. _("trade office"). ''. _("region"). '
'; + if ( $i < 1 ) { echo _("Internet Domain(s)");} + echo '
'; + if( $i < 2 ) { echo _("Organisation Administrator(s)"); } + echo '
". _("email") . " "; + printf("". _("phone") . " "; + printf("
+ + + + + + + + + + + +'. _("director") . '', "\n"; + echo '              ', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; +?> + + + + + + \n"; + echo "\n", ' \n"; +?> + + +'. _("Date"). ' ('. _("yyyy-mm-dd"). ')'; + echo '
', "\n"; + echo ' \n"; + echo "\n"; +?> + + + +
+ +
+ + (CCA)

'. _("email"); + echo ' (optional)'; + echo '      '. _("phone"); + echo ' (optional)'; + echo '
+ +CCA)
+\n
'; + echo _("I am duly authorised to act on behalf of the organisation, I grant operational certificate administrative privileges to the specified Organisation Administrator and, I request the Organisation Assurer to verify the organisation information according to the Assurance Policies."). "
'. _("Signature") .'
('._("and organisation stamp") . ")

+
+ + + + +'._("Organisation Assurer's Statement").'', "\n"; +?> + + + + + +'. _("organisation assurer") . ' ', "\n"; + echo '', "\n"; + echo '', "\n"; + echo ' ', "\n"; + echo ' ', "\n"; +?> + + + + + + + +'._("Date").' ('._("yyyy-mm-dd").')'; +?> +
+'._("Signature").'', "\n"; +?> + + + +

'. _("email"); + echo ' (optional)'; + echo '      '. _("phone"); + echo ' (optional)'; + echo '
+\n"; +?> +
+\n"; +?> +

+
© + +
+
+

+ + + + + + +
+ + +
+

+ +

+
+ '._("portrait").' '._("1-up").')'; +?> +
+
A4 + A5 + Letter '._("paper format"); + echo "
\n"; + echo '

'._("no"); + echo ' '._("yes, the CCA is attached to the form."), "
\n"; + $policies = array( + 'Organisation Assurance Policy' => + 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganisationAssurancePolicy.html', + 'Organisation Assurance Subpolicy for Australia' => + 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganisationAssuranceSubPolicyAustralia.html', + 'Organisation Assurance Subpolicy for Europe' => + 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganisationAssuranceSubPolicyEurope.html', + 'Organisation Assurance Subpolicy for the United States' => + 'http://svn.cacert.org/CAcert/Policies/OrganisationAssurancePolicy/OrganizationAssuranceSubPolicyUnitedStates.html', + ); + $cnt = 0; + while( list($key, $ref) = each($policies) ) { + $cnt++; + if( $cnt < 2 ) { + echo '

'. _("Applicable Organisation Policy documents and information can be attached to the pdf output file. Mark those documents, which need to be attached") . ":
\n"; + } + printf("
%s
\n", $cnt, $ref, $ref, $key); + } + if( $cnt > 0 ) { + echo "\n"; + } + echo "
\n"; + echo _("Submit the form").': \n"; +?> +

+
+ + + diff --git a/www/coapnew.php b/www/coapnew.php index 8b465d9..34ab935 100644 --- a/www/coapnew.php +++ b/www/coapnew.php @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -// $Id: coapnew.php,v 1.1 2008/11/14 23:39:10 root Exp $ -define('REV', '$Revision: 1.1 $'); +// $Id: coapnew.php,v 1.2 2009/03/02 23:09:05 root Exp $ +define('REV', '$Revision: 1.2 $'); /* ** Created from old cap.php 2003, which used the now obsoleted ftpdf package @@ -36,7 +36,7 @@ define('REV', '$Revision: 1.1 $'); ** PDF generation package (tcpdf/tcpdf.php): ** TCPDF package + define the TCPDF_DIR install directory (GPL) ** tcpdf package is patched for text subtypes see tcpdf diff file. -** Add free embedding zapfdingbat font: e.g. ITC_Zapf_Dingbats_Medium.ttf +** Add free embedding zapfdingbat font ** ttf2pt1 -F zapfdinbats.ttf -> zapfdingbats.utf metrics file ** php -q makefont.php zapfsdingbats.ttf zapfdingbats.utf -> .php,.ctg.z,.z ** install files: zapfdingbats.{php,z,ctg.z} in tcpdf/fonts dir @@ -53,8 +53,8 @@ define('REV', '$Revision: 1.1 $'); ** see UTF8_ASCII definition for location requirements ** Thirdly: if not found transliteration feature is disabled. ** -** CCA pdf inclusion: -** if on one page: define holder for CCA file (CCA_FILE) (disabled now) +** policy documents for pdf inclusion: +** define CCA file (default policy) ** LOGO: CAcert logo logos directory is LOGO ** ** Functionality: @@ -73,8 +73,8 @@ define('REV', '$Revision: 1.1 $'); ** PDF URL links are used to web, wiki, and faq for more info search ** Only on non-ascii chars in a name the utf8 routines are loaded ** PDF reader has wiki info url's and easy email feedback -** DISABLED: -** CCA generates only on request (to be changed when it fits on one page) +** ENABLED: +** included is the CCA generates 2 extra pages (needs work to limit vert spacing) ** ** For other re-use of some routines: ** abbreviate() abbreviate a name on std way @@ -93,10 +93,13 @@ define('REV', '$Revision: 1.1 $'); ** If not provided: should check every string is transcoded? ** recode(), recode_string(0 is said to have too many (japanese) defeats ** recode_string() is only used on GET[] input (html->utf-8), -** own translate fie _() is expected to provide utf-8 (own recode() ) ** UTF-8 use routines from http://www.sourceforge.net/projects/phputf8 ** which replaces php recode() package. ** on many places own utf-8 handling code exists and is loaded (tcpdf problem) +** _() translation routine. The returned HTML string is translated to utf-8 string. +** the GET() routines expects utf-8 code (see test defs) but might be changed +** to use html entity conversion routine of PHP (5.2 has a problem...). +** ** PDF compression zlib: (now disabled) ** if PHP lib zcompress() is present, generated PDF is compressed ** @@ -105,7 +108,7 @@ define('REV', '$Revision: 1.1 $'); ** Latter font is no longer for free download ** For now: FreeVeraSans is used now and embedded (std in TCPDF package) ** Zapf Dingbats font: some Open Source readers have bad font handling or -** no zapfdingbat font. So it is embedded: e.g. free ITC_Zapf_Dingbats_Medium.ttf +** no zapfdingbat font. So one is embedded ** To be generated with tooling in util directory. ** ** TO DO, to CHECK and KNOWN PROBLEMS: @@ -171,6 +174,7 @@ define('REV', '$Revision: 1.1 $'); //** $_GET['assurancedate'] date of assurance (new) (depreciated) //** $_GET['location'] location of assurance (depreciated) ** $_GET['nocca'] do not print CCA on back side (dflt: false) +** $_GET['policy<%d>'] to include policy document(s) in pdf file %d = 1-9 (new) ** $_GET['noform'] do not print form (dflt: true) (new) ** $_GET['format'] paper format required A0-A6,Letter, Folio, B0-B6 (dflt A4) ** $_GET['watermark'] watermark on the page @@ -329,7 +333,7 @@ define('LIME', '#C7FF00'); // RGB 199 255 0 define('GREEN', '#00BE00'); // 0 190 0 define('POBOX','CAcert Inc. - P.O. Box 4107 - Denistone East NSW 2112 - Australia'); -define('WEB', 'http://www.CAcert.org'); +define('WEB', 'http://www.cacert.org'); define('WIKI','http://wiki.cacert.org/wiki'); define('ROOTKEYS','http://www.cacert.org/index.php?id=3'); define('ASSCOAP', WIKI.'/FAQ/AssuranceByCAP'); @@ -339,18 +343,17 @@ define('ASSINTRO', WIKI.'/FAQ/AssuranceIntroduction'); define('ASSORG', WIKI."/OrganisationAssurance"); define('ARBIT', WIKI."/ArbitrationForum"); // CAcert Community Agreement -define('CCA', WEB."/policy/CAcertCommunityAgreement.php"); +define('CCA', "CAcertCommunityAgreement"); // default policy to print +define('POLICY','policy/'); // default polciy doc directory +define('EXT','.php'); // default polciy doc extention, should be html /* finger print CAcert Root Key */ // should obtain this automatically define("CLASS1_SHA1","135C EC36 F49C B8E9 3B1A B270 CD80 8846 76CE 8F33"); define("CLASS3_SHA1","DB4C 4269 073F E9C2 A37D 890A 5C1B 18C4 184E 2A2D"); // next two are not used on the form define("CLASS1_MD5","A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B"); define("CLASS3_MD5","73:3F:35:54:1D:44:C9:E9:5A:4A:EF:51:AD:03:06:B6"); -// place where CCA files resides -if( file_exists('../CAcertCommunityAgreement.html') ) - define('CCA_FILE', '../CAcertCommunityAgreement.html'); -//else -// define('CCA_FILE', CCA); // this greps the page from internet !! +// if on draft provide std message +define('WATERMARK',""); // other definitions for the form define("MAX_COLS", 2); // max coulumns per page Landscape is printed with 2-up @@ -419,30 +422,89 @@ function utf8_is_ascii_ctrl($str) { // extend TCPF with custom functions class COAPPDF extends TCPDF { - // do cap form version numbering automatically "$Revision: 1.1 $" + // do cap form version numbering automatically "$Revision: 1.2 $" /*public*/ function Version() { strtok(REV, " "); return(strtok(" ")); } - function Header() + /*public*/ function myHeader( $msg = NULL, $url = NULL ) { - $this->setXY($this->lMargin, $this->lMargin); - } - - function Footer() - { - if( $this->footer_msg == NULL ) return; - $this->SetFont(FONT,'', F_SIZE-1); - $strg = "© ". date("Y"). " CAcert Inc.". $this->footer_msg; - if( $this->GetGroupPageNo() > 0 ) { - $this->SetXY(0, $this->GetPageHeight()/$this->scale*100.0-7); - $this->Cell($this->GetPageWidth()/$this->scale*100.0, 3, - sprintf("%s %d/%d", _("page"), $this->GetGroupPageNo()+1, - $this->GetNumPages()), 0, 0, 'C'); + static $my_url = NULL; + if( $msg != NULL ) { + $this->my_header_msg = $msg; $my_url = $url; return; + } + if( $this->my_header_msg == NULL ) return; + if( $this->msg_page_nr > 0 ) { + $font_fam = $this->FontFamily; + $font_style = $this->FontStyle.($this->underline ? 'U' : '').($this->linethrough ? 'D' : ''); + $font_size = $this->getFontSize(); + $this->SetFont(FONT,'', F_SIZE-1); + $this->setXY($this->lMargin, MARGIN-3); + $this->Cell($this->colwidth, 3,$this->my_header_msg, 0, 0, 'R'); + if( !empty($font_fam ) ) + $this->SetFont($font_fam,$font_style,$font_size); + if( $my_url != NULL AND $my_url != "" ) + $this->myLink($this->lMargin+$this->colwidth/2,$this->lMargin-4,$this->colwidth,(F_SIZE+5)/2.9,$my_url); + } + $this->setXY($this->lMargin, MARGIN+3); + $this->y0 = $this->getY(); + } + + // undefine default header and footer handling + // default routines do not handle columns + function Footer() { } + function Header() { } + function Mark( $string = "" ) { + return array( $string, 1+substr_count($string,'.') ); + } + + /*public*/ function myFooter( $msg = NULL, $url = NULL ) + { + static $my_url = NULL; + if( $msg != NULL ) { + $this->my_footer_msg = $msg; $this->msg_page_nr = 0; + $my_url = $url; return; + } + if( $this->my_footer_msg == NULL ) return; + $this->InFooter = true; + $this->msg_page_nr++; + $font_fam = $this->FontFamily; + $font_style = $this->FontStyle.($this->underline ? 'U' : '').($this->linethrough ? 'D' : ''); + $font_size = $this->getFontSize(); + $this->SetFont(FONT,'', F_SIZE-1); + if( $this->msg_page_nr > 1 ) { + $this->SetXY($this->lMargin, $this->GetPageHeight()/$this->scale*100.0-6); + $this->Cell($this->colwidth, 3, + sprintf("%s %d", $this->unhtmlentities( _('page') ), $this->msg_page_nr), + 0, 0, 'C'); + } + if( $this->my_footer_msg != "" ) { + $strg = "© ". date("Y"). " CAcert Inc.".", ". $this->my_footer_msg; + $this->SetXY($this->lMargin+MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-6); + $this->Cell($this->colwidth, 3, $strg, 0, 0, 'R'); + if( $my_url != NULL AND $my_url != "" ) + $this->myLink($this->lMargin+MARGIN/2,$this->GetPageHeight()/$this->scale*100.0-6,$this->colwidth,(F_SIZE+5)/2.9,$my_url); + } + if( $this->Watermark != "" ) { + $this->StartTransform(); + $savex = $this->GetX(); $savey = $this->GetY(); + $this->SetFont(FONT,'', F_SIZE*7); + $l = $this->GetStringWidth($this->Watermark); + $h = $this->GetPageHeight()/$this->scale*100.0/2; + $w = $this->colwidth/2+MARGIN; + $this->SetXY(0,0); + $this->TranslateY($h+(F_SIZE*7)/2.9); + $this->TranslateX($w-MARGIN+$this->lMargin); + $this->Rotate(rad2deg(atan($h/$w))); + $this->Text(-$l/2,0,$this->Watermark, 0.8); + $this->StopTransform(); + $this->SetXY($savex,$savey); } - $this->SetXY(MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-7); - $this->Cell($this->GetPageWidth()/$this->scale*100.0-MARGIN, 3, $strg, 0, 0, 'R'); + + if( !empty($font_fam ) ) + $this->SetFont($font_fam,$font_style,$font_size); + $this->InFooter = false; } // user and print preferences @@ -451,7 +513,8 @@ class COAPPDF extends TCPDF { 'Duplex' => 'Simplex', 'NumCopies'=> '1', 'DisplayDocTitle' => 'CAcert Organisation Assurance Programme (COAP) form', - 'HideToolBar' => 'true' + 'HideToolBar' => true, + 'FitWindow' => true, ); //number of colums @@ -472,11 +535,13 @@ class COAPPDF extends TCPDF { // scaling factor /*protected*/ var $scale = 100.0; - // print form (footer msg) - /*protected*/ var $footer_msg = NULL; + // print header and footer + /*protected*/ var $my_footer_msg = NULL; + /*protected*/ var $my_header_msg = NULL; + /*protected*/ var $msg_page_nr = 0; // print short watermark on the page - /*public*/ var $Watermark = ""; + /*public*/ var $Watermark = WATERMARK; /*public*/ function SetFormat( $format = "A4" ) { switch( strtolower($format) ) { @@ -507,14 +572,15 @@ class COAPPDF extends TCPDF { } //Set position at a given column - /*private*/ function SetCol($col = 0) { + /*private*/ function SetCol($col = -1) { static $pagecolwidth = 1.0; static $column_space = 1.0; + if( $col == -1 ) $col = $this->col+1; if( $this->colwidth == 0 ) { // only once at start; set default values //set margins - $this->addPage(); + $this->addPage(); $col = 0; // reset to zero $this->SetMargins(MARGIN, MARGIN, MARGIN); if( $this->CurOrientation != 'L' ) { $this->scale *= 1.4142; @@ -534,11 +600,18 @@ class COAPPDF extends TCPDF { } $this->y0 = $this->GetY(); } - $this->PrintTable("", -1); // if pending table close up table + else { + if( $col == $this->col ) { // reset on close of this column + $x = MARGIN + $this->col*($pagecolwidth+$column_space); + $this->SetLeftMargin($x); + //$this->SetRightMargin($this->w - $x - $this->colwidth); + } + $this->PrintTable("", -1); // if pending table close up table + $this->myFooter(); // print footer msg if defined + } if( $col >= $this->ncols ) { - $this->addPage(); + $this->addPage(); $col = 0; $this->ScaleXY($this->scale,0,0); - $col = 0; $this->y0 = 0; //no header/footer done... } elseif ( $col > 0 AND $col < $this->ncols) { // print column separator @@ -556,24 +629,39 @@ class COAPPDF extends TCPDF { $this->SetLeftMargin($x); $this->SetRightMargin($this->w - $x - $this->colwidth); $this->SetXY($x, $this->y0); + $this->myHeader(); //print header msg if defined $this->PrintTable("", 0); // if in table reprint title table } - //Method accepting or not automatic page break /*public*/ function AcceptPageBreak() { - if($this->col < ($this->ncols-1)) { - //Go to next column - $this->SetCol($this->col+1); - //Set ordinate to top - $this->SetY($this->y0); - //Keep on page - return false; - } else { - //Go back to first column - $this->SetCol($this->ncols); - //Page break - return false; + $this->SetCol(); + return false; + } + + // redefine this routine from tcpdf.php due to scaling bug + /*protected*/ function checkPageBreak($h) { + if (((($this->y + $h)*$this->scale/100.0) > $this->PageBreakTrigger) ) { + if ( !$this->InFooter ) { + if ( ($this->AcceptPageBreak())) { + $rs = ""; + //Automatic page break + $x = $this->x; + $ws = $this->ws; + if ($ws > 0) { + $this->ws = 0; + $rs .= '0 Tw'; + } + $this->AddPage($this->CurOrientation); + if ($ws > 0) { + $this->ws = $ws; + $rs .= sprintf('%.3f Tw', $ws * $k); + } + $this->_out($rs); + $this->y = $this->tMargin; + $this->x = $x; + } + } } } @@ -584,7 +672,7 @@ class COAPPDF extends TCPDF { // put Link in user space /*private*/ function myLink( $x, $y, $w, $h, $Lnk = NULL, $Type = array('SubType'=>'Link') ) { if( $Lnk == NULL ) return; - if( $Lnk == "" ) $Lnk = WEB; + if( $Lnk == "" ) $Lnk = WEB."/"; $this->Annotation( $this->S($x), $this->S($y), $this->S($w), $this->S($h), $Lnk, $Type); //$this->Annotation( $x, $y, $w, $h, $Lnk, $Type); } @@ -694,7 +782,7 @@ class COAPPDF extends TCPDF { /*private*/ function PrintDate( $x=10, $y=10, $dstrg="teus", $dvalue="1945-10-6", $field = NULL , $RL = 'L') { static $TextProps = array('strokeColor' => LLBLUE, 'value' => "", 'fillColor' => LBLUE , 'textSize' => '11', 'charLimit'=> 10); - $TextProps['userName'] = _("yyyy-mm-dd"); + $TextProps['userName'] = $this->unhtmlentities( _("yyyy-mm-dd") ); $this->SetFont( FONT, '', F_SIZE); $this->SetXY($RL == 'L'? $x : $x-50, $y); @@ -711,75 +799,93 @@ class COAPPDF extends TCPDF { } // Add import HTML text eg from CCA - /*private*/ function CCAinfo() { - $error = ""; - if( !defined('CCA_FILE') ) return; - $data = file_get_contents(CCA_FILE); - if( !$data ) $error = "\nInternal Error: no ".CCA_FILE." found."; - $regs = array(); - preg_match('/<[Bb][oO][Dd][yY]\s*>/', $data, $regs); - if( count($regs) < 1 ) $error .= "\nInternal Error: not a html body tag found."; + /*public*/ function PrintHTML( $url = NULL ) { + if( $url == NULL OR $url == "" ) return; + $error = ""; $title = ""; $url = POLICY.$url.EXT; + if( ! file_exists($url) ) $url = WEB."/".$url; + $data = file_get_contents($url); + if( !$data ) $error = "\nInternal Error: no ".$url." found."; else { - $start = strpos($data, $regs[0]) + strlen($regs[0]); - $data = substr($data, $start); + $regs = array(); + preg_match('/<[Tt][Ii][Tt][Ll][Ee][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no open tag title found on $url."; + else { + $start = strpos($data, $regs[0]) + strlen($regs[0]); + $data = substr($data, $start); + } + $regs = array(); + preg_match('/<\/[Tt][Ii][Tt][Ll][Ee][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no close title tag found on $url."; + else { + $end = strpos($data, $regs[0]); + $title = trim(substr($data,0,$end)); + $data = substr($data, $end+strlen($regs[0])); + } + $regs = array(); + preg_match('/<[Bb][oO][Dd][yY][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no open html body tag found on $url."; + else { + $start = strpos($data, $regs[0]) + strlen($regs[0]); + $data = substr($data, $start); + } + $regs = array(); + preg_match('/<\/[Bb][oO][Dd][yY][^>]*>/', $data, $regs); + if( count($regs) < 1 ) $error .= "\nInternal Error: no closing html body tag found on $url."; + else { + $end = strpos($data, $regs[0])-1; + $data = substr($data, 1, $end); + } } - $regs = array(); preg_match('/<\/[Bb][oO][Dd][yY]\s*>/', $data, $regs); - if( count($regs) < 1 ) $error .= "\nInternal Error: not closing html body tag found."; - else { - $end = strpos($data, $regs[0])-1; - $data = substr($data, 1, $end); - } + if( !$title ) $title = $url; + $this->SetCol(); $this->setFont(FONT, F_SIZE); - if( !$error ) - $this->writeHTMLCell($this->colwidth,2.5,$this->lMargin+1,$this->GetY()+2.5, + if( !$error ) { + $this->PrintHeader(_($title), $this->unhtmlentities( _('policy document') ), strncmp($url,WEB,strlen(WEB))==0? $url : (WEB."/".$url)); + if( $title ) $this->Bookmark($title,0); + $this->writeHTMLCell($this->colwidth,2.5,$this->lMargin+1,$this->GetY()+2.5, $data, 0,2,0,'L'); + } else - $this->MultiCell($this->colwidth, 3, $error); + $this->MultiCell($this->colwidth, 3, $error); } - // Add CAcert Community Agreement - /*private*/ function PrintCCA(){ - $this->PrintHeader(_("CAcert Community Agreement"), _("(informal, one page version)"), defined('CCA')? CCA:""); - $this->CCAinfo(); - $this->PrintFooter(""); - } - /*private*/ function PrintCOAP($organisation = NULL, $registry = NULL, $assurer = NULL, $assurance = NULL){ - $this->PrintHeader(_('CAcert Organisation Assurance Programme'), _('Organisation Information (COAP) form'), defined('ASSCOAP')?ASSCOAP:"",defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,"/")) : ""); + $this->SetCol(); + $this->PrintHeader($this->unhtmlentities( _('CAcert Organisation Assurance Programme'), _('Organisation Information (COAP) form'), defined('ASSCOAP')?ASSCOAP:"",defined('WEB')? WEB.substr(__FILE__, strrpos(__FILE__,"/")) : "") ); + // define slighly different footer message + $this->myFooter("V". substr($this->Version(), 0, strpos($this->Version(), '.')).", ". $this->unhtmlentities( _('generated')." ".date("Y-n-j") )); $this->AssuranceInfo(); $this->InfoOrganisation($organisation, $registry); $this->StatementOrganisation($organisation); $this->StatementAssurer( $assurer, $assurance ); - $this->PrintFooter(", V". substr($this->Version(), 0, strpos($this->Version(), '.')).", ". _("generated")." ".date("Y-n-j")); } //Add form and/or CCA (on duplex only when more as one page is printed) /*public*/ function PrintForm( $organisation = NULL, $registry = NULL, $assurer = NULL, $page = NULL ) { - $col = 0; - if( !isset( $page['form']) OR $page['form'] ) { - for( ; $col < $this->ncols; $col++ ) { - $this->SetCol($col); + for($cnt=0 ; $cnt < $this->ncols; $cnt++ ) { + if( !isset( $page['form']) OR $page['form'] ) { + // the form is one page, use new room? if ( $organisation == NULL OR $registry == NULL OR $assurer == NULL ) $this->Error("Organisation or Assurer data records failure"); $this->PrintCOAP( $organisation, $registry, $assurer); - } - } else $page['cca'] = true; // on no form sure we print CCA - - // do the Community Agreement print - if( isset($page['cca']) AND $page['cca'] ) { - if( $col >= $this->ncols ) { - // and on duplex print back side with Community Agreement - if( $this->CurOrientation == 'P' ) - $this->ViewerPrefs['Duplex'] = 'DuplexFlipLongEdge'; - else - $this->ViewerPrefs['Duplex'] = 'DuplexFlipShortEdge'; - } - for( $col = 0; $col < $this->ncols; $col++) { - $this->SetCol($col); - $this->PrintCCA(); - } + } + // print off policy documents to be included in pdf file + foreach( $page['policies'] as $i => $file ) { + $this->Watermark = WATERMARK; // no watermark on these pages + if( $file ) $this->PrintHTML( $file ); + } + if( $this->col > 0 OR $this->getPage() > 1 ) break; + } + if( $this->getPage() > 1 ) { + // and on duplex print back side with Community Agreement + if( $this->CurOrientation == 'P' ) + $this->ViewerPrefs['Duplex'] = 'DuplexFlipLongEdge'; + else + $this->ViewerPrefs['Duplex'] = 'DuplexFlipShortEdge'; } + // close up this column, make sure footer is printed. + $this->my_header_msg = NULL; $this->SetCol($this->col); } // Set form title (right align) @@ -790,6 +896,8 @@ class COAPPDF extends TCPDF { // CAcert logo // eps should be better, but it does not seem to work with CAcert logo $this->rMargin -= 1; + $this->myFooter($title1,$url1); + $this->myHeader($title2,$url2); if( LOGO_TYPE == '.eps' ) $this->ImageEPS(BW?LOGO.'mono'.LOGO_TYPE:LOGO.'colour'.LOGO_TYPE, ($this->lMargin+$this->colwidth)-51,$tSide-3,51); @@ -798,17 +906,19 @@ class COAPPDF extends TCPDF { $this->Image(BW?LOGO.'mono'.LOGO_TYPE:LOGO.'colour'.LOGO_TYPE, ($this->lMargin+$this->colwidth)-51,$tSide-3,51,0,0, NULL,0,true,intval(LOGO_DPI)); - $this->myLink($this->lMargin+$this->colwidth-51, $tSide-3,51,51/1000*229,WEB); + $this->myLink($this->lMargin+$this->colwidth-51, $tSide-3,51,51/1000*229,WEB."/"); // form type $this->SetFont(FONT,'B',F_SIZE+5); $this->SetY($tSide+5); $this->SetX($this->lMargin); $l = $this->GetStringWidth($title1); $this->Cell($this->colwidth+1,14,$title1,0,0,'R',0,NULL); - $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url1); + if( $url1 != NULL AND $url1 != "" ) + $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url1); $this->Ln(5); $this->SetX($this->lMargin); $l = $this->GetStringWidth($title2); $this->Cell($this->colwidth+1,14,$title2,0,0,'R',0,NULL); - $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url2); + if( $url2 != NULL AND $url2 != "" ) + $this->myLink($this->lMargin+$this->colwidth-$l,$this->GetY()+5,$l,(F_SIZE+5)/2.9,$url2); // CAcert Inc. postbox address $this->Ln(6); $this->SetX($this->lMargin); @@ -825,7 +935,7 @@ class COAPPDF extends TCPDF { $this->SetXY($savex,$savey); // sha1 fingerprint CAcert rootkeys class 1 and class 3 - $strg = _("CAcert's Root Certificate sha1 fingerprints") . ", class 1: ". CLASS1_SHA1 . ", class 3: " . CLASS3_SHA1; + $strg = $this->unhtmlentities( _("CAcert's Root Certificate sha1 fingerprints") ) . ", class 1: ". CLASS1_SHA1 . ", class 3: " . CLASS3_SHA1; $this->Ln(3); $this->SetX($this->lMargin); $this->SetFont(FONT,'',F_SIZE * $this->colwidth / ($this->GetStringWidth($strg) +1)); $this->Cell($this->colwidth,10, $strg,0,0,'C',0,NULL); @@ -860,14 +970,14 @@ class COAPPDF extends TCPDF { // store current margin values $cellcnt = 0; $this->SetY($this->GetY()+0.5); - $this->Bookmark(_("CAcert COAP form"),0,$this->S($this->GetY())); + $this->Bookmark($this->unhtmlentities( _('CAcert COAP form') ),0,$this->S($this->GetY())); // Show text blurb at top of page - $strg = _("The CAcert Organisation Programme (COAP) aims to verify the identity of the organisation."); - $strg .= "\r\n". _("The Applicant asks the Organisation Assurer to verify to CAcert Community that the information provided by the Applicant is correct, and according to the official trade office registration bodies."); + $strg = $this->unhtmlentities( _('The CAcert Organisation Programme (COAP) aims to verify the identity of the organisation.') ); + $strg .= "\r\n". $this->unhtmlentities( _('The Applicant asks the Organisation Assurer to verify to CAcert Community that the information provided by the Applicant is correct, and according to the official trade office registration bodies.') ); $cellcnt += $this->PrintInfo( $strg, defined('ASSINTRO')? ASSINTRO:""); - $cellcnt += $this->PrintInfo( _("For more information about the CAcert Organisation Assurance Programme, including detailed guides to CAcert Organisation Assurers, please visit:")." ".WEB, defined('ASSCOAP')?ASSCOAP:""); - $cellcnt += $this->PrintInfo( _("A CAcert Arbitor can require the Organisation Assurer to deliver the completed forms and accompanying documents in the event of a dispute."),defined('ARBIT')?ARBIT:""); + $cellcnt += $this->PrintInfo( $this->unhtmlentities( _('For more information about the CAcert Organisation Assurance Programme, including detailed guides to CAcert Organisation Assurers, please visit:')." ".WEB, defined('ASSCOAP')?ASSCOAP:"") ); + $cellcnt += $this->PrintInfo( $this->unhtmlentities( _('A CAcert Arbitrator can require the Organisation Assurer to deliver the completed forms and accompanying documents in the event of a dispute.'),defined('ARBIT')?ARBIT:"") ); $this->SetY($this->GetY()+0.3); return( $cellcnt); } @@ -956,13 +1066,13 @@ class COAPPDF extends TCPDF { // put assurer help for assurance in pdf file for mouse over if ( $info != "" ) $msg = $info; if ( $email != NULL AND $email != "" AND $title != "" ) - $msg .= " ". _("The email address, which matches the CAcert account email address, is handy for administrative and contact reasons. For organisation administrator the email address is required."); + $msg .= " ". $this->unhtmlentities( _('The email address, which matches the CAcert account email address, is handy for administrative and contact reasons. For organisation administrator the email address is required.') ); if( $msg != "" ) $this->myLink($this->lMargin-7, $this->GetY()-1, 5, 3, $msg, array('subtype'=> 'Text', 'Open' => true, 'c'=> array(173,197,215), 'name' => 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("COAP form help")) + 't'=> $this->unhtmlentities( _('COAP form help') )) ); if( $backgrnd ) { if ( BW ) { @@ -1003,18 +1113,18 @@ class COAPPDF extends TCPDF { if( $email != NULL ) $abbr = $this->Abbreviate( $name ); else $abbr=""; if( $ascii != "" OR $abbr != "") { $la = $this->GetStringWidth($name) + 5; - $msg = _("The exact name of the individual may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.")."\r\n"; + $msg = $this->unhtmlentities( _('The exact name of the individual may have transliterated characters and/or some given names may be abbreviated. If present the first given name will be shown abbreviated and parentheses around the last part of the given name.') )."\r\n"; if( $ascii != "" ) $msg .= '* '. $ascii . "\r\n"; if( $abbr != "" ) $msg .= '* '. $abbr . "\r\n"; $this->myLink($this->lMargin+$l+$la, $savey, 3, 2, $msg, array('subtype'=> 'Text', 'Open' => false, 'c' => array(173,197,215), 'name' => 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't' => _("On the full name of the Assurer"))); + 't' => $this->unhtmlentities( _('On the full name of the Assurer') ))); } } $TextProps['value'] = $name ? $name : " "; - $TextProps['userName'] = _("Full exact name of the individual."); + $TextProps['userName'] = $this->unhtmlentities( _('Full exact name of the individual.') ); $this->TextField($field.($email? 'Name' : ""), $this->SetFieldXY($this->lMargin+2+$l, $savey, $this->colwidth-$l-3-($phone?25:0)), 4.5, $TextProps ); $this->SetFieldXY(); if( $phone AND $phone != " " ) { @@ -1029,8 +1139,8 @@ class COAPPDF extends TCPDF { $this->Cell($sw+1,0,$phone); } if( $phone ) { - $TextProps['value'] = $phone ? $phone : _("phone nr") . "?"; - $TextProps['userName'] = _("For organisation administrators and assurer: provide email address and optionally your phone number."); + $TextProps['value'] = $phone ? $phone : $this->unhtmlentities( _('phone nr') ) . "?"; + $TextProps['userName'] = $this->unhtmlentities( _('For organisation administrators and assurer: provide email address and optionally your phone number.') ); $this->TextField($field.'Phone', $this->SetFieldXY($this->lMargin+$this->colwidth-25, $savey, 24), 4.5, $TextProps ); $this->SetFieldXY(); } @@ -1040,12 +1150,12 @@ class COAPPDF extends TCPDF { $this->SetFont(FONT, "", F_SIZE); if( !BW ) $this->SetTextColor(17,86,140); $this->Write(0, $email); - $this->myLink($this->lMargin+$l, $savey,$this->GetStringWidth($email), 3, "mailto:". $email . "?subject=" . _("Organisation Assurance")); + $this->myLink($this->lMargin+$l, $savey,$this->GetStringWidth($email), 3, "mailto:". $email . "?subject=" . $this->unhtmlentities( _('Organisation Assurance') )); if( !BW ) $this->SetTextColor(0); } if( $email ) { - $TextProps['value'] = $email ? $email : _("email") . "?"; - $TextProps['userName'] = _("For organisation administrators and assurer: provide email address and optionally your phone number."); + $TextProps['value'] = $email ? $email : $this->unhtmlentities( _('email') ) . "?"; + $TextProps['userName'] = $this->unhtmlentities( _('For organisation administrators and assurer: provide email address and optionally your phone number.') ); $this->TextField($field.'Email', $this->SetFieldXY($this->lMargin+2+$l, $savey, $this->colwidth-$l-28), 4.5, $TextProps); $this->SetFieldXY(); $savey += 3; } @@ -1058,27 +1168,27 @@ class COAPPDF extends TCPDF { // All information of Applicant goes in one table /*public*/ function InfoOrganisation( $organisation = NULL, $registry = NULL ){ // Applicant Identity information part - $tSide = $this->PrintTable(_("Organisation Identity Information"))+1; + $tSide = $this->PrintTable($this->unhtmlentities( _('Organisation Identity Information') ))+1; - $msg = _("The organisation name, director name and signature, and applicable company law is checked by the Organisation Assurer with the official Trade Office Registration (Extract) or by other means. The organisation domain name(s) are checked of ownership against the internet domain DNS records."); + $msg = $this->unhtmlentities( _('The organisation name, director name and signature, and applicable company law is checked by the Organisation Assurer with the official Trade Office Registration (Extract) or by other means. The organisation domain name(s) are checked of ownership against the internet domain DNS records.') ); $msg .= "\r\nThe organisation administrator (a CAcert Assurer) email address must be the primary email address registered with CAcert."; // put hint on comparing names on title table $this->myLink($this->lMargin-7, $tSide-7, 5, 5, $msg, array('subtype'=> 'Text', 'Open' => true, 'c'=> array(173,197,215), 'name' => 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On organisation identity information"))); + 't'=> $this->unhtmlentities( _('On organisation identity information') ))); $this->SetXY($this->lMargin+1, $tSide); $this->PrintName( - _("The official full name of the organisation equal to the name of the organisation registered e.g. at the trade office registration of the state."), - _("Name of the organisation")." ", + $this->unhtmlentities( _('The official full name of the organisation equal to the name of the organisation registered e.g. at the trade office registration of the state.') ), + $this->unhtmlentities( _('Name of the organisation') )." ", "OrganisationNames0", $organisation['namecnt']>0?$organisation['names'][0]:" ", NULL, NULL, true); $this->PrintName( - _("The organisation address which should be equal to the address registered with the trade office."), - _("Address (comma separated)")." ", + $this->unhtmlentities( _('The organisation address which should be equal to the address registered with the trade office.') ), + $this->unhtmlentities( _('Address (comma separated)') )." ", "OrganisationAddress", $organisation['address'], NULL, NULL, true); @@ -1086,8 +1196,8 @@ class COAPPDF extends TCPDF { foreach( array( $organisation['type'], $organisation['state'], $organisation['country']) as $i ) if( $i != "" ) $strg .= ($strg != "" ? ", ": "") . $i; $this->PrintName( - _("The legal organisation type: eg Ltd, EPS, society, foundation, association, etc. The state/country under which jurisdiction the organisation operates."), - _("Type, jurisdiction (state)")." ", + $this->unhtmlentities( _('The legal organisation type: eg Ltd, EPS, society, foundation, association, etc. The state/country under which jurisdiction the organisation operates.') ), + $this->unhtmlentities( _('Type, jurisdiction (state)') )." ", "OrganisationType", $strg, NULL, NULL, true); @@ -1095,8 +1205,8 @@ class COAPPDF extends TCPDF { $strg = $organisation['namecnt'] <= 1 ? "" : $organisation['names'][1]; for( $i = 3; $i <= $organisation['namecnt']; $i++) $strg .= ", ". $organisation['names'][$i-1]; - $this->PrintName( _("Other registered trade names of the organisation. (comma separated)"), - _("Registered Trade Names"), 'OrganisationDBA', + $this->PrintName( $this->unhtmlentities( _('Other registered trade names of the organisation. (comma separated)') ), + $this->unhtmlentities( _('Registered Trade Names') ), 'OrganisationDBA', $strg, NULL, NULL, true); //$this->Ln(0.4); @@ -1104,8 +1214,8 @@ class COAPPDF extends TCPDF { foreach( array( $registry['identifier'], $registry['name'], $registry['region'], $registry['date'] ) as $i ) if( $i != "" ) $strg .= ($strg != "" ? ", " : "") . $i; $this->PrintName( - _("Trade Office Registry information, as organisation registration Identification number or license number, name of the trade office registry, trade office operating region, and optionally date of extract."), - _("Registration (id, name, region)"), + $this->unhtmlentities( _('Trade Office Registry information, as organisation registration Identification number or license number, name of the trade office registry, trade office operating region, and optionally date of extract.') ), + $this->unhtmlentities( _('Registration (id, name, region)') ), 'torinfo', $strg, NULL, NULL, true); @@ -1113,8 +1223,8 @@ class COAPPDF extends TCPDF { $strg = ""; foreach( $organisation['domains'] as $i ) $strg .= ($strg != "" ? ", " : "") . $i; $this->PrintName( - _("The internet domain name(s) the organisation controls and owns. The names will be checked with WHOIS with e.g. the DNS official top domain registrar e.g. the country ccTLD . registrar."), - _("Internet Domain(s)"), + $this->unhtmlentities( _('The internet domain name(s) the organisation controls and owns. The names will be checked with WHOIS with e.g. the DNS official top domain registrar e.g. the country ccTLD . registrar.') ), + $this->unhtmlentities( _('Internet Domain(s)') ), 'OrganisationDomains', $strg, NULL, NULL, true); @@ -1125,8 +1235,8 @@ class COAPPDF extends TCPDF { $space = $this->getPageHeight()/$this->scale*100.0 -MINH ; // margin for( $i = 0; $i < $cnt; $i++ ) { // names to be printed $this->PrintName( - _("The organisation administrator (CAcert Assurer) contact information. The administrator is appointed by the organisation director to administer the organisation domain certificates, secure the certificates and maintain them."), - _("Organisation Administrator"), + $this->unhtmlentities( _('The organisation administrator (CAcert Assurer) contact information. The administrator is appointed by the organisation director to administer the organisation domain certificates, secure the certificates and maintain them.') ), + $this->unhtmlentities( _('Organisation Administrator') ), sprintf("OrganisationAdmin%d",$i), $organisation['admins'][$i]['name'], $organisation['admins'][$i]['email']? $organisation['admins'][$i]['email']:" ", @@ -1138,8 +1248,8 @@ class COAPPDF extends TCPDF { // empty fields up to max 3 empty fields and allowed space if( $space < $this->getY() ) break; $this->PrintName( - $i+$j == 0? _("The organisation administrator (CAcert Assurer) contact information. The administrator is appointed by the organisation director to administer the organisation domain certificates, secure the certificates and maintain them."):"", - $i+$j > 0? "": _("Organisation Administrator"), + $i+$j == 0? $this->unhtmlentities( _('The organisation administrator (CAcert Assurer) contact information. The administrator is appointed by the organisation director to administer the organisation domain certificates, secure the certificates and maintain them.') ):"", + $i+$j > 0? "": $this->unhtmlentities( _('Organisation Administrator') ), sprintf("OrganisationAdmin%d",$i+$j), "", " ", " ", TRUE); } @@ -1183,42 +1293,42 @@ class COAPPDF extends TCPDF { $cellcnt = 0; // assuree statement section - $tSide = $this->PrintTable(_("Organisation's Statement")); // mark table header - $msg = _("The Director indicated by the Trade Office Registry Extract, has to underwrite the correctness of the information for the organisation and allowance of certificate operations by the administrators."); + $tSide = $this->PrintTable($this->unhtmlentities( _("Organisation's Statement") )); // mark table header + $msg = $this->unhtmlentities( _('The Director indicated by the Trade Office Registry Extract, has to underwrite the correctness of the information for the organisation and allowance of certificate operations by the administrators.') ); $msg .= "\r\nFor formal contact with the organisation the email address of the organisation is required."; // put hint on comparing names on title table $this->myLink($this->lMargin-7, $tSide-7, 5, 5, $msg, array('subtype'=> 'Text', 'Open' => true, 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On director's statement"))); + 't'=> $this->unhtmlentities( _("On director's statement") ))); - $cellcnt += $this->PrintTicked( _("Make sure you have read and agreed with the CAcert Community Agreement "), false /* no tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _("Make sure you have read and agreed with the CAcert Community Agreement") ), false /* no tick */); if( !BW ) $this->SetTextColor(17, 86, 140); $this->SetXY($this->lMargin+2,$this->GetY()-0.5); - $ret = $this->Write($this->lasth, CCA, NULL); - $this->myLink($this->lMargin+1, $this->GetY()-F_SIZE/2.9, $this->colwidth-2, F_SIZE*2.9/2.9, CCA); + $ret = $this->Write($this->lasth, WEB."/".POLICY.CCA.EXT, NULL); + $this->myLink($this->lMargin+1, $this->GetY()-F_SIZE/2.9, $this->colwidth-2, F_SIZE*2.9/2.9, WEB."/".POLICY.CCA.EXT); $this->Ln(4); if( !BW ) $this->SetTextColor(0); $this->Ln(0.3); - $this->PrintName(_("Name and contact details (organisation email address & optionally phone number), of the Director of the organisation as is referred to in the trade office extract."), - _("Director"), "OrganisationDirector", $organisation['director'], + $this->PrintName($this->unhtmlentities( _('Name and contact details (organisation email address & optionally phone number), of the Director of the organisation as is referred to in the trade office extract.') ), + $this->unhtmlentities( _('Director') ), "OrganisationDirector", $organisation['director'], $organisation['email']?$organisation['email'] : "email:", $organisation['phone']? $organisation['phone']:" "); - $cellcnt += $this->PrintTicked( _("I agree to the CAcert Community Agreement."), true /* tick */); - $cellcnt += $this->PrintTicked( _("I hereby confirm that all information is complete and accurate and will notify CAcert of any updates or changes thereof."), true /* tick */); - $cellcnt += $this->PrintTicked( _("I am duly authorised to act on behalf of the organisation, I grant operational certificate administrative privileges to the specified Organisation Administrator and, I request the Organisation Assurer to verify the organisation information according to the Assurance Policies."), true /* tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I agree to the CAcert Community Agreement.') ), true /* tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I hereby confirm that all information is complete and accurate and will notify CAcert of any updates or changes thereof.') ), true /* tick */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I am duly authorised to act on behalf of the organisation, I grant operational certificate administrative privileges to the specified Organisation Administrator and, I request the Organisation Assurer to verify the organisation information according to the Assurance Policies.') ), true /* tick */); $this->Ln(0.5); $savey = $this->GetY(); - $strg = _("Date"); + $strg = $this->unhtmlentities( _('Date') ); if($organisation['date'] == "") - $strg .= " (". _("yyyy-mm-dd") . ")"; + $strg .= " (". $this->unhtmlentities( _("yyyy-mm-dd") ). ")"; $strg = $strg; $this->PrintDate( $this->lMargin+1, $savey+1, $strg, $organisation['date'], 'OrganisationDate', 'L'); - $strg = _("Signature and organisation stamp"); + $strg = $this->unhtmlentities( _('Signature and organisation stamp') ); $this->SetFont(FONT, '', F_SIZE); $l = $this->GetStringWidth( $strg ); $this->SetXY($this->lMargin+$this->colwidth-$l-3, $savey+1); @@ -1238,37 +1348,37 @@ class COAPPDF extends TCPDF { $TextProps = array('strokeColor'=> LLBLUE, 'value' => "", 'fillColor'=> LBLUE, 'doNotScrole'=> 'true', 'textSize' => '14', 'rotate'=>0); $cellcnt = 0; - $tSide = $this->PrintTable(_("Organisation Assurer's Statement")); // mark table ordinate + $tSide = $this->PrintTable($this->unhtmlentities( _("Organisation Assurer's Statement") )); // mark table ordinate // put assurer help for assurance in pdf file for mouse over - $msg = _("The organisation assurer will check the trade office registry for company information (name, location, country of jurisdiction, director names, trade office Identification number, domain name ownership, and system admin reference). Any associated costs for this research will be reimborsed by the assurer from the organisation."); + $msg = $this->unhtmlentities( _('The organisation assurer will check the trade office registry for company information (name, location, country of jurisdiction, director names, trade office Identification number, domain name ownership, and system admin reference). Any associated costs for this research will be reimborsed by the assurer from the organisation.') ); $this->myLink($this->lMargin-7, $tSide-6, 5, 5, $msg, array('subtype'=> 'Text', 'Open' => true, 'c'=> array(173,197,215), 'name'=> 'Comment', 'f'=> array( 'nozoom', 'readonly', 'norotate'), - 't'=> _("On mutual assurance"))); + 't'=> $this->unhtmlentities( _('On mutual assurance') ))); // assurer identity info $this->Ln(0.9); $this->PrintName( - _("The Organisation Assurer contact information. This assurer will verify the organisation identity and registration information."), - _("Organisation Assurer") . " ","Assurer", + $this->unhtmlentities( _('The Organisation Assurer contact information. This assurer will verify the organisation identity and registration information.') ), + $this->unhtmlentities( _('Organisation Assurer') ) . " ","Assurer", $assurer['name'], $assurer['email']? $assurer['email']:" ", $assurer['phone']? $assurer['phone']:" "); // assurer statements $this->SetY($this->GetY()-0.5); - $cellcnt += $this->PrintTicked( _("I, the Assurer, hereby confirm that I have verified the official Information for the organisation, I will witness the organisation's identity in the CAcert Organisation Assurance Programme, and complete the Assurance."), true /* ticked */); - $cellcnt += $this->PrintTicked( _("I am a CAcert Community Member, have passed the Organisation Assurance Challenge, and have been appointed for Organisation Assurances within the country where the organisation is registered."), true /* ticked */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _("I, the Assurer, hereby confirm that I have verified the official Information for the organisation, I will witness the organisation's identity in the CAcert Organisation Assurance Programme, and complete the Assurance.") ), true /* ticked */); + $cellcnt += $this->PrintTicked( $this->unhtmlentities( _('I am a CAcert Community Member, have passed the Organisation Assurance Challenge, and have been appointed for Organisation Assurances within the country where the organisation is registered.') ), true /* ticked */); $this->Ln(1); $savey = $this->GetY(); - $strg = _("Date"); - if( $assurer['date'] == "" ) $strg .= " (" . _("yyyy-mm-dd") . ")"; + $strg = $this->unhtmlentities( _('Date') ); + if( $assurer['date'] == "" ) $strg .= " (" . $this->unhtmlentities( _("yyyy-mm-dd") ).")"; $strg = $strg; $this->PrintDate( $this->lMargin+1, $savey, $strg, $assurer['date'], 'AssurerDate', 'L'); $this->SetXY($this->lMargin+1, $savey); $this->SetFont(FONT, "",F_SIZE); - $strg = _("Organisation Assurer's signature"); + $strg = $this->unhtmlentities( _("Organisation Assurer's signature") ); $this->SetXY($this->lMargin+$this->colwidth-$this->GetStringWidth($strg)-3, $savey); $this->Write(0, $strg ); $savey = $this->GetY()+7; // leave room for date and signature @@ -1281,40 +1391,6 @@ class COAPPDF extends TCPDF { $this->SetY($next); } -// print copy right on bottumn of page -/*public*/ function PrintFooter( $msg = NULL ) { - $this->InFooter = true; - $this->SetFont(FONT,'', F_SIZE-1); - if( $this->GetGroupPageNo() > 0 ) { - $this->SetXY($this->lMargin, $this->GetPageHeight()/$this->scale*100.0-6); - $this->Cell($this->colwidth, 3, - sprintf("%s %d/%d", _("page"), $this->GetGroupPageNo()+1, - $this->GetNumPages()), 0, 0, 'C'); - } - if( $msg == NULL ) return; - $strg = "© ". date("Y"). " CAcert Inc.". $msg; - $this->SetXY($this->lMargin+MARGIN/2, $this->GetPageHeight()/$this->scale*100.0-6); - $this->Cell($this->colwidth, 3, $strg, 0, 0, 'R'); - - if( $this->Watermark != "" ) { - $this->StartTransform(); - $savex = $this->GetX(); $savey = $this->GetY(); - $this->SetFont(FONT,'', F_SIZE*7); - $l = $this->GetStringWidth($this->Watermark); - $h = $this->GetPageHeight()/$this->scale*100.0/2; - $w = $this->colwidth/2+MARGIN; - $this->SetXY(0,0); - $this->TranslateY($h+(F_SIZE*7)/2.9); - $this->TranslateX($w-MARGIN+$this->lMargin); - $this->Rotate(rad2deg(atan($h/$w))); - $this->Text(-$l/2,0,$this->Watermark, 0.8); - $this->StopTransform(); - $this->SetXY($savex,$savey); - } - - $this->InFooter = false; - } - // End of CAPPDF TCPDF class extension } @@ -1338,7 +1414,8 @@ function GET( $key = "" ) { } // form, CCA and page format info - $page['format'] = strtolower(GET('format')); // A3, A4, A5, letter, legal + $page['format'] = strtolower(GET('format')); // A3, A4, A5, letter, legal, etc. + if( !$page['format'] ) $page['format'] = 'a4'; // default a4, portrait // on landscape orientation we do two half pages $page['orientation'] = strtolower(GET('orientation')); if( $page['orientation'] != 'l' AND $page['orientation'] != "landscape" ) { @@ -1346,7 +1423,10 @@ function GET( $key = "" ) { } $page['form'] = GET('noform') != "" ? false : true; // dft is now true it should go to true - $page['cca'] = GET('nocca') != ""? true : false; + $page['policies'] = array(); + if( GET('nocca') == "" ) { + if( defined('CCA') ) $page['policies'][] = CCA; + } // set $page['form'] on 'simplex' or 'duplex' to get CCA on pdf page // Assurer info @@ -1438,7 +1518,13 @@ if( $domains ) { // csv list to array and trim white spaces } else $organisation['domains'][0] = " "; unset($domains); - +// try to get policy documents names to be printed off +$j = 0; // after two successive empty name we stop searching +for( $i = 1; $i <= 9 AND $j<2; $i++ ) { + $name = GET(sprintf("policy%d", $i)); + if( $name != "" ) { $page['policies'][] = $name; $j = 0; } + else $j++; +} if( $utf8 ) { // have scanned arguments for non-ascii code now //require_once("../utf8/native/core.php"); @@ -1470,30 +1556,18 @@ unset( $i ); unset( $j); unset( $utf8 ); // unset($_GET); // set document property information $pdf->SetCreator("LibreSSL - CAcert web application"); $pdf->SetAuthor("© " . date("Y") . " CAcert Inc., Australia."); - $pdf->SetKeywords("X.509, Certificate Programme, COAP form"); - $pdf->SetTitle("CAcert Organisation Assurance Programme form"); + $pdf->SetKeywords("X.509, Organisation Assurance Programme, COAP form, digital certificates, CAcert, Community Agreement"); + $pdf->SetTitle("CAcert Organisation Assurance Programme"); $pdf->SetSubject("COAP form V".$pdf->Version().", generated " . date("Y-n-j H:i:s T")); if( GET('watermark') != '') $pdf->Watermark = my_recode(GET('watermark')); // requires zlib and will decrease response time but increase bandwidth // if no zlib is found, automatically no compression is done $pdf->SetCompression(true); // turn it off when more pperformance is needed -// set default header data - //$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING); -// set header and footer fonts - //$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); - //$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); // AddSJISFont function is not present in tcpdf package !!!! -// set default header data - //$pdf->SetHeaderData(PDF_HEADER_LOGO, PDF_HEADER_LOGO_WIDTH, PDF_HEADER_TITLE, PDF_HEADER_STRING); - -// set header and footer fonts - //$pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); - //$pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); - //set auto page breaks - $pdf->SetAutoPageBreak(TRUE, /* 4 */ MARGIN/2); + $pdf->SetAutoPageBreak(TRUE, MARGIN*0.707); //set image scale factor $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); @@ -1506,7 +1580,7 @@ unset( $i ); unset( $j); unset( $utf8 ); // unset($_GET); // AND GENERATE THE FORM =================================== // generation properties which have been set from environment: - // BW (color), FONT (free Sans Vera), orientation (landscape, 2-up), format (A4) + // BW (color), FONT (free Sans Vera), orientation (portrait, 1-up), format (A4) if ( FONT == 'SJIS') $pdf->AddSJISFont(); $pdf->PrintForm($organisation, $registry, $assurer, $page); $pdf->setViewerPreferences($pdf->ViewerPrefs);