mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-25 22:07:33 +00:00
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. - The tcpdf_autoconfig.php file was added to automatically set missing configuration values.
This commit is contained in:
parent
36e9a19bfb
commit
bb21d56f94
@ -1,3 +1,8 @@
|
||||
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.
|
||||
- The tcpdf_autoconfig.php file was added to automatically set missing configuration values.
|
||||
|
||||
6.0.016 (2013-05-15)
|
||||
- The tcpdf_addfont.php tool was improved (thanks to Remi Collet).
|
||||
- Constant K_PATH_IMAGES is now automatically set in configuration file.
|
||||
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 6.0.016
|
||||
Release date: 2013-05-15
|
||||
Version: 6.0.017
|
||||
Release date: 2013-05-16
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2013:
|
||||
@ -18,8 +18,8 @@ Copyright (c) 2002-2013:
|
||||
www.tecnick.com
|
||||
|
||||
URLs:
|
||||
http: www.tcpdf.org
|
||||
http: www.sourceforge.net/projects/tcpdf
|
||||
http://www.tcpdf.org
|
||||
http://www.sourceforge.net/projects/tcpdf
|
||||
|
||||
Description:
|
||||
TCPDF is a PHP class for generating PDF files on-the-fly without requiring external extensions.
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tecnick.com/tcpdf",
|
||||
"version": "6.0.016",
|
||||
"version": "6.0.017",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"type": "library",
|
||||
"description": "TCPDF is a PHP class for generating PDF documents.",
|
||||
|
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf_config.php
|
||||
// Begin : 2004-06-11
|
||||
// Last Update : 2013-05-15
|
||||
// Last Update : 2013-05-16
|
||||
//
|
||||
// Description : Configuration file for TCPDF.
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
@ -38,255 +38,181 @@
|
||||
|
||||
// If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
|
||||
|
||||
if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
|
||||
|
||||
// DOCUMENT_ROOT fix for IIS Webserver
|
||||
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
|
||||
if(isset($_SERVER['SCRIPT_FILENAME'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} else {
|
||||
// define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
|
||||
$_SERVER['DOCUMENT_ROOT'] = '/';
|
||||
}
|
||||
}
|
||||
// be sure that the end slash is present
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT'].'/');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_MAIN constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_MAIN constant below for better performances.
|
||||
$tcpdf_install_dirs = array();
|
||||
if ((strpos(dirname(__FILE__), '/config') !== false) OR (strpos(dirname(__FILE__), '\config') !== false)) {
|
||||
// default config file
|
||||
$k_path_main_default = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('config'))));
|
||||
if (substr($k_path_main_default, -1) != '/') {
|
||||
$k_path_main_default .= '/';
|
||||
}
|
||||
$tcpdf_install_dirs[] = $k_path_main_default;
|
||||
}
|
||||
$tcpdf_install_dirs += array('/usr/share/php/tcpdf/', '/usr/share/tcpdf/', '/usr/share/php-tcpdf/', '/var/www/tcpdf/', '/var/www/html/tcpdf/', '/usr/local/apache2/htdocs/tcpdf/');
|
||||
foreach ($tcpdf_install_dirs as $k_path_main) {
|
||||
if (file_exists($k_path_main.'tcpdf.php')) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!file_exists($k_path_main)) {
|
||||
die('TCPDF ERROR: please set the correct path to TCPDF on the configuration file');
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
/**
|
||||
* Installation path (/var/www/tcpdf/).
|
||||
* By default it is automatically calculated but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_MAIN', $k_path_main);
|
||||
//define ('K_PATH_MAIN', '');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_URL constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_URL constant below for better performances.
|
||||
$k_path_url = $k_path_main; // default value for console mode
|
||||
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
|
||||
if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
|
||||
$k_path_url = 'https://';
|
||||
} else {
|
||||
$k_path_url = 'http://';
|
||||
}
|
||||
$k_path_url .= $_SERVER['HTTP_HOST'];
|
||||
$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
/**
|
||||
* URL path to tcpdf installation folder (http://localhost/tcpdf/).
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_URL', $k_path_url);
|
||||
//define ('K_PATH_URL', '');
|
||||
|
||||
/**
|
||||
* Cache directory for temporary files (full path).
|
||||
*/
|
||||
define ('K_PATH_CACHE', sys_get_temp_dir().'/');
|
||||
|
||||
/**
|
||||
/**
|
||||
* Path for PDF fonts.
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
|
||||
//define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_IMAGES constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_IMAGES constant below for better performances.
|
||||
$tcpdf_images_dirs = array(K_PATH_MAIN.'examples/images/', '/usr/share/doc/tcpdf/examples/images/', '/usr/share/doc/php-tcpdf/examples/images/', '/usr/share/doc/php/tcpdf/examples/images/', '/var/www/tcpdf/images/', '/var/www/html/tcpdf/images/', '/usr/local/apache2/htdocs/tcpdf/images/', K_PATH_MAIN);
|
||||
foreach ($tcpdf_images_dirs as $tcpdf_images_path) {
|
||||
if (file_exists($tcpdf_images_path)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default images directory.
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_IMAGES', $tcpdf_images_path);
|
||||
//define ('K_PATH_IMAGES', '');
|
||||
|
||||
/**
|
||||
* Blank image.
|
||||
*/
|
||||
define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
|
||||
|
||||
/**
|
||||
* Page format.
|
||||
*/
|
||||
define ('PDF_PAGE_FORMAT', 'A4');
|
||||
|
||||
/**
|
||||
* Page orientation (P=portrait, L=landscape).
|
||||
*/
|
||||
define ('PDF_PAGE_ORIENTATION', 'P');
|
||||
|
||||
/**
|
||||
* Document creator.
|
||||
*/
|
||||
define ('PDF_CREATOR', 'TCPDF');
|
||||
|
||||
/**
|
||||
* Document author.
|
||||
*/
|
||||
define ('PDF_AUTHOR', 'TCPDF');
|
||||
|
||||
/**
|
||||
* Header title.
|
||||
*/
|
||||
define ('PDF_HEADER_TITLE', 'TCPDF Example');
|
||||
|
||||
/**
|
||||
* Header description string.
|
||||
*/
|
||||
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_IMAGES constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_IMAGES constant below for better performances.
|
||||
$tcpdf_header_logo = '';
|
||||
if (file_exists(K_PATH_IMAGES.'tcpdf_logo.jpg')) {
|
||||
$tcpdf_header_logo = 'tcpdf_logo.jpg';
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
/**
|
||||
* Deafult image logo used be the default Header() method.
|
||||
* Please set here your own logo or an empty string to disable it.
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO', $tcpdf_header_logo);
|
||||
//define ('PDF_HEADER_LOGO', '');
|
||||
|
||||
/**
|
||||
* Header logo image width [mm].
|
||||
/**
|
||||
* Header logo image width in user units.
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 30);
|
||||
//define ('PDF_HEADER_LOGO_WIDTH', 0);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Cache directory for temporary files (full path).
|
||||
*/
|
||||
define ('K_PATH_CACHE', sys_get_temp_dir().'/');
|
||||
|
||||
/**
|
||||
* Generic name for a blank image.
|
||||
*/
|
||||
define ('K_BLANK_IMAGE', '_blank.png');
|
||||
|
||||
/**
|
||||
* Page format.
|
||||
*/
|
||||
define ('PDF_PAGE_FORMAT', 'A4');
|
||||
|
||||
/**
|
||||
* Page orientation (P=portrait, L=landscape).
|
||||
*/
|
||||
define ('PDF_PAGE_ORIENTATION', 'P');
|
||||
|
||||
/**
|
||||
* Document creator.
|
||||
*/
|
||||
define ('PDF_CREATOR', 'TCPDF');
|
||||
|
||||
/**
|
||||
* Document author.
|
||||
*/
|
||||
define ('PDF_AUTHOR', 'TCPDF');
|
||||
|
||||
/**
|
||||
* Header title.
|
||||
*/
|
||||
define ('PDF_HEADER_TITLE', 'TCPDF Example');
|
||||
|
||||
/**
|
||||
* Header description string.
|
||||
*/
|
||||
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
|
||||
|
||||
/**
|
||||
* Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
|
||||
*/
|
||||
define ('PDF_UNIT', 'mm');
|
||||
define ('PDF_UNIT', 'mm');
|
||||
|
||||
/**
|
||||
/**
|
||||
* Header margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_HEADER', 5);
|
||||
define ('PDF_MARGIN_HEADER', 5);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Footer margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_FOOTER', 10);
|
||||
define ('PDF_MARGIN_FOOTER', 10);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Top margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_TOP', 27);
|
||||
define ('PDF_MARGIN_TOP', 27);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Bottom margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_BOTTOM', 25);
|
||||
define ('PDF_MARGIN_BOTTOM', 25);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Left margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_LEFT', 15);
|
||||
define ('PDF_MARGIN_LEFT', 15);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Right margin.
|
||||
*/
|
||||
define ('PDF_MARGIN_RIGHT', 15);
|
||||
define ('PDF_MARGIN_RIGHT', 15);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default main font name.
|
||||
*/
|
||||
define ('PDF_FONT_NAME_MAIN', 'helvetica');
|
||||
define ('PDF_FONT_NAME_MAIN', 'helvetica');
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default main font size.
|
||||
*/
|
||||
define ('PDF_FONT_SIZE_MAIN', 10);
|
||||
define ('PDF_FONT_SIZE_MAIN', 10);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default data font name.
|
||||
*/
|
||||
define ('PDF_FONT_NAME_DATA', 'helvetica');
|
||||
define ('PDF_FONT_NAME_DATA', 'helvetica');
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default data font size.
|
||||
*/
|
||||
define ('PDF_FONT_SIZE_DATA', 8);
|
||||
define ('PDF_FONT_SIZE_DATA', 8);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Default monospaced font name.
|
||||
*/
|
||||
define ('PDF_FONT_MONOSPACED', 'courier');
|
||||
define ('PDF_FONT_MONOSPACED', 'courier');
|
||||
|
||||
/**
|
||||
/**
|
||||
* Ratio used to adjust the conversion of pixels to user units.
|
||||
*/
|
||||
define ('PDF_IMAGE_SCALE_RATIO', 1.25);
|
||||
define ('PDF_IMAGE_SCALE_RATIO', 1.25);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Magnification factor for titles.
|
||||
*/
|
||||
define('HEAD_MAGNIFICATION', 1.1);
|
||||
define('HEAD_MAGNIFICATION', 1.1);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Height of cell respect font height.
|
||||
*/
|
||||
define('K_CELL_HEIGHT_RATIO', 1.25);
|
||||
define('K_CELL_HEIGHT_RATIO', 1.25);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Title magnification respect main font size.
|
||||
*/
|
||||
define('K_TITLE_MAGNIFICATION', 1.3);
|
||||
define('K_TITLE_MAGNIFICATION', 1.3);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Reduction factor for small font.
|
||||
*/
|
||||
define('K_SMALL_RATIO', 2/3);
|
||||
define('K_SMALL_RATIO', 2/3);
|
||||
|
||||
/**
|
||||
/**
|
||||
* Set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language.
|
||||
*/
|
||||
define('K_THAI_TOPCHARS', true);
|
||||
define('K_THAI_TOPCHARS', true);
|
||||
|
||||
/**
|
||||
/**
|
||||
* If true allows to call TCPDF methods using HTML syntax
|
||||
* IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
|
||||
*/
|
||||
define('K_TCPDF_CALLS_IN_HTML', true);
|
||||
define('K_TCPDF_CALLS_IN_HTML', true);
|
||||
|
||||
/**
|
||||
/**
|
||||
* If true adn PHP version is greater than 5, then the Error() method throw new exception instead of terminating the execution.
|
||||
*/
|
||||
define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
|
||||
}
|
||||
define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
|
||||
|
||||
//============================================================+
|
||||
// END OF FILE
|
||||
|
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf_config.php
|
||||
// Begin : 2004-06-11
|
||||
// Last Update : 2013-05-15
|
||||
// Last Update : 2013-05-16
|
||||
//
|
||||
// Description : Example of alternative configuration file for TCPDF.
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
@ -36,72 +36,45 @@
|
||||
* @since 2004-10-27
|
||||
*/
|
||||
|
||||
// Define the following constant to ignore the default configuration file.
|
||||
/**
|
||||
* Define the following constant to ignore the default configuration file.
|
||||
*/
|
||||
define ('K_TCPDF_EXTERNAL_CONFIG', true);
|
||||
|
||||
// DOCUMENT_ROOT fix for IIS Webserver
|
||||
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
|
||||
if(isset($_SERVER['SCRIPT_FILENAME'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} else {
|
||||
// define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
|
||||
$_SERVER['DOCUMENT_ROOT'] = '/';
|
||||
}
|
||||
}
|
||||
// be sure that the end slash is present
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT'].'/');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_MAIN constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_MAIN constant below for better performances.
|
||||
$tcpdf_install_dirs = array();
|
||||
if ((strpos(dirname(__FILE__), '/config') !== false) OR (strpos(dirname(__FILE__), '\config') !== false)) {
|
||||
// default config file
|
||||
$k_path_main_default = str_replace( '\\', '/', realpath(substr(dirname(__FILE__), 0, 0-strlen('examples/config'))));
|
||||
if (substr($k_path_main_default, -1) != '/') {
|
||||
$k_path_main_default .= '/';
|
||||
}
|
||||
$tcpdf_install_dirs[] = $k_path_main_default;
|
||||
}
|
||||
$tcpdf_install_dirs += array('/usr/share/php/tcpdf/', '/usr/share/tcpdf/', '/usr/share/php-tcpdf/', '/var/www/tcpdf/', '/var/www/html/tcpdf/', '/usr/local/apache2/htdocs/tcpdf/');
|
||||
foreach ($tcpdf_install_dirs as $k_path_main) {
|
||||
if (file_exists($k_path_main.'tcpdf.php')) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!file_exists($k_path_main)) {
|
||||
die('TCPDF ERROR: please set the correct path to TCPDF on the configuration file');
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
* Installation path (/var/www/tcpdf/).
|
||||
* By default it is automatically calculated but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_MAIN', $k_path_main);
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_URL constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_URL constant below for better performances.
|
||||
$k_path_url = $k_path_main; // default value for console mode
|
||||
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
|
||||
if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
|
||||
$k_path_url = 'https://';
|
||||
} else {
|
||||
$k_path_url = 'http://';
|
||||
}
|
||||
$k_path_url .= $_SERVER['HTTP_HOST'];
|
||||
$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
//define ('K_PATH_MAIN', '');
|
||||
|
||||
/**
|
||||
* URL path to tcpdf installation folder (http://localhost/tcpdf/).
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_URL', $k_path_url);
|
||||
//define ('K_PATH_URL', '');
|
||||
|
||||
/**
|
||||
* Path for PDF fonts.
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
//define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
|
||||
|
||||
/**
|
||||
* Default images directory.
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_IMAGES', __DIR__.'/../images/');
|
||||
|
||||
/**
|
||||
* Deafult image logo used be the default Header() method.
|
||||
* Please set here your own logo or an empty string to disable it.
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO', 'tcpdf_logo.jpg');
|
||||
|
||||
/**
|
||||
* Header logo image width in user units.
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 30);
|
||||
|
||||
/**
|
||||
* Cache directory for temporary files (full path).
|
||||
@ -109,31 +82,9 @@ define ('K_PATH_URL', $k_path_url);
|
||||
define ('K_PATH_CACHE', sys_get_temp_dir().'/');
|
||||
|
||||
/**
|
||||
* Path for PDF fonts.
|
||||
* Generic name for a blank image.
|
||||
*/
|
||||
define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_IMAGES constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_IMAGES constant below for better performances.
|
||||
$tcpdf_images_dirs = array(K_PATH_MAIN.'examples/images/', '/usr/share/doc/tcpdf/examples/images/', '/usr/share/doc/php-tcpdf/examples/images/', '/usr/share/doc/php/tcpdf/examples/images/', '/var/www/tcpdf/images/', '/var/www/html/tcpdf/images/', '/usr/local/apache2/htdocs/tcpdf/images/', K_PATH_MAIN);
|
||||
foreach ($tcpdf_images_dirs as $tcpdf_images_path) {
|
||||
if (file_exists($tcpdf_images_path)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
* Default images directory.
|
||||
* By default it is automatically set but you can also set it as a fixed string to improve performances.
|
||||
*/
|
||||
define ('K_PATH_IMAGES', $tcpdf_images_path);
|
||||
|
||||
/**
|
||||
* Blank image.
|
||||
*/
|
||||
define ('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
|
||||
define ('K_BLANK_IMAGE', '_blank.png');
|
||||
|
||||
/**
|
||||
* Page format.
|
||||
@ -165,26 +116,6 @@ define ('PDF_HEADER_TITLE', 'TCPDF Example');
|
||||
*/
|
||||
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
// Try to automatically set the value for the following K_PATH_IMAGES constant.
|
||||
// NOTE: delete this section and manually set the K_PATH_IMAGES constant below for better performances.
|
||||
$tcpdf_header_logo = '';
|
||||
if (file_exists(K_PATH_IMAGES.'tcpdf_logo.jpg')) {
|
||||
$tcpdf_header_logo = 'tcpdf_logo.jpg';
|
||||
}
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
/**
|
||||
* Deafult image logo used be the default Header() method.
|
||||
* Please set here your own logo or an empty string to disable it.
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO', $tcpdf_header_logo);
|
||||
|
||||
/**
|
||||
* Header logo image width [mm].
|
||||
*/
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 30);
|
||||
|
||||
/**
|
||||
* Document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch].
|
||||
*/
|
||||
|
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
||||
* Current TCPDF version.
|
||||
* @private static
|
||||
*/
|
||||
private static $tcpdf_version = '6.0.016';
|
||||
private static $tcpdf_version = '6.0.017';
|
||||
|
||||
/**
|
||||
* String alias for total number of pages.
|
||||
|
43
tcpdf.php
43
tcpdf.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.0.016
|
||||
// Version : 6.0.017
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2013-05-15
|
||||
// Last Update : 2013-05-16
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
@ -139,36 +139,21 @@
|
||||
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 6.0.016
|
||||
* @version 6.0.017
|
||||
*/
|
||||
|
||||
// Load main configuration file only if the K_TCPDF_EXTERNAL_CONFIG constant is set to false.
|
||||
if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
|
||||
// define a list of default config files in order of priority
|
||||
$tcpdf_config_files = array(dirname(__FILE__).'/config/tcpdf_config.php', '/etc/php-tcpdf/tcpdf_config.php', '/etc/tcpdf/tcpdf_config.php', '/etc/tcpdf_config.php');
|
||||
foreach ($tcpdf_config_files as $tcpdf_config) {
|
||||
if (file_exists($tcpdf_config) AND is_readable($tcpdf_config)) {
|
||||
require_once($tcpdf_config);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!defined('K_PATH_MAIN')) {
|
||||
$this->Error('Unable to include configuration file.');
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
// TCPDF configuration
|
||||
require_once(__DIR__.'/tcpdf_autoconfig.php');
|
||||
// TCPDF static font methods and data
|
||||
require_once(dirname(__FILE__).'/include/tcpdf_font_data.php');
|
||||
require_once(__DIR__.'/include/tcpdf_font_data.php');
|
||||
// TCPDF static font methods and data
|
||||
require_once(dirname(__FILE__).'/include/tcpdf_fonts.php');
|
||||
require_once(__DIR__.'/include/tcpdf_fonts.php');
|
||||
// TCPDF static color methods and data
|
||||
require_once(dirname(__FILE__).'/include/tcpdf_colors.php');
|
||||
require_once(__DIR__.'/include/tcpdf_colors.php');
|
||||
// TCPDF static image methods and data
|
||||
require_once(dirname(__FILE__).'/include/tcpdf_images.php');
|
||||
require_once(__DIR__.'/include/tcpdf_images.php');
|
||||
// TCPDF static methods and data
|
||||
require_once(dirname(__FILE__).'/include/tcpdf_static.php');
|
||||
require_once(__DIR__.'/include/tcpdf_static.php');
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
|
||||
@ -178,7 +163,7 @@ require_once(dirname(__FILE__).'/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.<br>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 6.0.016
|
||||
* @version 6.0.017
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -9628,7 +9613,7 @@ class TCPDF {
|
||||
// if required, add standard sRGB_IEC61966-2.1 blackscaled ICC colour profile
|
||||
if ($this->pdfa_mode OR $this->force_srgb) {
|
||||
$iccobj = $this->_newobj();
|
||||
$icc = file_get_contents(dirname(__FILE__).'/include/sRGB.icc');
|
||||
$icc = file_get_contents(__DIR__.'/include/sRGB.icc');
|
||||
$filter = '';
|
||||
if ($this->compress) {
|
||||
$filter = ' /Filter /FlateDecode';
|
||||
@ -15066,7 +15051,7 @@ class TCPDF {
|
||||
if (TCPDF_STATIC::empty_string(trim($code))) {
|
||||
return;
|
||||
}
|
||||
require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
|
||||
require_once(__DIR__.'/tcpdf_barcodes_1d.php');
|
||||
// save current graphic settings
|
||||
$gvars = $this->getGraphicVars();
|
||||
// create new barcode object
|
||||
@ -15382,7 +15367,7 @@ class TCPDF {
|
||||
if (TCPDF_STATIC::empty_string(trim($code))) {
|
||||
return;
|
||||
}
|
||||
require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
|
||||
require_once(__DIR__.'/tcpdf_barcodes_2d.php');
|
||||
// save current graphic settings
|
||||
$gvars = $this->getGraphicVars();
|
||||
// create new barcode object
|
||||
|
233
tcpdf_autoconfig.php
Normal file
233
tcpdf_autoconfig.php
Normal file
@ -0,0 +1,233 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf_autoconfig.php
|
||||
// Version : 1.0.000
|
||||
// Begin : 2013-05-16
|
||||
// Last Update : 2013-05-16
|
||||
// Authors : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
// Copyright (C) 2011-2013 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.
|
||||
//
|
||||
// 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 License
|
||||
// along with TCPDF. If not, see
|
||||
// <http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT>.
|
||||
//
|
||||
// See LICENSE.TXT file for more information.
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
// Description : Try to automatically configure some TCPDF
|
||||
// constants if not defined.
|
||||
//
|
||||
//============================================================+
|
||||
|
||||
/**
|
||||
* @file
|
||||
* Try to automatically configure some TCPDF constants if not defined.
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 1.0.000
|
||||
*/
|
||||
|
||||
// DOCUMENT_ROOT fix for IIS Webserver
|
||||
if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
|
||||
if(isset($_SERVER['SCRIPT_FILENAME'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} elseif(isset($_SERVER['PATH_TRANSLATED'])) {
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace( '\\', '/', substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF'])));
|
||||
} else {
|
||||
// define here your DOCUMENT_ROOT path if the previous fails (e.g. '/var/www')
|
||||
$_SERVER['DOCUMENT_ROOT'] = '/';
|
||||
}
|
||||
}
|
||||
$_SERVER['DOCUMENT_ROOT'] = str_replace('//', '/', $_SERVER['DOCUMENT_ROOT']);
|
||||
if (substr($_SERVER['DOCUMENT_ROOT'], -1) != '/') {
|
||||
$_SERVER['DOCUMENT_ROOT'] .= '/';
|
||||
}
|
||||
|
||||
// Load main configuration file only if the K_TCPDF_EXTERNAL_CONFIG constant is set to false.
|
||||
if (!defined('K_TCPDF_EXTERNAL_CONFIG') OR !K_TCPDF_EXTERNAL_CONFIG) {
|
||||
// define a list of default config files in order of priority
|
||||
$tcpdf_config_files = array(__DIR__.'/config/tcpdf_config.php', '/etc/php-tcpdf/tcpdf_config.php', '/etc/tcpdf/tcpdf_config.php', '/etc/tcpdf_config.php');
|
||||
foreach ($tcpdf_config_files as $tcpdf_config) {
|
||||
if (file_exists($tcpdf_config) AND is_readable($tcpdf_config)) {
|
||||
require_once($tcpdf_config);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!defined('K_PATH_MAIN')) {
|
||||
define ('K_PATH_MAIN', __DIR__.'/');
|
||||
}
|
||||
|
||||
if (!defined('K_PATH_FONTS')) {
|
||||
define ('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
|
||||
}
|
||||
|
||||
if (!defined('K_PATH_URL')) {
|
||||
$k_path_url = K_PATH_MAIN; // default value for console mode
|
||||
if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
|
||||
if(isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND (strtolower($_SERVER['HTTPS']) != 'off')) {
|
||||
$k_path_url = 'https://';
|
||||
} else {
|
||||
$k_path_url = 'http://';
|
||||
}
|
||||
$k_path_url .= $_SERVER['HTTP_HOST'];
|
||||
$k_path_url .= str_replace( '\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
|
||||
}
|
||||
define ('K_PATH_URL', $k_path_url);
|
||||
}
|
||||
|
||||
if (!defined('K_PATH_IMAGES')) {
|
||||
$tcpdf_images_dirs = array(K_PATH_MAIN.'examples/images/', K_PATH_MAIN.'images/', '/usr/share/doc/php-tcpdf/examples/images/', '/usr/share/doc/tcpdf/examples/images/', '/usr/share/doc/php/tcpdf/examples/images/', '/var/www/tcpdf/images/', '/var/www/html/tcpdf/images/', '/usr/local/apache2/htdocs/tcpdf/images/', K_PATH_MAIN);
|
||||
foreach ($tcpdf_images_dirs as $tcpdf_images_path) {
|
||||
if (file_exists($tcpdf_images_path)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
define ('K_PATH_IMAGES', $tcpdf_images_path);
|
||||
}
|
||||
|
||||
if (!defined('PDF_HEADER_LOGO')) {
|
||||
$tcpdf_header_logo = '';
|
||||
if (file_exists(K_PATH_IMAGES.'tcpdf_logo.jpg')) {
|
||||
$tcpdf_header_logo = 'tcpdf_logo.jpg';
|
||||
}
|
||||
define ('PDF_HEADER_LOGO', $tcpdf_header_logo);
|
||||
}
|
||||
|
||||
if (!defined('PDF_HEADER_LOGO_WIDTH')) {
|
||||
if (!empty($tcpdf_header_logo)) {
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 30);
|
||||
} else {
|
||||
define ('PDF_HEADER_LOGO_WIDTH', 0);
|
||||
}
|
||||
}
|
||||
|
||||
if (!defined('K_PATH_CACHE')) {
|
||||
define ('K_PATH_CACHE', sys_get_temp_dir().'/');
|
||||
}
|
||||
|
||||
if (!defined('K_BLANK_IMAGE')) {
|
||||
define ('K_BLANK_IMAGE', '_blank.png');
|
||||
}
|
||||
|
||||
if (!defined('PDF_PAGE_FORMAT')) {
|
||||
define ('PDF_PAGE_FORMAT', 'A4');
|
||||
}
|
||||
|
||||
if (!defined('PDF_PAGE_ORIENTATION')) {
|
||||
define ('PDF_PAGE_ORIENTATION', 'P');
|
||||
}
|
||||
|
||||
if (!defined('PDF_CREATOR')) {
|
||||
define ('PDF_CREATOR', 'TCPDF');
|
||||
}
|
||||
|
||||
if (!defined('PDF_AUTHOR')) {
|
||||
define ('PDF_AUTHOR', 'TCPDF');
|
||||
}
|
||||
|
||||
if (!defined('PDF_HEADER_TITLE')) {
|
||||
define ('PDF_HEADER_TITLE', 'TCPDF Example');
|
||||
}
|
||||
|
||||
if (!defined('PDF_HEADER_STRING')) {
|
||||
define ('PDF_HEADER_STRING', "by Nicola Asuni - Tecnick.com\nwww.tcpdf.org");
|
||||
}
|
||||
|
||||
if (!defined('PDF_UNIT')) {
|
||||
define ('PDF_UNIT', 'mm');
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_HEADER')) {
|
||||
define ('PDF_MARGIN_HEADER', 5);
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_FOOTER')) {
|
||||
define ('PDF_MARGIN_FOOTER', 10);
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_TOP')) {
|
||||
define ('PDF_MARGIN_TOP', 27);
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_BOTTOM')) {
|
||||
define ('PDF_MARGIN_BOTTOM', 25);
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_LEFT')) {
|
||||
define ('PDF_MARGIN_LEFT', 15);
|
||||
}
|
||||
|
||||
if (!defined('PDF_MARGIN_RIGHT')) {
|
||||
define ('PDF_MARGIN_RIGHT', 15);
|
||||
}
|
||||
|
||||
if (!defined('PDF_FONT_NAME_MAIN')) {
|
||||
define ('PDF_FONT_NAME_MAIN', 'helvetica');
|
||||
}
|
||||
|
||||
if (!defined('PDF_FONT_SIZE_MAIN')) {
|
||||
define ('PDF_FONT_SIZE_MAIN', 10);
|
||||
}
|
||||
|
||||
if (!defined('PDF_FONT_NAME_DATA')) {
|
||||
define ('PDF_FONT_NAME_DATA', 'helvetica');
|
||||
}
|
||||
|
||||
if (!defined('PDF_FONT_SIZE_DATA')) {
|
||||
define ('PDF_FONT_SIZE_DATA', 8);
|
||||
}
|
||||
|
||||
if (!defined('PDF_FONT_MONOSPACED')) {
|
||||
define ('PDF_FONT_MONOSPACED', 'courier');
|
||||
}
|
||||
|
||||
if (!defined('PDF_IMAGE_SCALE_RATIO')) {
|
||||
define ('PDF_IMAGE_SCALE_RATIO', 1.25);
|
||||
}
|
||||
|
||||
if (!defined('HEAD_MAGNIFICATION')) {
|
||||
define('HEAD_MAGNIFICATION', 1.1);
|
||||
}
|
||||
|
||||
if (!defined('K_CELL_HEIGHT_RATIO')) {
|
||||
define('K_CELL_HEIGHT_RATIO', 1.25);
|
||||
}
|
||||
|
||||
if (!defined('K_TITLE_MAGNIFICATION')) {
|
||||
define('K_TITLE_MAGNIFICATION', 1.3);
|
||||
}
|
||||
|
||||
if (!defined('K_SMALL_RATIO')) {
|
||||
define('K_SMALL_RATIO', 2/3);
|
||||
}
|
||||
|
||||
if (!defined('K_THAI_TOPCHARS')) {
|
||||
define('K_THAI_TOPCHARS', true);
|
||||
}
|
||||
|
||||
if (!defined('K_TCPDF_CALLS_IN_HTML')) {
|
||||
define('K_TCPDF_CALLS_IN_HTML', true);
|
||||
}
|
||||
|
||||
if (!defined('K_TCPDF_THROW_EXCEPTION_ERROR')) {
|
||||
define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
|
||||
}
|
||||
|
||||
//============================================================+
|
||||
// END OF FILE
|
||||
//============================================================+
|
@ -2,9 +2,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf_addfont.php
|
||||
// Version : 1.0.001
|
||||
// Version : 1.0.002
|
||||
// Begin : 2013-05-13
|
||||
// Last Update : 2013-05-15
|
||||
// Last Update : 2013-05-16
|
||||
// Authors : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// Remi Collet
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
@ -46,8 +46,7 @@ if (php_sapi_name() != 'cli') {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
// Include the main TCPDF library (search the library on the following directories).
|
||||
$tcpdf_include_dirs = array(realpath('../tcpdf.php'), '/usr/share/php/tcpdf/tcpdf.php', '/usr/share/tcpdf/tcpdf.php', '/usr/share/php-tcpdf/tcpdf.php', '/var/www/tcpdf/tcpdf.php', '/var/www/html/tcpdf/tcpdf.php', '/usr/local/apache2/htdocs/tcpdf/tcpdf.php');
|
||||
$tcpdf_include_dirs = array(realpath(__DIR__.'/../tcpdf.php'), '/usr/share/php/tcpdf/tcpdf.php', '/usr/share/tcpdf/tcpdf.php', '/usr/share/php-tcpdf/tcpdf.php', '/var/www/tcpdf/tcpdf.php', '/var/www/html/tcpdf/tcpdf.php', '/usr/local/apache2/htdocs/tcpdf/tcpdf.php');
|
||||
foreach ($tcpdf_include_dirs as $tcpdf_include_path) {
|
||||
if (file_exists($tcpdf_include_path)) {
|
||||
require_once($tcpdf_include_path);
|
||||
|
Loading…
Reference in New Issue
Block a user