diff options
| author | Greg Roach <fisharebest@gmail.com> | 2014-09-12 18:33:07 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2014-09-12 18:33:07 +0100 |
| commit | 30817cb7933d619ca847032d4b2abbcadb4cd150 (patch) | |
| tree | af1a60fd152b0c07c7e29fad8f9215f36ed02be4 /library/tecnick.com/tcpdf/include | |
| parent | 2a8c76cd06eff2ca66b84d1ec6c15593f5388aaf (diff) | |
| download | webtrees-30817cb7933d619ca847032d4b2abbcadb4cd150.tar.gz webtrees-30817cb7933d619ca847032d4b2abbcadb4cd150.tar.bz2 webtrees-30817cb7933d619ca847032d4b2abbcadb4cd150.zip | |
Update library tecnick.com/tcpdf
Diffstat (limited to 'library/tecnick.com/tcpdf/include')
| -rw-r--r-- | library/tecnick.com/tcpdf/include/tcpdf_static.php | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/library/tecnick.com/tcpdf/include/tcpdf_static.php b/library/tecnick.com/tcpdf/include/tcpdf_static.php index 4fe0bdd283..e657446aa2 100644 --- a/library/tecnick.com/tcpdf/include/tcpdf_static.php +++ b/library/tecnick.com/tcpdf/include/tcpdf_static.php @@ -1,9 +1,9 @@ <?php //============================================================+ // File name : tcpdf_static.php -// Version : 1.0.002 +// Version : 1.0.004 // Begin : 2002-08-03 -// Last Update : 2014-04-25 +// Last Update : 2014-09-02 // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // ------------------------------------------------------------------- @@ -38,7 +38,7 @@ * This is a PHP class that contains static methods for the TCPDF class.<br> * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 1.0.002 + * @version 1.0.004 */ /** @@ -46,7 +46,7 @@ * Static methods used by the TCPDF class. * @package com.tecnick.tcpdf * @brief PHP class for generating PDF documents without requiring external extensions. - * @version 1.0.002 + * @version 1.0.004 * @author Nicola Asuni - info@tecnick.com */ class TCPDF_STATIC { @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.089'; + private static $tcpdf_version = '6.0.093'; /** * String alias for total number of pages. @@ -1098,7 +1098,7 @@ class TCPDF_STATIC { * @public static */ public static function getObjFilename($type='tmp') { - return tempnam(K_PATH_CACHE, '__tcpdf_'.$type.'_'.md5(getmypid().uniqid('', true).rand().microtime(true)).'_'); + return tempnam(K_PATH_CACHE, '__tcpdf_'.$type.'_'.md5(uniqid('', true).rand().microtime(true)).'_'); } /** @@ -1358,7 +1358,6 @@ class TCPDF_STATIC { } $seed .= uniqid('', true); $seed .= rand(); - $seed .= getmypid(); $seed .= __FILE__; if (isset($_SERVER['REMOTE_ADDR'])) { $seed .= $_SERVER['REMOTE_ADDR']; @@ -2451,13 +2450,23 @@ class TCPDF_STATIC { /** * Serialize an array of parameters to be used with TCPDF tag in HTML code. - * @param $pararray (array) parameters array - * @return sting containing serialized data + * @param $data (array) parameters array + * @return string containing serialized data * @since 4.9.006 (2010-04-02) * @public static */ - public static function serializeTCPDFtagParameters($pararray) { - return urlencode(serialize($pararray)); + public static function serializeTCPDFtagParameters($data) { + return urlencode(json_encode($data)); + } + + /** + * Unserialize parameters to be used with TCPDF tag in HTML code. + * @param $data (string) serialized data + * @return array containing unserialized data + * @public static + */ + public static function unserializeTCPDFtagParameters($data) { + return json_decode(urldecode($data), true); } /** |
