diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 42c9031..d23f0ed 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.018 (2013-05-19) + - The barcode examples were changed to automatically search for the barcode class path (in case the examples directory is not installed under the TCPDF root). + 6.0.017 (2013-05-16) - The command line tool tcpdf_addfont.php was improved. - The php logic was removed from configuration files that now contains only constant defines. diff --git a/README.TXT b/README.TXT index b6d1fff..614a68c 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.017 -Release date: 2013-05-16 +Version: 6.0.018 +Release date: 2013-05-19 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index fc1b4a3..e827cb2 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.017", + "version": "6.0.018", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/examples/barcodes/example_1d_html.php b/examples/barcodes/example_1d_html.php index 26a922d..2a3bbb0 100644 --- a/examples/barcodes/example_1d_html.php +++ b/examples/barcodes/example_1d_html.php @@ -3,7 +3,7 @@ // File name : example_1d_html.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -27,20 +27,20 @@ // See LICENSE.TXT file for more information. // ------------------------------------------------------------------- // -// Description : Example for tcpdf_barcodes_1d.php class +// Description : Example for tcpdf_barcodes_2d.php class // //============================================================+ /** * @file - * Example for tcpdf_barcodes_1d.php class + * Example for tcpdf_barcodes_2d.php class * @package com.tecnick.tcpdf * @author Nicola Asuni * @version 1.0.000 */ -// include 1D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_1d.php'); +// include 1D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_1d_include.php'); // set the barcode content and type $barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128'); diff --git a/examples/barcodes/example_1d_png.php b/examples/barcodes/example_1d_png.php index 8154a3e..a82433e 100644 --- a/examples/barcodes/example_1d_png.php +++ b/examples/barcodes/example_1d_png.php @@ -3,7 +3,7 @@ // File name : example_1d_png.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -27,20 +27,20 @@ // See LICENSE.TXT file for more information. // ------------------------------------------------------------------- // -// Description : Example for tcpdf_barcodes_1d.php class +// Description : Example for tcpdf_barcodes_2d.php class // //============================================================+ /** * @file - * Example for tcpdf_barcodes_1d.php class + * Example for tcpdf_barcodes_2d.php class * @package com.tecnick.tcpdf * @author Nicola Asuni * @version 1.0.000 */ -// include 1D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_1d.php'); +// include 1D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_1d_include.php'); // set the barcode content and type $barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128'); diff --git a/examples/barcodes/example_1d_svg.php b/examples/barcodes/example_1d_svg.php index f0be735..fa6de4f 100644 --- a/examples/barcodes/example_1d_svg.php +++ b/examples/barcodes/example_1d_svg.php @@ -3,7 +3,7 @@ // File name : example_1d_svg.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -27,20 +27,20 @@ // See LICENSE.TXT file for more information. // ------------------------------------------------------------------- // -// Description : Example for tcpdf_barcodes_1d.php class +// Description : Example for tcpdf_barcodes_2d.php class // //============================================================+ /** * @file - * Example for tcpdf_barcodes_1d.php class + * Example for tcpdf_barcodes_2d.php class * @package com.tecnick.tcpdf * @author Nicola Asuni * @version 1.0.000 */ -// include 1D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_1d.php'); +// include 1D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_1d_include.php'); // set the barcode content and type $barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128'); diff --git a/examples/barcodes/example_1d_svgi.php b/examples/barcodes/example_1d_svgi.php index 7552538..3c7471b 100644 --- a/examples/barcodes/example_1d_svgi.php +++ b/examples/barcodes/example_1d_svgi.php @@ -3,7 +3,7 @@ // File name : example_1d_svgi.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -27,20 +27,20 @@ // See LICENSE.TXT file for more information. // ------------------------------------------------------------------- // -// Description : Example for tcpdf_barcodes_1d.php class +// Description : Example for tcpdf_barcodes_2d.php class // //============================================================+ /** * @file - * Example for tcpdf_barcodes_1d.php class + * Example for tcpdf_barcodes_2d.php class * @package com.tecnick.tcpdf * @author Nicola Asuni * @version 1.0.000 */ -// include 1D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_1d.php'); +// include 1D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_1d_include.php'); // set the barcode content and type $barcodeobj = new TCPDFBarcode('http://www.tcpdf.org', 'C128'); diff --git a/examples/barcodes/example_2d_datamatrix_html.php b/examples/barcodes/example_2d_datamatrix_html.php index f2480da..d6bfba2 100644 --- a/examples/barcodes/example_2d_datamatrix_html.php +++ b/examples/barcodes/example_2d_datamatrix_html.php @@ -3,7 +3,7 @@ // File name : example_2d_html.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX'); diff --git a/examples/barcodes/example_2d_datamatrix_png.php b/examples/barcodes/example_2d_datamatrix_png.php index 52d555b..0eeea73 100644 --- a/examples/barcodes/example_2d_datamatrix_png.php +++ b/examples/barcodes/example_2d_datamatrix_png.php @@ -3,7 +3,7 @@ // File name : example_2d_png.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX'); diff --git a/examples/barcodes/example_2d_datamatrix_svg.php b/examples/barcodes/example_2d_datamatrix_svg.php index 54c867e..2032075 100644 --- a/examples/barcodes/example_2d_datamatrix_svg.php +++ b/examples/barcodes/example_2d_datamatrix_svg.php @@ -3,7 +3,7 @@ // File name : example_2d_svg.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX'); diff --git a/examples/barcodes/example_2d_datamatrix_svgi.php b/examples/barcodes/example_2d_datamatrix_svgi.php index bc2804f..3003bba 100644 --- a/examples/barcodes/example_2d_datamatrix_svgi.php +++ b/examples/barcodes/example_2d_datamatrix_svgi.php @@ -3,7 +3,7 @@ // File name : example_2d_svgi.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'DATAMATRIX'); diff --git a/examples/barcodes/example_2d_pdf417_html.php b/examples/barcodes/example_2d_pdf417_html.php index 917eb98..f51bea9 100644 --- a/examples/barcodes/example_2d_pdf417_html.php +++ b/examples/barcodes/example_2d_pdf417_html.php @@ -3,7 +3,7 @@ // File name : example_2d_html.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417'); diff --git a/examples/barcodes/example_2d_pdf417_png.php b/examples/barcodes/example_2d_pdf417_png.php index f7aa11a..3d260af 100644 --- a/examples/barcodes/example_2d_pdf417_png.php +++ b/examples/barcodes/example_2d_pdf417_png.php @@ -3,7 +3,7 @@ // File name : example_2d_png.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417'); diff --git a/examples/barcodes/example_2d_pdf417_svg.php b/examples/barcodes/example_2d_pdf417_svg.php index 2f7e3fb..c449f20 100644 --- a/examples/barcodes/example_2d_pdf417_svg.php +++ b/examples/barcodes/example_2d_pdf417_svg.php @@ -3,7 +3,7 @@ // File name : example_2d_svg.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417'); diff --git a/examples/barcodes/example_2d_pdf417_svgi.php b/examples/barcodes/example_2d_pdf417_svgi.php index c4fb305..103b90b 100644 --- a/examples/barcodes/example_2d_pdf417_svgi.php +++ b/examples/barcodes/example_2d_pdf417_svgi.php @@ -3,7 +3,7 @@ // File name : example_2d_svgi.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'PDF417'); diff --git a/examples/barcodes/example_2d_qrcode_html.php b/examples/barcodes/example_2d_qrcode_html.php index c384e89..7455fe8 100644 --- a/examples/barcodes/example_2d_qrcode_html.php +++ b/examples/barcodes/example_2d_qrcode_html.php @@ -3,7 +3,7 @@ // File name : example_2d_html.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H'); diff --git a/examples/barcodes/example_2d_qrcode_png.php b/examples/barcodes/example_2d_qrcode_png.php index 6ed1187..570adf2 100644 --- a/examples/barcodes/example_2d_qrcode_png.php +++ b/examples/barcodes/example_2d_qrcode_png.php @@ -3,7 +3,7 @@ // File name : example_2d_png.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H'); diff --git a/examples/barcodes/example_2d_qrcode_svg.php b/examples/barcodes/example_2d_qrcode_svg.php index 0630a6e..be02b77 100644 --- a/examples/barcodes/example_2d_qrcode_svg.php +++ b/examples/barcodes/example_2d_qrcode_svg.php @@ -3,7 +3,7 @@ // File name : example_2d_svg.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H'); diff --git a/examples/barcodes/example_2d_qrcode_svgi.php b/examples/barcodes/example_2d_qrcode_svgi.php index 5863ad6..67032f5 100644 --- a/examples/barcodes/example_2d_qrcode_svgi.php +++ b/examples/barcodes/example_2d_qrcode_svgi.php @@ -3,7 +3,7 @@ // File name : example_2d_svgi.php // Version : 1.0.000 // Begin : 2011-07-21 -// Last Update : 2013-03-17 +// Last Update : 2013-03-19 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -39,8 +39,8 @@ * @version 1.0.009 */ -// include 2D barcode class -require_once(dirname(__FILE__).'/../../tcpdf_barcodes_2d.php'); +// include 2D barcode class (search for installation path) +require_once(__DIR__.'/tcpdf_barcodes_2d_include.php'); // set the barcode content and type $barcodeobj = new TCPDF2DBarcode('http://www.tcpdf.org', 'QRCODE,H'); diff --git a/examples/barcodes/tcpdf_barcodes_1d_include.php b/examples/barcodes/tcpdf_barcodes_1d_include.php new file mode 100644 index 0000000..5e8b7fb --- /dev/null +++ b/examples/barcodes/tcpdf_barcodes_1d_include.php @@ -0,0 +1,37 @@ + * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.017 + * @version 6.0.018 */ // TCPDF configuration @@ -163,7 +163,7 @@ require_once(__DIR__.'/include/tcpdf_static.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.
* @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 6.0.017 + * @version 6.0.018 * @author Nicola Asuni - info@tecnick.com */ class TCPDF {