12.2.5 (2015-06-18)

- TCPDF Library was updated. - German translation was updated.
c72578 · Jun 19, 2015 · ebcec5f · ebcec5f
1 parent a92d51d
commit ebcec5f
Show file tree

Hide file tree

Showing 10 changed files with 1,939 additions and 1,929 deletions.
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+12.2.5 (2015-06-18)
+	- TCPDF Library was updated.
+	- German translation was updated.
+
 12.2.4 (2015-04-29)
 	- TCPDF Library was updated.
 

diff --git a/README.TXT b/README.TXT
@@ -9,9 +9,9 @@ YOU MUST CONTACT [email protected] TO PURCHASE A LICENSE.
 
 Name: TCExam
 
-Version: 12.2.4
+Version: 12.2.5
 
-Release date: 2015-04-29
+Release date: 2015-06-18
 Author:
 	Nicola Asuni
 

diff --git a/admin/code/tce_page_info.php b/admin/code/tce_page_info.php
@@ -133,7 +133,7 @@
 echo '<li>[BG] Bulgarian : Georgi Kostadinov</li>'.K_NEWLINE;
 echo '<li>[BR] Brazilian Portuguese : Carlos Eduardo Vianna, Flávio Veras</li>'.K_NEWLINE;
 echo '<li>[CN] Chinese : Liu Yongxin, Zheng Xiaojing</li>'.K_NEWLINE;
-echo '<li>[DE] German : Oliver Kasch, André Scherrer</li>'.K_NEWLINE;
+echo '<li>[DE] German : Oliver Kasch, André Scherrer, Wolfgang Stöggl</li>'.K_NEWLINE;
 echo '<li>[EL] Greek : Kottas Alexandros</li>'.K_NEWLINE;
 echo '<li>[EN] English : Nicola Asuni</li>'.K_NEWLINE;
 echo '<li>[ES] Spanish : Carlos Alarcon, Maria del Rocio Peñas Serrano, Alejandra Ruiz</li>'.K_NEWLINE;

diff --git a/shared/config.default/lang/language_tmx.xml b/shared/config.default/lang/language_tmx.xml
diff --git a/shared/config.default/tce_config.php b/shared/config.default/tce_config.php
@@ -32,7 +32,7 @@
 /**
  * TCExam version (do not change).
  */
-define ('K_TCEXAM_VERSION', '12.2.4');
+define ('K_TCEXAM_VERSION', '12.2.5');
 
 /**
  * 2-letters code for default language.

diff --git a/shared/tcpdf/CHANGELOG.TXT b/shared/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.2.9 (2015-06-18)
+	- 
+
 6.2.8 (2015-04-29)
 	- Removed unwanted file.
 

diff --git a/shared/tcpdf/README.TXT b/shared/tcpdf/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.2.8
-Release date: 2015-04-29
+Version: 6.2.9
+Release date: 2015-06-18
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2015:

diff --git a/shared/tcpdf/include/tcpdf_images.php b/shared/tcpdf/include/tcpdf_images.php
@@ -160,6 +160,14 @@ public static function _toJPEG($image, $quality, $tempfile) {
 	 * @public static
 	 */
 	public static function _parsejpeg($file) {
+		// check if is a local file
+		if (!@file_exists($file)) {
+			// try to encode spaces on filename
+			$tfile = str_replace(' ', '%20', $file);
+			if (@file_exists($tfile)) {
+				$file = $tfile;
+			}
+		}
 		$a = getimagesize($file);
 		if (empty($a)) {
 			//Missing or incorrect image file

diff --git a/shared/tcpdf/include/tcpdf_static.php b/shared/tcpdf/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.2.8';
+	private static $tcpdf_version = '6.2.9';
 
 	/**
 	 * String alias for total number of pages.

diff --git a/shared/tcpdf/tcpdf.php b/shared/tcpdf/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.2.8
+// Version     : 6.2.9
 // Begin       : 2002-08-03
-// Last Update : 2015-04-29
+// Last Update : 2015-06-18
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - [email protected]
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -7026,6 +7026,7 @@ public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $alig
 					AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
 					return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
 				}
+				$info = false;
 			}
 			if (($info === false) AND function_exists($gdfunction)) {
 				try {
@@ -10362,7 +10363,7 @@ public function getPDFData() {
 	 * @public
 	 */
 	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
-		if (isset($url[1]) AND ($url[0] == '#')) {
+		if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
 			// convert url to internal link
 			$lnkdata = explode(',', $url);
 			if (isset($lnkdata[0]) ) {
@@ -18649,7 +18650,7 @@ public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=fal
 		$this->lispacer = $prev_lispacer;
 		if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
 			$this->Ln($this->lasth);
-			if ($this->y < $maxbottomliney) {
+			if (($this->y < $maxbottomliney) AND ($startlinepage == $this->page)) {
 				$this->y = $maxbottomliney;
 			}
 		}