[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_5, updated. RELEASE_3_5_0BETA1-277-g68490d6 - Git

29 Jan 2012

The branch, QA_3_5 has been updated
       via  68490d6ec434bef252b9a096bb84314ebcc11439 (commit)
       via  478169d63ef333c0e7e2af4747eedc546135bf0a (commit)
       via  b04586ea4274a69d2058f4162675f3b5aa012bb9 (commit)
       via  6072137cddb683349ca038cacec5b70910809ad8 (commit)
       via  6d58b78a322a8a0fecd5c914d04cb4402cdab910 (commit)
      from  28779212196686f44650e362ec0fcfbb23140288 (commit)
- Log -----------------------------------------------------------------
commit 68490d6ec434bef252b9a096bb84314ebcc11439
Merge: 2877921 478169d
Author: Madhura Jayaratne madhura.cj@gmail.com
Date:   Sun Jan 29 21:51:20 2012 +0530
Merge branch 'QA_3_4' into QA_3_5
Conflicts:
    	libraries/tcpdf/README.TXT
    	libraries/tcpdf/encodings_maps.php
    	libraries/tcpdf/fonts/dejavu-fonts-ttf-2.33/LICENSE
    	libraries/tcpdf/fonts/dejavuserif.ctg.z
    	libraries/tcpdf/fonts/dejavuserif.php
    	libraries/tcpdf/fonts/dejavuserif.z
    	libraries/tcpdf/fonts/dejavuserifb.ctg.z
    	libraries/tcpdf/fonts/dejavuserifb.php
    	libraries/tcpdf/fonts/dejavuserifb.z
    	libraries/tcpdf/tcpdf.php
    	libraries/tcpdf/unicode_data.php
-----------------------------------------------------------------------
Summary of changes:
 libraries/tcpdf/LICENSE.TXT             |    4 +---
 libraries/tcpdf/README.TXT              |   30 ++++++++++++++++++------------
 libraries/tcpdf/config/tcpdf_config.php |   28 +++++++++++++++++++---------
 libraries/tcpdf/encodings_maps.php      |    4 ++--
 libraries/tcpdf/htmlcolors.php          |    4 ++--
 libraries/tcpdf/tcpdf.php               |   23 +++++++++++------------
 libraries/tcpdf/unicode_data.php        |    4 ++--
 7 files changed, 55 insertions(+), 42 deletions(-)

diff --git a/libraries/tcpdf/LICENSE.TXT b/libraries/tcpdf/LICENSE.TXT
index 26adda0..daf21f7 100644
--- a/libraries/tcpdf/LICENSE.TXT
+++ b/libraries/tcpdf/LICENSE.TXT
@@ -5,9 +5,7 @@
   TCPDF is free software: you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version. Additionally, 
-  YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE 
-  GENERATED PDF DOCUMENTS.
+  License, or (at your option) any later version.
**********************************************************************
 **********************************************************************
diff --git a/libraries/tcpdf/README.TXT b/libraries/tcpdf/README.TXT
index 3e9acc3..f78081f 100644
--- a/libraries/tcpdf/README.TXT
+++ b/libraries/tcpdf/README.TXT
@@ -8,16 +8,16 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
Name: TCPDF
-Version: 5.9.141
-Release date: 2011-12-14
+Version: 5.9.145
+Release date: 2012-01-28
 Author:	Nicola Asuni
-Copyright (c) 2002-2011:
+Copyright (c) 2002-2012:
    Nicola Asuni
-	Tecnick.com s.r.l.
-	Via Della Pace, 11
-	09044 Quartucciu (CA)
-	ITALY
+	Tecnick.com LTD
+	Manor Coach House, Church Hill
+	Aldershot, Hants, GU12 4RQ
+	UK
    www.tecnick.com
URLs:
@@ -64,18 +64,16 @@ Installation (full instructions on http:  www.tcpdf.org):
 Source Code Documentation:
    http://www.tcpdf.org
-For Additional Documentation:
+Additional Documentation:
    http://www.tcpdf.org
License
-	Copyright (C) 2002-2011  Nicola Asuni - Tecnick.com S.r.l.
+	Copyright (C) 2002-2012  Nicola Asuni - Tecnick.com LTD
TCPDF is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as
    published by the Free Software Foundation, either version 3 of the
-	License, or (at your option) any later version. Additionally,
-	YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE
-	GENERATED PDF DOCUMENTS.
+	License, or (at your option) any later version.
TCPDF is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -88,4 +86,12 @@ License
See LICENSE.TXT file for more information.
+Third party fonts
+	This library includes third party font files released with different licenses.
+	These fonts are not required by TCPDF but have been included as you convenience.
+	The original TTF font files have been renamed for compatibility with TCPDF and compressed using the gzcompress PHP function that uses the ZLIB data format (.z files).
+	To get the original distribution archives please check the information on fonts subfolders:
+	 - DejaVu fonts 2.33 (Bitstream) - Copyright, License and other info: fonts/dejavu-fonts-ttf-2.33
+	 - GNU FreeFont (GNU-GPLv3) - Copyright, License and other info: fonts/freefont-20100919
+	
 ============================================================
diff --git a/libraries/tcpdf/config/tcpdf_config.php b/libraries/tcpdf/config/tcpdf_config.php
index 811145f..e3b3e4a 100644
--- a/libraries/tcpdf/config/tcpdf_config.php
+++ b/libraries/tcpdf/config/tcpdf_config.php
@@ -5,17 +5,27 @@
 // Last Update : 2011-04-15
 //
 // Description : Configuration file for TCPDF.
+// Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
+// License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
+// -------------------------------------------------------------------
+// Copyright (C) 2004-2012  Nicola Asuni - Tecnick.com LTD
 //
-// Author: Nicola Asuni
+// This file is part of TCPDF software library.
 //
-// (c) Copyright:
-//               Nicola Asuni
-//               Tecnick.com s.r.l.
-//               Via Della Pace, 11
-//               09044 Quartucciu (CA)
-//               ITALY
-//               www.tecnick.com
-//               info@tecnick.com
+// TCPDF is free software: you can redistribute it and/or modify it
+// under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// TCPDF is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with TCPDF.  If not, see http://www.gnu.org/licenses/.
+//
+// See LICENSE.TXT file for more information.
 //============================================================+
/**
diff --git a/libraries/tcpdf/encodings_maps.php b/libraries/tcpdf/encodings_maps.php
index 3d8543b..414f8b6 100644
--- a/libraries/tcpdf/encodings_maps.php
+++ b/libraries/tcpdf/encodings_maps.php
@@ -4,10 +4,10 @@
 // Version     : 1.0.001
 // Begin       : 2011-10-01
 // Last Update : 2011-11-15
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
+// Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2008-2011  Nicola Asuni - Tecnick.com S.r.l.
+// Copyright (C) 2008-2012  Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
diff --git a/libraries/tcpdf/htmlcolors.php b/libraries/tcpdf/htmlcolors.php
index d1075dd..e1a58b5 100644
--- a/libraries/tcpdf/htmlcolors.php
+++ b/libraries/tcpdf/htmlcolors.php
@@ -4,10 +4,10 @@
 // Version     : 1.0.008
 // Begin       : 2002-04-09
 // Last Update : 2010-12-16
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
+// Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2010  Nicola Asuni - Tecnick.com S.r.l.
+// Copyright (C) 2002-2012  Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
diff --git a/libraries/tcpdf/tcpdf.php b/libraries/tcpdf/tcpdf.php
index 17a9a20..7ce0329 100644
--- a/libraries/tcpdf/tcpdf.php
+++ b/libraries/tcpdf/tcpdf.php
@@ -1,21 +1,20 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 5.9.141
+// Version     : 5.9.145
 // Begin       : 2002-08-03
-// Last Update : 2011-12-14
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
-// License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
+// Last Update : 2012-01-28
+// Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
+// License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
 // -------------------------------------------------------------------
+// Copyright (C) 2002-2012 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
 // TCPDF is free software: you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License as
 // published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version. Additionally,
-// YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE
-// GENERATED PDF DOCUMENTS.
+// License, or (at your option) any later version.
 //
 // TCPDF is distributed in the hope that it will be useful, but
 // WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -138,7 +137,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 5.9.141
+ * @version 5.9.145
  */
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@@ -150,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 5.9.141
+ * @version 5.9.145
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
@@ -161,7 +160,7 @@ class TCPDF {
     * Current TCPDF version.
     * @private
     */
-	private $tcpdf_version = '5.9.141';
+	private $tcpdf_version = '5.9.145';
// Protected properties
@@ -12286,7 +12285,7 @@ class TCPDF {
    	$docdate = $this->_escapeXML($docdate);
    	$xmp .= "\t\t".'<rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/%22%3E%27.%22%5Cn";
    	$xmp .= "\t\t\t".'xmp:CreateDate'.$docdate.'</xmp:CreateDate>'."\n";
-		$xmp .= "\t\t\t".'xmp:CreatorToolTCPDF</xmp:CreatorTool>'."\n";
+		$xmp .= "\t\t\t".'xmp:CreatorTool'.$this->creator.'</xmp:CreatorTool>'."\n";
    	$xmp .= "\t\t\t".'xmp:ModifyDate'.$docdate.'</xmp:ModifyDate>'."\n";
    	$xmp .= "\t\t\t".'xmp:MetadataDate'.$docdate.'</xmp:MetadataDate>'."\n";
    	$xmp .= "\t\t".'</rdf:Description>'."\n";
@@ -14092,7 +14091,7 @@ class TCPDF {
    			fwrite($f, $envelope, $envelope_length);
    			fclose($f);
    			$tempencfile = tempnam(K_PATH_CACHE, 'tmpenc_');
-				if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_DETACHED | PKCS7_BINARY)) {
+				if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) {
    				$this->Error('Unable to encrypt the file: '.$tempkeyfile);
    			}
    			unlink($tempkeyfile);
diff --git a/libraries/tcpdf/unicode_data.php b/libraries/tcpdf/unicode_data.php
index c05cb94..936f4fe 100644
--- a/libraries/tcpdf/unicode_data.php
+++ b/libraries/tcpdf/unicode_data.php
@@ -4,10 +4,10 @@
 // Version     : 1.0.009
 // Begin       : 2008-01-01
 // Last Update : 2011-10-01
-// Author      : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
+// Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2008-2011  Nicola Asuni - Tecnick.com S.r.l.
+// Copyright (C) 2008-2012  Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
hooks/post-receive
-- 
phpMyAdmin


    