X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=reporting%2Fincludes%2Ftcpdf.php;h=6e7b6f4af9f50135c536984c6dc61288685d310f;hb=27457e8b66b9ebd588cb515f03ca622f78fafc03;hp=06df1ad82f9af8ac4abe86916d0ddc202fd4e9d6;hpb=b753cba3fcaf9e92ec40f747ded0787d10509c11;p=fa-stable.git

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index 06df1ad8..6e7b6f4a 100644
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -143,11 +143,13 @@
   * 4. Parameter $unicode in constructor renamed to $uni.
   * 5. Header function renamed to Header1 (due to conflict with FrontReport Header)
   * 6. Line 6190, SetLineWidth (cast of values to avoid problem in PHP 5.2.6
+  * 7. Line 6261. ereg replaced by preg_match (with start and end delimiter)
+  * 8. Lines 8642,9256 and 9348. split replaced by preg_split.
   * -------------------------------------------------------------------------------
   */
 if (!defined("K_PATH_FONTS"))
-	define ("K_PATH_FONTS", '../reporting/fonts/');
-define ("K_PATH_CACHE", '../reporting/fonts/');
+	define ("K_PATH_FONTS", dirname(__FILE__)."/../fonts/");
+define ("K_PATH_CACHE", dirname(__FILE__)."/../fonts/");
 define("K_CELL_HEIGHT_RATIO", 1.25);
 
 //require_once(dirname(__FILE__).'/config/tcpdf_config.php');
@@ -3595,8 +3597,8 @@ if (!class_exists('TCPDF')) {
 				if ($type == "jpg") {
 					$type = "jpeg";
 				}
-				$mqr = get_magic_quotes_runtime();
-				set_magic_quotes_runtime(0);
+				$mqr = ini_get('magic_quotes_runtime');
+				ini_set('magic_quotes_runtime', 0);
 				// Specific image handlers
 				$mtd = '_parse'.$type;
 				// GD image handler function
@@ -3623,7 +3625,7 @@ if (!class_exists('TCPDF')) {
 					//If false, we cannot process image
 					return;
 				}
-				set_magic_quotes_runtime($mqr);
+				ini_set('magic_quotes_runtime', $mqr);
 				$info['i'] = count($this->images) + 1;
 				// add image to document
 				$this->images[$file] = $info;
@@ -4503,8 +4505,8 @@ if (!class_exists('TCPDF')) {
 				$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
 				$this->_out('endobj');
 			}
-			$mqr = get_magic_quotes_runtime();
-			set_magic_quotes_runtime(0);
+			$mqr = ini_get('magic_quotes_runtime');
+			ini_set('magic_quotes_runtime', 0);
 			foreach($this->FontFiles as $file => $info) {
 				//Font file embedding
 				$this->_newobj();
@@ -4534,7 +4536,7 @@ if (!class_exists('TCPDF')) {
 				$this->_putstream($font);
 				$this->_out('endobj');
 			}
-			set_magic_quotes_runtime($mqr);
+			ini_set('magic_quotes_runtime', $mqr);
 			foreach($this->fonts as $k => $font) {
 				//Font objects
 				$this->fonts[$k]['n'] = $this->n + 1;
@@ -6258,7 +6260,7 @@ if (!class_exists('TCPDF')) {
 			if (isset($dash)) {
 				$dash_string = "";
 				if ($dash) {
-					if (ereg("^.+,", $dash)) {
+					if (preg_match("/^.+,/", $dash)) {
 						$tab = explode(",", $dash);
 					} else {
 						$tab = array($dash);
@@ -8638,7 +8640,7 @@ if (!class_exists('TCPDF')) {
 				$this->_out(sprintf('%.3F %.3F %.3F %.3F %.3F %.3F cm', $scale_x, 0, 0, $scale_y, $x1*(1-$scale_x), $y2*(1-$scale_y)));
 			}
 			// handle pc/unix/mac line endings
-			$lines = split("\r\n|[\r\n]", $data);
+			$lines = preg_split("/\r\n|[\r\n]/", $data);
 			$u=0;
 			$cnt = count($lines);
 			for ($i=0; $i < $cnt; $i++) {
@@ -9252,7 +9254,7 @@ if (!class_exists('TCPDF')) {
 							if (isset($dom[$key]['style']['font-family'])) {
 								// font family
 								if (isset($dom[$key]['style']['font-family'])) {
-									$fontslist = split(",", strtolower($dom[$key]['style']['font-family']));
+									$fontslist = preg_split("/,/", strtolower($dom[$key]['style']['font-family']));
 									foreach($fontslist as $font) {
 										$font = trim(strtolower($font));
 										if (in_array($font, $this->fontlist)){
@@ -9344,7 +9346,7 @@ if (!class_exists('TCPDF')) {
 						if ($dom[$key]['value'] == "font") {
 							// font family
 							if (isset($dom[$key]['attribute']['face'])) {
-								$fontslist = split(",", strtolower($dom[$key]['attribute']['face']));
+								$fontslist = preg_split("/,/", strtolower($dom[$key]['attribute']['face']));
 								foreach($fontslist as $font) {
 									$font = trim(strtolower($font));
 									if (in_array($font, $this->fontlist)){
@@ -10428,4 +10430,3 @@ if (!class_exists('TCPDF')) {
 //============================================================+
 // END OF FILE
 //============================================================+
-?>